From 7a1bb6b997a9207fdd96c32c636c8a63fd44ff93 Mon Sep 17 00:00:00 2001
From: Stephen L Arnold <sarnold@vctlabs.com>
Date: Thu, 30 Nov 2023 14:48:58 -0800
Subject: [PATCH] x13s-firmware,alsa-ucm-conf: fw and user-space updates for
 latest x13s bits

* x13s-firmware currently needs git linux-firmware
* change alsa-ucm-conf to latest github changes, try to avoid git
  unpacking error => use 1.2.10.1 instead of live

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>
---
 media-libs/alsa-ucm-conf/Manifest             |  1 +
 .../alsa-ucm-conf-1.2.10.1.ebuild             | 30 ++++++++++++
 .../alsa-ucm-conf/alsa-ucm-conf-9999.ebuild   | 10 ++--
 sys-firmware/x13s-firmware/Manifest           |  1 +
 .../x13s-firmware-20231030.ebuild             | 46 +++++++++++++++++++
 .../x13s-firmware-99999999.ebuild             | 46 +++++++++++++++++++
 6 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 media-libs/alsa-ucm-conf/Manifest
 create mode 100644 media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.1.ebuild
 create mode 100644 sys-firmware/x13s-firmware/x13s-firmware-20231030.ebuild
 create mode 100644 sys-firmware/x13s-firmware/x13s-firmware-99999999.ebuild

diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
new file mode 100644
index 0000000..8db90b7
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -0,0 +1 @@
+DIST alsa-ucm-conf-1.2.10.1.tar.gz 65225 BLAKE2B 0c4362222c97745c972d7d715e89c2c9d46302b2beb775b8210d905c57491f242f64be4654eac460a94206a6c1f2f94149f28d8c77f01ba92d1261df6f490a93 SHA512 c721dff3dbbc3ca73ae5889aea1e837ebbfb021be6e633c81429c8f12b2ed0d140f9ad4988c31a8dbded17c2eaeebc8cfdc5ce3d2881d26bb98c9e82bc63bec2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.1.ebuild
new file mode 100644
index 0000000..18ad201
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Latest UCM fix branch for arm64 Lenovo thinkpad laptops, eg x13s"
+HOMEPAGE="https://github.com/VCTLabs/alsa-ucm-conf.git"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/VCTLabs/alsa-ucm-conf.git"
+	EGIT_BRANCH="x13s-volume-fixes"
+	#EGIT_COMMIT="4c2f7dc7aff14090e2b958136660fe3daacfef20"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/VCTLabs/${PN}/archive/refs/heads/x13s-volume-fixes.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+	S="${WORKDIR}/${PN}-x13s-volume-fixes"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-9999.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-9999.ebuild
index 40872ba..95a01e2 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-9999.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-DESCRIPTION="The missing alsa UCM bits for Lenovo thinkpad x13s (temporary)"
-HOMEPAGE="https://git.linaro.org/people/srinivas.kandagatla/alsa-ucm-conf.git"
+DESCRIPTION="Latest UCM fix branch for arm64 Lenovo thinkpad laptops, eg x13s"
+HOMEPAGE="https://github.com/VCTLabs/alsa-ucm-conf.git"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.linaro.org/people/srinivas.kandagatla/${PN}.git"
-	EGIT_BRANCH="x13s"
-	#EGIT_COMMIT="f0904c6c49332cafdb731004c19bfd1655cccdcf"
+	EGIT_REPO_URI="https://github.com/VCTLabs/alsa-ucm-conf.git"
+	EGIT_BRANCH="x13s-volume-fixes"
+	#EGIT_COMMIT="4c2f7dc7aff14090e2b958136660fe3daacfef20"
 	inherit git-r3
 else
 	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
diff --git a/sys-firmware/x13s-firmware/Manifest b/sys-firmware/x13s-firmware/Manifest
index 2d423a6..da17580 100644
--- a/sys-firmware/x13s-firmware/Manifest
+++ b/sys-firmware/x13s-firmware/Manifest
@@ -1,2 +1,3 @@
 DIST x13s-firmware-20230310.gh.tar.gz 143600 BLAKE2B f1c70a59a373a0416a6d9f8af225d0909ec4e11517323945a13d560d1ca4a310b9ba1b7ab94c16bb813e20acd328ab05ffd019dba5c986890dec5d86e8726454 SHA512 39b547d391ef28d5393fc25d3266bc1e0ea1f00d87ba31cd19bbb1dc570c59967c8150e1f261a2e8a411bba05277b8451d24cd8e33d1208dd3aebd3b56427ba5
 DIST x13s-firmware-20230317.gh.tar.gz 1030095 BLAKE2B 3086317006ae72e4fc08b81015c396348f80e8c2fc1c5483774a1f7b035748461380617c541895c1515425df3d95dc2716d5744eec002ca9f4fe0e00c5cc29c6 SHA512 538206953b36f92d8897db60ead9ca02bc7aaeb4b1707a042aa97a529de97004e5ea5a1c99d29fb95d7a5263630154bf3a9ec003c4862afc0b8c4c88929f2f27
