From ba2ec41c9683e4375444433a50841dfa04da94c1 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 16 Jun 2025 20:51:03 +0200
Subject: [PATCH] OP6/OP6T: disable alsa-restore.service

This results in the main speaker not working, so disable it.

Related: issue 3747

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6674
---
 .../80-device-oneplus-enchilada.preset           |  4 ++++
 .../community/device-oneplus-enchilada/APKBUILD  | 16 ++++++++++++++--
 .../80-device-oneplus-fajita.preset              |  4 ++++
 device/community/device-oneplus-fajita/APKBUILD  | 13 +++++++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 device/community/device-oneplus-enchilada/80-device-oneplus-enchilada.preset
 create mode 100644 device/community/device-oneplus-fajita/80-device-oneplus-fajita.preset

diff --git a/device/community/device-oneplus-enchilada/80-device-oneplus-enchilada.preset b/device/community/device-oneplus-enchilada/80-device-oneplus-enchilada.preset
new file mode 100644
index 000000000..b6acde2d1
--- /dev/null
+++ b/device/community/device-oneplus-enchilada/80-device-oneplus-enchilada.preset
@@ -0,0 +1,4 @@
+# Disable alsa-restore.service as it results in main audio speaker not working:
+# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3747
+disable alsa-restore.service
+disable alsa-state.service
diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD
index 3d71ffea3..08715ff84 100644
--- a/device/community/device-oneplus-enchilada/APKBUILD
+++ b/device/community/device-oneplus-enchilada/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=16
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,9 +27,14 @@ source="
 	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
+	80-device-oneplus-enchilada.preset
 	81-libssc-oneplus-enchilada.rules
 "
-subpackages="$pkgname-pmtest $pkgname-openrc"
+subpackages="
+	$pkgname-pmtest
+	$pkgname-openrc
+	$pkgname-systemd
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -62,10 +67,17 @@ pmtest() {
 	devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgname.post-install"
 }
 
+systemd() {
+	install -Dm644 -t "$subpkgdir"/usr/lib/systemd/system-preset \
+		80-device-oneplus-enchilada.preset
+	default_systemd
+}
+
 sha512sums="
 7f92f3ddfb7c107fe7661c1c5377905076c795b33800f4d53bc70c2585cc6d6108be45f430986e921cfa9eb6b989b952d787a2cde47bd098d0f030653e8ec3fa  deviceinfo
 c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
+a72de3293bc59e0afa0114d74030e4e725959f7619879ab616b0164595d57033affc3d1d4ccc9d8bc191b177a4c1593c1ad0a19fe7e452c3e0c9c847135c1102  80-device-oneplus-enchilada.preset
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-oneplus-enchilada.rules
 "
diff --git a/device/community/device-oneplus-fajita/80-device-oneplus-fajita.preset b/device/community/device-oneplus-fajita/80-device-oneplus-fajita.preset
new file mode 100644
index 000000000..b6acde2d1
--- /dev/null
+++ b/device/community/device-oneplus-fajita/80-device-oneplus-fajita.preset
@@ -0,0 +1,4 @@
+# Disable alsa-restore.service as it results in main audio speaker not working:
+# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3747
+disable alsa-restore.service
+disable alsa-state.service
diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD
index 529d6c905..33cf1a73f 100644
--- a/device/community/device-oneplus-fajita/APKBUILD
+++ b/device/community/device-oneplus-fajita/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=16
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,13 +24,15 @@ source="
 	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
+	80-device-oneplus-fajita.preset
 	81-libssc-oneplus-fajita.rules
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-pmtest
-	"
+	$pkgname-systemd
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -71,10 +73,17 @@ pmtest() {
 	devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgname.post-install"
 }
 
+systemd() {
+	install -Dm644 -t "$subpkgdir"/usr/lib/systemd/system-preset \
+		80-device-oneplus-fajita.preset
+	default_systemd
+}
+
 sha512sums="
 9804e3b1521b86a30c7e93b9bbdbd93a658bfc95720d5eb17106f0171cafc8858da2dfe4b5a8208e6669c21351273a4d6c9f789519414c1a931b07b9381ac50e  deviceinfo
 6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
+a72de3293bc59e0afa0114d74030e4e725959f7619879ab616b0164595d57033affc3d1d4ccc9d8bc191b177a4c1593c1ad0a19fe7e452c3e0c9c847135c1102  80-device-oneplus-fajita.preset
 f4961015c920c50182d35767de080f16ec348ff693a8cca91dd2593640cf19c31c1e6eac1e8a12a1d38946755eb21bdacad29c9e972adaec854500ab3a7ad3a0  81-libssc-oneplus-fajita.rules
 "