purism-librem5: revert ucm, other cleanup (MR 4138)

changes:

- don't try to set gnss-share socket in geoclue

- install Alsa UCM configs from purism

  Upstream ucm is broken when migrating from the purism ucm, so let's
  just use ucm from purism until someone upstreams something that works.
  What I upstreamed was based on an older ucm from Purism, what they are
  shipping is more correct than upstream ucm...

  This reverts commit 70b7813fee.

  fixes #2134

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

device/main/device-purism-librem5/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=device-purism-librem5
-pkgver=1.47
+pkgver=1.48
 pkgrel=0
 _confver=60
 _purismrel=1
@@ -15,7 +15,7 @@ license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf>=1.2.9
+	alsa-ucm-conf
 	gnss-share
 	i2c-tools
 	iw
@@ -57,6 +57,8 @@ subpackages="
 	$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"
@@ -143,6 +145,16 @@ package() {
 	# Wifi / PM
 	install -Dm644 "$srcdir"/70-wifi-pm.rules -t "$pkgdir"/usr/lib/udev/rules.d/
 
+	# install audio config files from Purism
+	install -Dm644 "$builddir"/default/audio/ucm2/simple-card/Librem\ 5.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/NXP/iMX8/Librem_5/Librem\ 5.conf
+	install -Dm644 "$builddir"/default/audio/ucm2/simple-card/HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/NXP/iMX8/Librem_5/HiFi.conf
+	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
+	# relative path seems to be required or else alsa-lib can't figure it out
+	ln -s ../../NXP/iMX8/Librem_5/Librem\ 5.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/Librem\ 5.conf
+
 	# ship mode service
 	install -Dm755 "$builddir"/default/shipmode/l5-poweroff-shipmode \
 		-t "$pkgdir"/usr/sbin/

device/main/device-purism-librem5/device-purism-librem5.post-install

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# Enable GPS support
-sed -i 's|# nmea-socket=/var/run/gps-share.sock|nmea-socket=/var/run/gnss-share.sock|' /etc/geoclue/geoclue.conf
-
 rc-update -qq del gpsd
 rc-update -q add gnss-share
 rc-update -q add l5-ship-mode shutdown