+DIST x13s-firmware-20231030.gh.tar.gz 932367 BLAKE2B cb115ff4a876964f3062e27404ada83aa5b108833daf67c71b93cd9e50afc171ffaa8d9e0a42ee49616f921e854821f947410a83211042c33910e094ae6d4085 SHA512 1dcfa257836f9ccd594acc437754066bf385ff1bec16e9df3901b162a10e86c7061857e723793ba1bb6ccee960b1c467eb5f70334488a6c39ac1a89c47371547
diff --git a/sys-firmware/x13s-firmware/x13s-firmware-20231030.ebuild b/sys-firmware/x13s-firmware/x13s-firmware-20231030.ebuild
new file mode 100644
index 0000000..c71938b
--- /dev/null
+++ b/sys-firmware/x13s-firmware/x13s-firmware-20231030.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="x13s-alarm"
+
+DESCRIPTION="The missing/updated fw bits for Lenovo thinkpad x13s"
+HOMEPAGE="https://github.com/ironrobin/x13s-alarm/tree/trunk/x13s-firmware"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/ironrobin/${MY_PN}.git"
+	EGIT_BRANCH="trunk"
+	inherit git-r3
+else
+	GIT_COMMIT="35c448cf104887bbbd8154e62f8fb1da46475173"
+	SRC_URI="https://github.com/ironrobin/${MY_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~arm ~arm64"
+	S="${WORKDIR}"/${MY_PN}-${GIT_COMMIT}
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	sys-kernel/linux-firmware
+"
+RESTRICT="strip test"
+
+QA_PREBUILT="*"
+
+src_install() {
+	install -d ${D}/lib/firmware/qca ${D}/lib/firmware/qcom/sc8280xp/LENOVO/21BX
+	# BT firmware
+	cp -v x13s-firmware/hpnv21.b8c ${D}/lib/firmware/qca/
+	# GPU firmware
+	cp -v x13s-firmware/a690_gmu.bin ${D}/lib/firmware/qcom/
+	# audio firmware
+	cp -v x13s-firmware/qcvss8280.mbn ${D}/lib/firmware/qcom/sc8280xp/LENOVO/21BX/
+
+	# include BT bdaddr fix for 6.3+
+	newinitd "${FILESDIR}"/bdaddr-init bdaddr
+	newconfd "${FILESDIR}"/bdaddr-conf bdaddr
+}
diff --git a/sys-firmware/x13s-firmware/x13s-firmware-99999999.ebuild b/sys-firmware/x13s-firmware/x13s-firmware-99999999.ebuild
new file mode 100644
index 0000000..edf9b43
--- /dev/null
+++ b/sys-firmware/x13s-firmware/x13s-firmware-99999999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="x13s-alarm"
+
+DESCRIPTION="The missing/updated fw bits for Lenovo thinkpad x13s"
+HOMEPAGE="https://github.com/ironrobin/x13s-alarm/tree/trunk/x13s-firmware"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/ironrobin/${MY_PN}.git"
+	EGIT_BRANCH="trunk"
+	inherit git-r3
+else
+	GIT_COMMIT="35c448cf104887bbbd8154e62f8fb1da46475173"
+	SRC_URI="https://github.com/ironrobin/${MY_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~arm ~arm64"
+	S="${WORKDIR}"/${MY_PN}-${GIT_COMMIT}
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	~sys-kernel/linux-firmware-99999999
+"
+RESTRICT="strip test"
+
+QA_PREBUILT="*"
+
+src_install() {
+	install -d ${D}/lib/firmware/qca ${D}/lib/firmware/qcom/sc8280xp/LENOVO/21BX
+	# BT firmware
+	cp -v x13s-firmware/hpnv21.b8c ${D}/lib/firmware/qca/
+	# GPU firmware
+	cp -v x13s-firmware/a690_gmu.bin ${D}/lib/firmware/qcom/
+	# audio firmware
+	cp -v x13s-firmware/qcvss8280.mbn ${D}/lib/firmware/qcom/sc8280xp/LENOVO/21BX/
+
+	# include BT bdaddr fix for 6.3+
+	newinitd "${FILESDIR}"/bdaddr-init bdaddr
+	newconfd "${FILESDIR}"/bdaddr-conf bdaddr
+}