Use ALSA_CARDS variable to decide to install or not a series of firmwares; by doing this, we can also tweak the runtime dependency so that people asking for hdsp/hdspm will get alsa-tools (needed for hdsploader) and people asking for usb-usx2y will get fxload. Thanks to Risto A. Paju and Matthias Schwarzott (zzam) in bug #163414.

Package-Manager: portage-2.1.2-r9

5 files changed, 96 insertions, 5 deletions

diff --git a/media-sound/alsa-firmware/ChangeLog b/media-sound/alsa-firmware/ChangeLog
index 3f711119ffd8..e9e9f2cb66dd 100644
--- a/media-sound/alsa-firmware/ChangeLog
+++ b/media-sound/alsa-firmware/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/alsa-firmware
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.54 2007/02/11 23:33:44 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.55 2007/02/17 02:12:01 flameeyes Exp $
+
+*alsa-firmware-1.0.14_rc2-r1 (17 Feb 2007)
+
+  17 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/52-usx2yaudio.rules, +alsa-firmware-1.0.14_rc2-r1.ebuild:
+  Use ALSA_CARDS variable to decide to install or not a series of firmwares;
+  by doing this, we can also tweak the runtime dependency so that people
+  asking for hdsp/hdspm will get alsa-tools (needed for hdsploader) and people
+  asking for usb-usx2y will get fxload. Thanks to Risto A. Paju and Matthias
+  Schwarzott (zzam) in bug #163414.
 
   11 Feb 2007; Simon Stelling <blubb@gentoo.org>
   alsa-firmware-1.0.14_rc1.ebuild:
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index 666790839328..a6f8d41409d3 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 52-usx2yaudio.rules 971 RMD160 c51a34d4134980b7a467e75b15ef397a8f802d67 SHA1 9f5d17a14ec139b4162f0f2be170242431569eab SHA256 8be6ac4630c1c31339b572333dc797b347b9f56a0d151f7055c5e7aff648d8d1
+MD5 f4ee4b0cd68883a84b087685193d354b files/52-usx2yaudio.rules 971
+RMD160 c51a34d4134980b7a467e75b15ef397a8f802d67 files/52-usx2yaudio.rules 971
+SHA256 8be6ac4630c1c31339b572333dc797b347b9f56a0d151f7055c5e7aff648d8d1 files/52-usx2yaudio.rules 971
 DIST alsa-firmware-1.0.12.tar.bz2 2843601 RMD160 bab5128c20b8e85f01acc279ba5d389766076a0c SHA1 aa033609ebfedeccc21e120d54dc2dcb8e1d86e5 SHA256 6e7d3104c4de7d031790c1e750067b13e9481bf2855b0806a300d1e697549fbd
 DIST alsa-firmware-1.0.13.tar.bz2 2842664 RMD160 58354210d79e5c3a137d066d9d2278c6cfd0c492 SHA1 de5532d5456bc42317ae42f569a1e55391a8cd45 SHA256 28a704759a5f7bc4692cbff6988bb85c5d5cd6cf84d0d39208af65441c0d57bb
 DIST alsa-firmware-1.0.14rc1.tar.bz2 3003831 RMD160 b5e8885f97f33c95d8175832574a687207bc9da3 SHA1 e880c6616b1704dbf9084d5281d44dbbe0710f3d SHA256 57d4bc483b940ff92f241e18e1eaa9a12e6b504c1b689092c85853cbb8890097
@@ -14,14 +21,18 @@ EBUILD alsa-firmware-1.0.14_rc1.ebuild 739 RMD160 63bbe79a63ece29cc2288579b93a82
 MD5 fa8bb064cb35f9ceabc89d31ddd546d5 alsa-firmware-1.0.14_rc1.ebuild 739
 RMD160 63bbe79a63ece29cc2288579b93a822838c774db alsa-firmware-1.0.14_rc1.ebuild 739
 SHA256 c97721e5b16c08e96d4a02b6b4904c90892b90aca91d2d69395697072d14f928 alsa-firmware-1.0.14_rc1.ebuild 739
