Add patch that should fix tumbler.c applying (and thus alsa-driver building) on PowerPC, and close bug #162786. Thanks to Marcel Unbehaun for reporting.

Package-Manager: portage-2.1.2

4 files changed, 66 insertions, 13 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index e4d2f077ad7d..855f8991af66 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.256 2007/01/16 22:56:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.257 2007/01/19 16:41:54 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch,
+  alsa-driver-1.0.14_rc2.ebuild:
+  Add patch that should fix tumbler.c applying (and thus alsa-driver building)
+  on PowerPC, and close bug #162786. Thanks to Marcel Unbehaun for reporting.
 
 *alsa-driver-1.0.14_rc2 (16 Jan 2007)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 67772c0cd7ba..d3c9b2bfd8ac 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -5,6 +5,10 @@ AUX alsa-driver-1.0.11-kernel-2.6.17.patch 953 RMD160 8790da12c78912a4dec53f2878
 MD5 5e6246cc8148d4938810985fef9fc6c2 files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
 RMD160 8790da12c78912a4dec53f287838846e303a18dd files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
 SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
+AUX alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105 RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f SHA1 c4dd46e302417272b1123fc435d742e89677ee8d SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76
+MD5 e755c981c442750f6ecbc088ba86d9ba files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
+RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
+SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76 files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
 DIST alsa-driver-1.0.14rc2.tar.bz2 2525315 RMD160 cdaadd027d7be5a71e4fe281efcbbd9b64f7b892 SHA1 6a8fcab92e64da092aa0f566e13d1634b1ed1d2a SHA256 67e0f2ab476c0f08c642b33e4f57b17311fa07fd56eb3a02c76df22738f6d387
@@ -16,18 +20,18 @@ EBUILD alsa-driver-1.0.14_rc1.ebuild 6455 RMD160 f9c84b5478044e8f418d96f9c4cfdf2
 MD5 030d3fb68993970d295c196b6394aee3 alsa-driver-1.0.14_rc1.ebuild 6455
 RMD160 f9c84b5478044e8f418d96f9c4cfdf2c21ad66a8 alsa-driver-1.0.14_rc1.ebuild 6455
 SHA256 d0f5af36cb7f584a20a026bfcd0f01f96f06814fde24844a0afa3f3215ff8ba1 alsa-driver-1.0.14_rc1.ebuild 6455
-EBUILD alsa-driver-1.0.14_rc2.ebuild 6461 RMD160 bf57bd7c1bf212faaf270e699e143cff521fbdac SHA1 fdeface0762cd09e41b724a58a0434ffcf2ec9a2 SHA256 d6b6380637e5974bd1ddf359775cf7ee5775c46ecb620e45a5a9578d3f7e74cd
-MD5 375187d1e0e0c3e71b8b79c997f57c5c alsa-driver-1.0.14_rc2.ebuild 6461
-RMD160 bf57bd7c1bf212faaf270e699e143cff521fbdac alsa-driver-1.0.14_rc2.ebuild 6461
-SHA256 d6b6380637e5974bd1ddf359775cf7ee5775c46ecb620e45a5a9578d3f7e74cd alsa-driver-1.0.14_rc2.ebuild 6461
+EBUILD alsa-driver-1.0.14_rc2.ebuild 6507 RMD160 2f313c61a3bd260013ae143f244f73e4c4026f18 SHA1 76b189c391de97044e090779eb1eee45de99bace SHA256 e21259f0e250704074befd65121fbf8feba5267eb3ea304b7c4d74794beb0032
+MD5 82866ffb0cb4055756e6a39127c4cb0c alsa-driver-1.0.14_rc2.ebuild 6507
+RMD160 2f313c61a3bd260013ae143f244f73e4c4026f18 alsa-driver-1.0.14_rc2.ebuild 6507
+SHA256 e21259f0e250704074befd65121fbf8feba5267eb3ea304b7c4d74794beb0032 alsa-driver-1.0.14_rc2.ebuild 6507
 EBUILD alsa-driver-9999.ebuild 7129 RMD160 3f8320aa67c55d5fa1ad1f1140dbcdc13e1c9b55 SHA1 4cc84a5f39f7ab0d305d9541f147eb3a370bc910 SHA256 5a8b364ec4100060a046767012bf609ddae1552b179b4e2f99d33da362a99bf0
 MD5 60d06e89483c5d9a55f7743062fc49d5 alsa-driver-9999.ebuild 7129
 RMD160 3f8320aa67c55d5fa1ad1f1140dbcdc13e1c9b55 alsa-driver-9999.ebuild 7129
 SHA256 5a8b364ec4100060a046767012bf609ddae1552b179b4e2f99d33da362a99bf0 alsa-driver-9999.ebuild 7129
