diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-01-19 16:41:54 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-01-19 16:41:54 +0000 |
| commit | b6f01bac7d4fb9efb2dd21bcf846c0c46a0aff44 (patch) | |
| tree | c4545d788ace79fd54e7700ceb2b6bf8fb0dd068 /media-sound | |
| parent | Remove unneeded patch. Thanks to Jason Wever for reporting. (diff) | |
| download | gentoo-2-b6f01bac7d4fb9efb2dd21bcf846c0c46a0aff44.tar.gz gentoo-2-b6f01bac7d4fb9efb2dd21bcf846c0c46a0aff44.tar.bz2 gentoo-2-b6f01bac7d4fb9efb2dd21bcf846c0c46a0aff44.zip | |
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.
(Portage version: 2.1.2)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/alsa-driver/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch | 41 |
3 files changed, 51 insertions, 2 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/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) |