+EBUILD alsa-firmware-1.0.14_rc2-r1.ebuild 1892 RMD160 819f24315d89cce7c626b14a3e1291071c91ca71 SHA1 a8ec644e31f21c1e53965708800ee6e246e63a2a SHA256 f05bc8f88c057039f1d7dae57154a1346e752da5762173b8de762e60b9116027
+MD5 997f6735f07325cc06fdeb3d7ed8525d alsa-firmware-1.0.14_rc2-r1.ebuild 1892
+RMD160 819f24315d89cce7c626b14a3e1291071c91ca71 alsa-firmware-1.0.14_rc2-r1.ebuild 1892
+SHA256 f05bc8f88c057039f1d7dae57154a1346e752da5762173b8de762e60b9116027 alsa-firmware-1.0.14_rc2-r1.ebuild 1892
 EBUILD alsa-firmware-1.0.14_rc2.ebuild 748 RMD160 a89d358065a26aaa398217748c3a92b7d632cc02 SHA1 4f8d12a4f4b361ae0a42cf2749705b19738a14b6 SHA256 091fd842820bde96aa0d50e86c991f7b4488d6352d0ea69a03620017596f8c5d
 MD5 856e93b24f8bafdd735d58a636c90a03 alsa-firmware-1.0.14_rc2.ebuild 748
 RMD160 a89d358065a26aaa398217748c3a92b7d632cc02 alsa-firmware-1.0.14_rc2.ebuild 748
 SHA256 091fd842820bde96aa0d50e86c991f7b4488d6352d0ea69a03620017596f8c5d alsa-firmware-1.0.14_rc2.ebuild 748
-MISC ChangeLog 7630 RMD160 088cb1a7217719e42dd9f065bdd1d123e0ac787f SHA1 80127199fd9e7211045be50ab26603202b34cf80 SHA256 cdfcd200851e39c6199efdf2a8609d0876e2a1a894b3c35c4c7dec7dc83d701b
-MD5 9ee055fa0abc56ed00e52d08a8fc5607 ChangeLog 7630
-RMD160 088cb1a7217719e42dd9f065bdd1d123e0ac787f ChangeLog 7630
-SHA256 cdfcd200851e39c6199efdf2a8609d0876e2a1a894b3c35c4c7dec7dc83d701b ChangeLog 7630
+MISC ChangeLog 8141 RMD160 d79aca147a1ea117e8c8d8cbbba37726116b79c2 SHA1 57837a8aa506746d02dac631b25aaa170505c164 SHA256 f395154320dd4646520d5636773c3dda04caf6055c65a2532c9c555c63d331de
+MD5 595c964584550fdadbae6cdc51ca20c3 ChangeLog 8141
+RMD160 d79aca147a1ea117e8c8d8cbbba37726116b79c2 ChangeLog 8141
+SHA256 f395154320dd4646520d5636773c3dda04caf6055c65a2532c9c555c63d331de ChangeLog 8141
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -38,3 +49,13 @@ SHA256 6cc738207f04de25baac741f21849df67df42c9548fa0fc48f2d18814e408023 files/di
 MD5 98331528fd84bb13f59a768d10885233 files/digest-alsa-firmware-1.0.14_rc2 277
 RMD160 9bb5423bf18849862987fa05181c1c920c67a3d2 files/digest-alsa-firmware-1.0.14_rc2 277
 SHA256 28a0de262a871b5195ba3bd8ad6f2c7ae0b5b517a545d0810f20727461adcdd5 files/digest-alsa-firmware-1.0.14_rc2 277