-MISC ChangeLog 44478 RMD160 68dbacf63918b277d0631279bcf90cc5d12e555d SHA1 5cd9a87111e8b949579ea046475f93c519201ece SHA256 7dc25880d36233677f3eb2f61b841ebe3ff2b693749b98202790412252714873
-MD5 9faed84f149c97734e18a2900f4ec752 ChangeLog 44478
-RMD160 68dbacf63918b277d0631279bcf90cc5d12e555d ChangeLog 44478
-SHA256 7dc25880d36233677f3eb2f61b841ebe3ff2b693749b98202790412252714873 ChangeLog 44478
+MISC ChangeLog 44773 RMD160 1ea99ad0795b90c02e183222ebcc2c4c355c82b8 SHA1 7ee73eb26a6f9603db43066a902fe35f20a64c94 SHA256 aff471a3b1871fe765e50f576235ae5cf1bcbc6b2a9a1036a811a05cf56af9af
+MD5 43b9818e353a6b86c058aa3b96175066 ChangeLog 44773
+RMD160 1ea99ad0795b90c02e183222ebcc2c4c355c82b8 ChangeLog 44773
+SHA256 aff471a3b1871fe765e50f576235ae5cf1bcbc6b2a9a1036a811a05cf56af9af ChangeLog 44773
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -47,7 +51,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFrVgnAiZjviIA2XgRAi89AJ9DpD98eM4tDYMNuYPSMs0oT9IOQQCg6y+n
-zfhNBB7Ft5mOPySQM4CqBIQ=
-=Bxgg
+iD8DBQFFsPTaAiZjviIA2XgRAgJ+AJ98i0KeNCqxKinNjPeC84Gbjgc+uQCeJqjs
+YJ9Otj+lJBQVEVPJvcxDAVc=
+=uHGa
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
index 319718659679..1e28159e8900 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.14_rc2.ebuild,v 1.1 2007/01/16 22:56:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild,v 1.2 2007/01/19 16:41:54 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib
 
@@ -101,6 +101,8 @@ src_unpack() {
 
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-tumbler-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.14_rc2-tumbler-ppc.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch
new file mode 100644
index 000000000000..7fa8d10e8154
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch
@@ -0,0 +1,41 @@
+Index: alsa-driver-1.0.14rc2/ppc/tumbler.patch
+===================================================================
+--- alsa-driver-1.0.14rc2.orig/ppc/tumbler.patch
++++ alsa-driver-1.0.14rc2/ppc/tumbler.patch
+@@ -5,7 +5,7 @@
+  /*
+   * PMac Tumbler/Snapper lowlevel functions
+   *
+-@@ -940,7 +941,11 @@
++@@ -940,8 +941,12 @@
+  	}
+  }
+  
+@@ -14,6 +14,7 @@
+ +#else
+  static struct work_struct device_change;
+ +#endif
++ static struct snd_pmac *device_change_chip;
+  
+  static void device_change_handler(void *self)
+  {
+@@ -29,15 +30,16 @@
+  	}
+  }
+  #endif /* PMAC_SUPPORT_AUTOMUTE */
+-@@ -1416,7 +1425,11 @@
++@@ -1416,8 +1425,12 @@
+  	chip->resume = tumbler_resume;
+  #endif
+  
+ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-+	INIT_TQUEUE(&device_change, device_change_handler, (void *)chip);
+++	INIT_TQUEUE(&device_change, device_change_handler);
+ +#else
+- 	INIT_WORK(&device_change, device_change_handler, (void *)chip);
++ 	INIT_WORK(&device_change, device_change_handler);
+ +#endif
++ 	device_change_chip = chip;
+  
+  #ifdef PMAC_SUPPORT_AUTOMUTE
+  	if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0)