device-purism-librem5: upgrade to 1.29 (MR 2922)

Includes some udev rule tweaks to improve camera unloading/loading, and
some audio switching fix

[ci:skip-build] already built successfully in CI

device/main/device-purism-librem5/0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch

-From f66139789e57370c6759b805721d31a3af0141cc Mon Sep 17 00:00:00 2001
+From 0b1bcc5b931e6c30514ce96b2ce388ddd392052a Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
-Date: Mon, 15 Nov 2021 09:45:06 -0800
+Date: Wed, 9 Feb 2022 12:49:19 -0800
 Subject: [PATCH] udev/cameras: use correct path for modprobe on Alpine Linux
 
 ---
- debian/librem5-base-defaults.librem5-cameras.udev | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ debian/librem5-base-defaults.librem5-cameras.udev | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/debian/librem5-base-defaults.librem5-cameras.udev b/debian/librem5-base-defaults.librem5-cameras.udev
-index 6bdf4c0..c5d4701 100644
+index b7f96f2..c986e62 100644
 --- a/debian/librem5-base-defaults.librem5-cameras.udev
 +++ b/debian/librem5-base-defaults.librem5-cameras.udev
-@@ -2,7 +2,7 @@
- # Then load the module again as the device is on.
- # If the removal fails, then the device is already properly initiated,
- # and had claimed its resources, which now prevent the removal.
--ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe s5k3l6xx"
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/rmmod s5k3l6xx", RUN+="/usr/sbin/modprobe s5k3l6xx"
--ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe hi846"
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/rmmod hi846", RUN+="/usr/sbin/modprobe hi846"
-+ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe s5k3l6xx"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/rmmod s5k3l6xx", RUN+="/sbin/modprobe s5k3l6xx"
-+ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe hi846"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/rmmod hi846", RUN+="/sbin/modprobe hi846"
+@@ -1,9 +1,9 @@
+ # Load and unload camera modules on camera killswitch changes
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe imx7_media_csi", RUN+="/usr/sbin/modprobe imx8mq_mipi_csi2"
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod imx7_media_csi", RUN+="/usr/sbin/rmmod imx8mq_mipi_csi2"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe imx7_media_csi", RUN+="/sbin/modprobe imx8mq_mipi_csi2"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod imx7_media_csi", RUN+="/sbin/rmmod imx8mq_mipi_csi2"
+ 
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe s5k3l6xx"
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod s5k3l6xx"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe s5k3l6xx"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod s5k3l6xx"
+ 
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe hi846"
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod hi846"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe hi846"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod hi846"
 -- 
-2.33.1
+2.35.1
 

device/main/device-purism-librem5/APKBUILD

@@ -3,9 +3,9 @@
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.28
-pkgrel=1
-_confver=41
+pkgver=1.29
+pkgrel=0
+_confver=47
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -135,7 +135,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-239fb3e62ea91106bcfcfdcfd576de1eaed3368d98d0905c38df71ae3c99483fed2756f276e4ff0afeab3f6f0e6cd960aeab7374547f9f28d12f79de9ca575f6  librem5-base-pureos-41pureos1.tar.gz
+e4729fbf111e691179d1aa11970c486315b88563782b46fddcfcb8e4ec02fb9a70a99cd3b74c039f26420d70a79b228f3bd8b0de8f995adfa2e9931e0275cb62  librem5-base-pureos-47pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
@@ -149,5 +149,5 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f
 5da1e39c36d8d83d159f8f9aa0b77c3de98b5d65054d0c3d376d64d87ef1e21b7570e0039e761b015917d4808e896e102d432dc8229e6189e80104dbd148ae4b  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 f535b43b8defe75e72049e4eee181bfe821f6304a096413bccf6d08c8bb11b947fa1fee305af85616abd778745fadd52ebd610c2d135a4f907915b99ab2c526a  0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch
-2639da6a7169ed9ad2eb09efd1d2462fe330554b9cf1d44f803a33699970d56f12ceddccf97574d245cb8858b26a4857e3dfbadb20862ada962619814ad058b4  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
+b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 "