+MD5 98331528fd84bb13f59a768d10885233 files/digest-alsa-firmware-1.0.14_rc2-r1 277
+RMD160 9bb5423bf18849862987fa05181c1c920c67a3d2 files/digest-alsa-firmware-1.0.14_rc2-r1 277
+SHA256 28a0de262a871b5195ba3bd8ad6f2c7ae0b5b517a545d0810f20727461adcdd5 files/digest-alsa-firmware-1.0.14_rc2-r1 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF1mR4AiZjviIA2XgRAkP2AKCM03l2qKIYlyzg27hJSdCT3TL57gCfcfqH
+E2UTcPVJW8h0fcUcBi6vNzY=
+=Aqu7
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.14_rc2-r1.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.14_rc2-r1.ebuild
new file mode 100644
index 000000000000..363308ccf5aa
--- /dev/null
+++ b/media-sound/alsa-firmware/alsa-firmware-1.0.14_rc2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.14_rc2-r1.ebuild,v 1.1 2007/02/17 02:12:01 flameeyes Exp $
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/firmware/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y
+alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi
+alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=""
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+src_compile() {
+	econf \
+		--with-hotplug-dir=/lib/firmware \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	use alsa_cards_pcxhr || rm -rf "${D}/usr/share/alsa/firmware/pcxhrloader" "${D}/lib/firmware/pcxhr"
+	use alsa_cards_vx222 || rm -rf "${D}/usr/share/alsa/firmware/vxloader" "${D}/lib/firmware/vx"
+	use alsa_cards_usb-usx2y || rm -rf "${D}/usr/share/alsa/firmware/usx2yloader" "${D}/lib/firmware/vx"
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${D}/usr/share/alsa/firmware/hdsploader"
+	use alsa_cards_mixart || rm -rf "${D}/usr/share/alsa/firmware/mixartloader" "${D}/lib/firmware/mixart"
+	use alsa_cards_asihpi || rm -rf "${D}/lib/firmware/asihpi"
+	use alsa_cards_sb16 || rm -rf "${D}/lib/firmware/sb16"
+	use alsa_cards_korg1212 || rm -rf "${D}/lib/firmware/korg"
+	use alsa_cards_maestro3 || rm -rf "${D}/lib/firmware/ess"
+
+	insinto /etc/udev/rules.d
+	use alsa_cards_usb-usx2y && doins "${FILESDIR}/52-usx2yaudio.rules"
+
+	dodoc README
+}
diff --git a/media-sound/alsa-firmware/files/52-usx2yaudio.rules b/media-sound/alsa-firmware/files/52-usx2yaudio.rules
new file mode 100644
index 000000000000..8765a02bb3dc
--- /dev/null
+++ b/media-sound/alsa-firmware/files/52-usx2yaudio.rules
@@ -0,0 +1,7 @@
+# Load firmware via fxload
+
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="1604", SYSFS{idProduct}=="800[157]", RUN+="/usr/bin/usx2yloader"
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="1604", SYSFS{idProduct}=="800[15]", RUN+="/sbin/startproc /usr/bin/us428control"
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="1604", SYSFS{idProduct}=="8000", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us428fw.ihx -D %N"
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="1604", SYSFS{idProduct}=="8004", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us224fw.ihx -D %N"
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="1604", SYSFS{idProduct}=="8006", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us122fw.ihx -D %N"
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.14_rc2-r1 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.14_rc2-r1
new file mode 100644
index 000000000000..9b265cbf5c97
--- /dev/null
+++ b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.14_rc2-r1
@@ -0,0 +1,3 @@
+MD5 98afcd48e4fc9bcf5e43276a9a81cb7f alsa-firmware-1.0.14rc2.tar.bz2 3084253
+RMD160 2971c1a310d667d2459d40d223b6b52b45da026d alsa-firmware-1.0.14rc2.tar.bz2 3084253
+SHA256 75b6b2894f4cdacea1c1898f370ffe11fdfe43a9625860d7205a517bd85e4994 alsa-firmware-1.0.14rc2.tar.bz2 3084253