summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-22 01:15:01 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-22 01:15:01 +0000
commitc06b2d148b50a780cb76efa6ab8ee678182210b6 (patch)
tree58d181c7ad6b9ba56d0bae13ccefcc8a70977ff3
parentremove gnome from metadata (diff)
downloadhistorical-c06b2d148b50a780cb76efa6ab8ee678182210b6.tar.gz
historical-c06b2d148b50a780cb76efa6ab8ee678182210b6.tar.bz2
historical-c06b2d148b50a780cb76efa6ab8ee678182210b6.zip
Add patch to fix build on PPC systems.
Package-Manager: portage-2.1_pre1
-rw-r--r--media-sound/alsa-driver/ChangeLog6
-rw-r--r--media-sound/alsa-driver/Manifest11
-rw-r--r--media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild3
-rw-r--r--media-sound/alsa-driver/files/alsa-driver-1.0.11_rc1-ppc.patch40
4 files changed, 53 insertions, 7 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index aac4e97e99a3..c44e220d5ba2 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/alsa-driver
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.176 2005/12/21 15:48:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.177 2005/12/22 01:15:01 flameeyes Exp $
+
+ 22 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/alsa-driver-1.0.11_rc1-ppc.patch, alsa-driver-1.0.11_rc1.ebuild:
+ Add patch to fix build on PPC systems.
*alsa-driver-1.0.11_rc1 (21 Dec 2005)
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index df5007770779..7d6ef55aeae8 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 415fe2a93beacda8891b2e5c79731036 ChangeLog 30648
+MD5 46cfbf2b14f1597fde91c37c6db6dc7c ChangeLog 30817
MD5 4d36586e82b663b31cef834a9fa0d38b alsa-driver-1.0.10-r1.ebuild 4720
MD5 c55716cc7bf263f6ed218b149e8dfe91 alsa-driver-1.0.10.ebuild 4623
MD5 83e0d77659b142d24afa2a86d91b3c4d alsa-driver-1.0.10_rc2.ebuild 4555
MD5 05d84ba8681d1e857e581caf97e6db59 alsa-driver-1.0.10_rc3.ebuild 4675
-MD5 3336205ef6fe2a1c8e9dfd1a99b5177d alsa-driver-1.0.11_rc1.ebuild 4630
+MD5 f5876b8d1e91f7d645382d6253115ab7 alsa-driver-1.0.11_rc1.ebuild 4667
MD5 afcbb70f92f2785ee73a764383c47611 alsa-driver-1.0.3.ebuild 3349
MD5 5f53d077d0ff6216fca0d50170172f0c alsa-driver-1.0.8.ebuild 4679
MD5 79f7336e1fcbf3cd90de84db0283b03a alsa-driver-1.0.9b.ebuild 4552
@@ -16,6 +16,7 @@ MD5 11884fe8b770282d2470c5620622e379 files/alsa-driver-1.0.10-oops.patch 1388
MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch 346
MD5 2f9a74cca5e78c63142073f0c90b9ff8 files/alsa-driver-1.0.10_rc2-audigy2zs.patch 460
MD5 f6a0e5f4624041d23bbd60726331310e files/alsa-driver-1.0.10_rc3-ppc-unbreakage.patch 2957
+MD5 73d10f717d9c0533efedc12c744c7942 files/alsa-driver-1.0.11_rc1-ppc.patch 1119
MD5 be4912a88e538a1f620b2fd422859ef6 files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch 513
MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10 72
MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10-r1 72
@@ -31,7 +32,7 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDqXl1AiZjviIA2XgRAnLjAKCUu+WXBURUA347dYij8o8clkgrOwCdEtl+
-8ITYL55bDzXT2RTHEbZ7UVM=
-=IrTg
+iD8DBQFDqf4rAiZjviIA2XgRAgPLAKDq6kZwaHTEwp6uPP5SvQ8xjR6G/ACgngrx
+WTWeihir0dn/JOaAetexkjg=
+=zwxT
-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild
index f579dc27caf1..7afcff50987b 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild,v 1.1 2005/12/21 15:48:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild,v 1.2 2005/12/22 01:15:01 flameeyes Exp $
inherit linux-mod flag-o-matic eutils
@@ -71,6 +71,7 @@ src_unpack() {
cd ${S}
epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
+ epatch "${FILESDIR}/${P}-ppc.patch"
convert_to_m ${S}/Makefile
sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.11_rc1-ppc.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11_rc1-ppc.patch
new file mode 100644
index 000000000000..f33f9b1325dc
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.11_rc1-ppc.patch
@@ -0,0 +1,40 @@
+Index: alsa-driver-1.0.11rc1/ppc/tumbler.patch
+===================================================================
+--- alsa-driver-1.0.11rc1.orig/ppc/tumbler.patch
++++ alsa-driver-1.0.11rc1/ppc/tumbler.patch
+@@ -15,21 +15,21 @@
+ static struct work_struct device_change;
+ +#endif
+
+- static void
+- device_change_handler(void *self)
+-@@ -895,7 +900,11 @@
+-
+- /* finally we need to schedule an update of the mixer values
+- (master and DRC are enough for now) -ReneR */
++ static void device_change_handler(void *self)
++ {
++@@ -1009,7 +1014,11 @@
++ mix = chip->mixer_data;
++ snd_assert(mix, return);
++ mix->auto_mute_notify = do_notify;
+ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ + schedule_task(&device_change);
+ +#else
+ schedule_work(&device_change);
+ +#endif
+-
+ }
+ }
+-@@ -1156,7 +1165,11 @@
++ #endif /* PMAC_SUPPORT_AUTOMUTE */
++@@ -1416,7 +1425,11 @@
+ chip->resume = tumbler_resume;
+ #endif
+
+@@ -40,4 +40,4 @@
+ +#endif
+
+ #ifdef PMAC_SUPPORT_AUTOMUTE
+- if (mix->headphone_irq >=0 && (err = snd_pmac_add_automute(chip)) < 0)
++ if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0)