[gentoo-commits] repo/proj/guru:dev commit in: media-libs/alsa-ucm-pinephone/files/, media-libs/alsa-ucm-pinephone/

[Gerben Jan Dijkman]

commit:     abeae71c7514b0161daed7e35404cf9e42d9fb5b
Author:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
AuthorDate: Thu Jan 20 23:32:22 2022 +0000
Commit:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
CommitDate: Thu Jan 20 23:32:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=abeae71c

media-libs/alsa-ucm-pinephone: Added PinePhone Pro support and move to releases

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver.nl>

 media-libs/alsa-ucm-pinephone/Manifest             |  2 +-
 .../alsa-ucm-pinephone-1.2.6.3.ebuild              | 64 ++++++++++++++++++++++
 .../alsa-ucm-pinephone-20220102.ebuild             | 29 ----------
 media-libs/alsa-ucm-pinephone/files/PinePhone.conf | 11 ++++
 .../alsa-ucm-pinephone/files/PinePhonePro.conf     | 16 ++++++
 5 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/media-libs/alsa-ucm-pinephone/Manifest b/media-libs/alsa-ucm-pinephone/Manifest
index 92f48c825..6336cd334 100644
--- a/media-libs/alsa-ucm-pinephone/Manifest
+++ b/media-libs/alsa-ucm-pinephone/Manifest
@@ -1 +1 @@
-DIST alsa-ucm-pinephone-20220102.tar.gz 3791 BLAKE2B 05a1576e173bda038d99ca92d9e97faa04388960745ca6571860eaedc975dec5883f8966c4ae11c3065345af82bb59f9f83af28bbbed89a59720eecf9f8d9438 SHA512 02934d117db9a9909554dc8d84151f7d71a7afb43a08b5d3b2a7cf3a0c9783274eba79a614fc44fa0ced74ada22cebde4366544dd928e20f03f42c168490c6fc
+DIST alsa-ucm-pinephone-1.2.6.3.tar.gz 4441 BLAKE2B 5999331e9769c60d1989248749b9c15a6804cf732299d11ea63107fc1afef7715c3ec30e7e1a15ac782e28d72fbb9a6748ae319244cef617ffc5d50d1b54b1b8 SHA512 2ced0519ade14a3865043d4e3cdab58072ab7ec1915f0fcb74dd7ecaa566074fca5f2d63ee9d6e86d013dd45b92da5892f9ec18025855c8d665a327c06212711

diff --git a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
new file mode 100644
index 000000000..79612e726
--- /dev/null
+++ b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="ec0ef36b8b897ed1ae6bb0d0de13d5776f5d3659"
+
+DESCRIPTION="ALSA ucm configuration files for the PinePhone (Pro)"
+HOMEPAGE="https://gitlab.com/pine64-org/pine64-alsa-ucm"
+SRC_URI="https://gitlab.com/pine64-org/pine64-alsa-ucm/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	>=media-libs/alsa-topology-conf-1.2.5
+	>=media-libs/alsa-lib-1.2.6
+	>=media-plugins/alsa-plugins-1.2.6
+	>=media-libs/alsa-ucm-conf-1.2.6
+	>=media-video/pipewire-0.3.42
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/pine64-alsa-ucm-${COMMIT}"
+
+src_install() {
+	#PinePhone Configs
+	insinto /usr/share/alsa/ucm2/PinePhone/
+	insopts -m644
+	doins "${S}"/ucm2/PinePhone/HiFi.conf
+	
+	insinto /usr/share/alsa/ucm2/PinePhone/
+	insopts -m644
+	doins "${S}"/ucm2/PinePhone/VoiceCall.conf
+	
+	insinto /usr/share/alsa/ucm2/PinePhone/
+	insopts -m644
+	doins "${FILESDIR}"/PinePhone.conf
+	
+	#PinePhone Pro Configs	
+	insinto /usr/share/alsa/ucm2/PinePhonePro/
+	insopts -m644
+	doins "${S}"/ucm2/PinePhonePro/HiFi.conf
+	
+	insinto /usr/share/alsa/ucm2/PinePhonePro/
+	insopts -m644
+	doins "${S}"/ucm2/PinePhonePro/VoiceCall.conf
+	
+	insinto /usr/share/alsa/ucm2/PinePhonePro/
+	insopts -m644
+	doins "${FILESDIR}"/PinePhonePro.conf
+	
+	#Create Symlinks
+	dosym /usr/share/alsa/ucm2/PinePhone/PinePhone.conf \
+	        /usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf
+	        
+	dosym /usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf \
+	        /usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf
+
+}

diff --git a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-20220102.ebuild b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-20220102.ebuild
deleted file mode 100644
index e2c290d25..000000000
--- a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-20220102.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="ff6beb59a927c3f3744261b35a5fb65682073e80"
-
-DESCRIPTION="ALSA ucm configuration files for PinePhone bases on the Manjaro ARM repo"
-HOMEPAGE="https://gitlab.manjaro.org/manjaro-arm/packages/community/pinephone/alsa-ucm-pinephone"
-SRC_URI="https://gitlab.manjaro.org/manjaro-arm/packages/community/pinephone/alsa-ucm-pinephone/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	>=media-libs/alsa-ucm-conf-1.2.6
-	"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/alsa-ucm-pinephone-${COMMIT}"
-
-src_install() {
-	insinto /usr/share/alsa/ucm2/PinePhone
-	doins -r "${S}"/*.conf
-}

diff --git a/media-libs/alsa-ucm-pinephone/files/PinePhone.conf b/media-libs/alsa-ucm-pinephone/files/PinePhone.conf
new file mode 100644
index 000000000..d136c4ca0
--- /dev/null
+++ b/media-libs/alsa-ucm-pinephone/files/PinePhone.conf
@@ -0,0 +1,11 @@
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "/PinePhone/HiFi.conf"
+	Comment "Play HiFi quality music"
+}
+
+SectionUseCase."Voice Call" {
+	File "/PinePhone/VoiceCall.conf"
+	Comment "Make a phone call"
+}

diff --git a/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf b/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf
new file mode 100644
index 000000000..0c146ecfd
--- /dev/null
+++ b/media-libs/alsa-ucm-pinephone/files/PinePhonePro.conf
@@ -0,0 +1,16 @@
+Syntax 4
+Comment "PinePhone Pro"
+
+SectionUseCase."HiFi" {
+        File "/PinePhonePro/HiFi.conf"
+        Comment "Play HiFi quality music"
+}
+
+SectionUseCase."Voice Call" {
+        File "/PinePhonePro/VoiceCall.conf"
+        Comment "Make a phone call"
+}
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.codec-init.File "/codecs/rt5640/init.conf"