From f788a4be3d8c1464b4cbaaebae94083e9d0827bd Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sat, 27 Jul 2024 21:02:56 +1000 Subject: [PATCH] linux-purism-librem5: re-enable options for libcamera (MR 5390) https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5310 unfortunately disabled some configs needed for libcamera: 1. `CONFIG_DMABUF_HEAPS` 2. `CONFIG_DMABUF_HEAPS_CMA` Resolves: https://gitlab.com/postmarketOS/pmaports/-/issues/3050 Signed-off-by: Alistair Francis [ci:skip-build]: already built successfully in CI --- device/main/linux-purism-librem5/APKBUILD | 4 ++-- .../main/linux-purism-librem5/config-purism-librem5.aarch64 | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index aa503f9fd..b6c3ff183 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Clayton Craft pkgname=linux-purism-librem5 pkgver=6.6.32 -pkgrel=2 +pkgrel=3 # NOTE: Don't forget to rebase the config! See prepare() for instructions. _purismrel=2 # . @@ -90,5 +90,5 @@ package() { sha512sums=" 42242ccc182fe8ca73207e4c5ce824ba9f9b194e068fb49a280777e3dbd7326a446a098aecc7ebbf28cf4cb3d9c3f62837d9f718623652dfa50e7cc1bc807773 linux-purism-librem5-6.6.32pureos2.tar.gz -ca153f579ca276c5d1ba8d4db53e6117ef0e199f9a85b42056d528326e820b574b8f5ca39a169f65fba5437de0216307f934a12d6d2e3b58ce15605910095c74 config-purism-librem5.aarch64 +8b56214608afc31f42491b88bb8967e023e123611d96a9d5d3d98ef62b0f0ba8bbc2e6d1590b37b27fd0c2bd35cfe95f00973d907098a9f9103048ed23f11e99 config-purism-librem5.aarch64 " diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 index a6cccd767..451ce0ec0 100644 --- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 @@ -5977,8 +5977,10 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set -# CONFIG_DMABUF_HEAPS is not set +CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set +# CONFIG_DMABUF_HEAPS_SYSTEM is not set +CONFIG_DMABUF_HEAPS_CMA=y # end of DMABUF options # CONFIG_UIO is not set