device/community/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,10 +28,7 @@ source="
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
-subpackages="
-	$pkgname-camera
-	$pkgname-nonfree-firmware:nonfree_firmware
-	"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -46,12 +43,6 @@ package() {
 		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="snapshot"
-	mkdir -p "$subpkgdir"
-}
-
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
 	replaces="hexagonrpcd-openrc"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,6 +12,7 @@ options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-msm8996
 	mesa-egl
+	megapixels
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8996
@@ -19,7 +20,6 @@ depends="
 	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-camera
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
@@ -68,11 +68,6 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="megapixels"
-	mkdir -p "$subpkgdir"
-}
 
 sha512sums="
 b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files

device/community/linux-postmarketos-mediatek-mt8173/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
 pkgver=6.10.10
-pkgrel=0
+pkgrel=2
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -36,9 +36,7 @@ esac
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${pkgver//_/-}.tar.xz
 	$_config
-	fix-mmc1-speed.patch
 	fix-mmc-order.patch
-	fix-spi-nor-max-frequency.patch
 "
 builddir="$srcdir/linux-${_kernver//_/-}"
 
@@ -69,8 +67,6 @@ package() {
 
 sha512sums="
 affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce  linux-6.10.10.tar.xz
-078f06d292c3a44efcac50eb5b9b4036d4008cba446b4d8442bae998c040dac9f3aaa97bb25f583eca97f5bc51a9a1be100bbfb042a24e93809e6c863e517596  config-postmarketos-mediatek-mt8173.aarch64
-4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
+44c35de93ea3bfe214585c4b8909613b17a6e280765ab84352e3d07490a42403e3e68ab7f26eb9442004a1ee7f78ef0fd6ebdeab01561ac84a8073d817ca3434  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
-caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
 "

device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64

@@ -6372,7 +6372,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-mediatek-mt8173/fix-mmc1-speed.patch

-cut max-frequency to half because at full speed mmc is buggy
-
-Link: https://git.alpinelinux.org/aports/tree/testing/linux-elm?h=master
-
---- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:22:16.614538427 +0000
-+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:23:59.702157398 +0000
-@@ -381,7 +381,7 @@
- 	pinctrl-0 = <&mmc1_pins_default>;
- 	pinctrl-1 = <&mmc1_pins_uhs>;
- 	bus-width = <4>;
--	max-frequency = <200000000>;
-+	max-frequency = <100000000>;
- 	cap-sd-highspeed;
- 	sd-uhs-sdr50;
- 	sd-uhs-sdr104;

device/community/linux-postmarketos-mediatek-mt8173/fix-spi-nor-max-frequency.patch

-Link: https://git.alpinelinux.org/aports/tree/testing/linux-elm?h=master
-
---- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 10:20:26.482347785 +0000
-+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 11:36:43.321775391 +0000
-@@ -437,7 +437,7 @@
- 	flash@0 {
- 		compatible = "jedec,spi-nor";
- 		reg = <0>;
--		spi-max-frequency = <50000000>;
-+		spi-max-frequency = <109200000>;
- 	};
- };
- 

device/community/linux-postmarketos-mediatek-mt8183/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
 pkgver=6.6.36
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -101,5 +101,5 @@ e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456b
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045  Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-c5411538314d47c808a0036c7ba20a83b09f0eec609910d618119888f2e60b51da5fd72c1c16c350428ee62e6f3300569070f12263ba6123e655f6203e939b37  config-postmarketos-mediatek-mt8183.aarch64
+383aae874341d974231af8cf19e34cb2ec593200c6d4a7e6588bb9e7c0c569c5e0b2ec7ec8f3d7c7a59ce4a946824b5242ac634009adcf3460181113da779f00  config-postmarketos-mediatek-mt8183.aarch64
 "

device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64

@@ -6286,7 +6286,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-qcom-msm8916/APKBUILD

@@ -8,7 +8,7 @@ pkgver=6.6
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=8
+pkgrel=9
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -92,6 +92,6 @@ package() {
 
 sha512sums="
 5fbbdf333412667e0a0e38dcc7e83f640bd5a1e0b07e1c7786ff3e18f17b9cdec088936263d68986b3869ee305cfcecdf22970134ca8fb8d2a2769874a5a4676  linux-postmarketos-qcom-msm8916-v6.6-msm8916.tar.gz
-6c90d4dd5942d837e296d3facb997ab6415e24c17840269e123493834d214ce7868ebbd23e1dea33c744d96ed2d0096bc2e47339cc27b858c1260cfd246eadbd  config-postmarketos-qcom-msm8916.aarch64
+677eb54cf58ef9b0992a8ed6c52188230b7e3ceb0dac4850b040458468637867f7b92dcce4895caae1053a425de64bfdf2ebc266a5dcf30b2626827fccb23419  config-postmarketos-qcom-msm8916.aarch64
 5a5d45f5a3dbefe8eaf5c796c5362a2c0b6e94b2b27cb5a139315c7894d74a37619800c549bf1d0eec6ca2d9d69b36d3957cc5ac6853e8fa43b4de022be246b0  config-postmarketos-qcom-msm8916.armv7
 "

device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64

@@ -4845,7 +4845,7 @@ CONFIG_QCOM_BAM_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-qcom-msm8996/APKBUILD

@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=6.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -52,5 +52,5 @@ package() {
 }
 sha512sums="
 3d842c6fa3e1f93875f9c8d4f51e66b267bbd6b0eabccc25b461cbc0616a632ee6f1f2001b77bef2aff6aa36a788277ab9fc930fcd6e71732e5cbffec2dcb269  linux-v6.3.1-msm8996.tar.gz
-d8e4b6b583dfb172915c9a26c2710d794d99f4e0999556c86eaeff41a39d1ed55bec72ad24795f71f1d9d1ccf86488665566b1465d2db25886662bc25d7c8523  config-postmarketos-qcom-msm8996.aarch64
+f03ecc0a0656fc27ecaefd522567ea86ab934746069b5fc88ffea5be1e3f27ff79df3d063fd984a1159f9f4d5c5b99c396127ca75370a27a438190d175037905  config-postmarketos-qcom-msm8996.aarch64
 "

device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64

@@ -5383,7 +5383,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-qcom-sc7180/APKBUILD

 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.6.28
-pkgrel=5
+pkgrel=6
 pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
 arch="aarch64"
 _carch="arm64"
@@ -101,5 +101,5 @@ a4d8bbf39575e61d228b3b66fa692b207c1ee011e6030fdd097936a1ad28b1d5b01816d989adcb80
 08c6cace24a207f4a64a85b17e97646f62a8590b502cd5b6945489d0aeded352e21f0e1b0ec541ae2e61ec7fd4f6bc1e5bf1d5d32f2c6616eb41d39d66f0bab5  0009-platform-arm64-Add-Acer-Aspire-1-embedded-controller.patch
 69cfb699990ea7994089016b29cc248cb03483ad3f7620cbba63a779b2ed8928e6fde68484d29b6b8dfd1a8a6fa8d84c441f30180c7a257520ced442dab33876  0010-arm64-dts-qcom-acer-aspire1-Add-embedded-controller.patch
 c5edcd74f898b08bc663766668632d351aea40426b3563d53a4b8c6856dd82627f4794d60450e41171c990ebb3649056b36ef432c14c8783168e8060a2e3b094  0011-HACK-clk-Delay-disabling-unused-clocks-by-10s.patch
-a6dc8fa517667c6a03d65f849a01aaa793dfd2bde5efc844d56ae46e5f0074ce7d81a89edfe6958d2792c70549fea150f1be9c2db7c06fd04f5e13afbda9d33c  config-postmarketos-qcom-sc7180.aarch64
+2afb66ab8144320eafe373e30df59996e04563fb141f157fd9ca4098cd7182b063bcf71432aae56ad2b104ad00174826f34c6261a0fd9ecf7420a96e910f7747  config-postmarketos-qcom-sc7180.aarch64
 "

device/community/linux-postmarketos-qcom-sc7180/config-postmarketos-qcom-sc7180.aarch64

@@ -6398,7 +6398,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-qcom-sm6350/APKBUILD

@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
 pkgver=6.10.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {
 
 sha512sums="
 5756a8fd466f5c34dcaa9818d274facbe0b0b541ce9d7997b95868b2e84f1491ce8bf7d2714206ad8378d560996b8a736bc3c8505ef8022371644866c841e2a1  linux-v6.10.5-sm6350.tar.gz
-8eb52ea8a45cf79b8ce5e86bab7958295b3c013b54fe2b6352f3657871082b996d19dbfc40a073d464ed9443b00b4cb41b8a4417e1f8dd7bb3a05f72bb83f099  config-postmarketos-qcom-sm6350.aarch64
+711e5ce6a7e9b491b40270eb23114ee4ad1deeb6312d10ec012abafd0c2cca288f72c4b5f49503f9c12c33ebd6fa3e0dc64ca8323121872d60f7ffd2a0411312  config-postmarketos-qcom-sm6350.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64

@@ -4199,7 +4199,7 @@ CONFIG_QCOM_GPI_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/community/linux-postmarketos-rockchip/APKBUILD

 # Maintainer: Quade Curry <qc8086@qc8086.com>
 pkgname=linux-postmarketos-rockchip
 pkgver=6.6.34
-pkgrel=4
+pkgrel=5
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64"
 _carch="arm64"
@@ -72,5 +72,5 @@ package() {
 
 sha512sums="
 eaa792be65c4cdfd37b84d4dadd22086c8507c1f78d538255cff03595e1caee0f88b521c398b6bc9ab3632010133cff5c7b14200413d54cf0a38bea79c2fd29f  linux-6.6.34.tar.xz
-984b42f1794650d549f5e4d88a0e023fac2996c63ae5316e5b6bcd914799418a4e6556f1efad542082d73792d480c1ec712b9ed62e9953c8441de3c78cb046f5  config-postmarketos-rockchip.aarch64
+1b1ab1466b1ce2e78641e7436e42e1ac1406c3b787afb877fa3f257eabf8ea7c65d9bc09889fc84de736f7982e38006eb621cf796b55907dd20ad436558d438a  config-postmarketos-rockchip.aarch64
 "

device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64

@@ -6187,7 +6187,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set

device/main/device-pine64-pinephone/APKBUILD

@@ -3,14 +3,13 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=4
-pkgrel=2
+pkgrel=3
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="
-	$pkgname-camera
 	$pkgname-gnome
 	$pkgname-kirigami:kirigami
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -30,6 +29,7 @@ depends="
 	eg25-manager-openrc
 	iw
 	linux-postmarketos-allwinner>=5.14
+	megapixels
 	mesa-egl
 	pinephone-callaudiod
 	postmarketos-base
@@ -181,12 +181,6 @@ openrc() {
 		"$subpkgdir"/usr/lib/udev/rules.d/
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="megapixels"
-	mkdir -p "$subpkgdir"
-}
-
 kirigami() {
 	install_if="$pkgname=$pkgver-r$pkgrel kirigami2"
 	install -Dm644 "$srcdir"/kirigami-lowpower.sh "$subpkgdir"/etc/profile.d/kirigami-lowpower.sh

device/main/device-purism-librem5/APKBUILD

@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=4
-pkgrel=0
+pkgrel=2
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -24,6 +24,7 @@ depends="
 	iw
 	linux-purism-librem5>=6.3
 	mesa-egl
+	millipixels
 	postmarketos-base
 	u-boot-librem5
 	u-boot-tools
@@ -52,18 +53,19 @@ source="
 	udev/70-wifi-pm.rules
 "
 subpackages="
-	$pkgname-camera
 	$pkgname-gnome
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-pulseaudio
+	$pkgname-openrc
 	$pkgname-smartcard
+	$pkgname-smartcard-openrc:smartcard_openrc
 	$pkgname-tinydm
 	$pkgname-usbguard
 	$pkgname-x11
 "
 # TODO: remove "replaces" when upstream ucm has proper L5 support...
 replaces="alsa-ucm-conf"
-install="$pkgname.post-install $pkgname.post-upgrade"
+
 
 builddir="$srcdir/librem5-base-pureos-$_purismver"
 
@@ -75,18 +77,13 @@ build() {
 gnome() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
 	depends="
+
 		wys
 	"
 	install -D -m644 "$builddir"/default/org.freedesktop.ModemManager1.pkla \
 		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="millipixels"
-	mkdir -p "$subpkgdir"
-}
-
 pulseaudio() {
 	pkgdesc="Pulseaudio support for the Librem 5"
 	install_if="$pkgname pulseaudio"
@@ -105,15 +102,27 @@ tinydm() {
 		"$subpkgdir"/etc/tinydm.d/env-wayland.d/70-librem5-xwayland-accel.sh
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 smartcard() {
 	pkgdesc="OpenPGP SmartCard support for the Librem 5"
 	depends="$pkgname ccid gnupg-scdaemon pcsc-lite pcsc-tools"
 	install_if="$pkgname pcsc-tools"
-	install="$install $subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
+smartcard_openrc() {
+	install_if="$pkgname-smartcard=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
 
 	install -D -m644 "$srcdir"/pcscd-librem5-reader.conf \
 		"$subpkgdir"/etc/reader.conf.d/librem5-ttxs-reader
-
 	install -D -m755 "$srcdir"/pcscd-librem5.initd \
 		"$subpkgdir"/etc/init.d/pcscd-librem5
 }