diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-19 13:41:44 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-19 13:41:44 +0000 |
| commit | d71b7b1ffe5233b21f3311a7fa1924148c4c6bfd (patch) | |
| tree | 38988498adf1731282ecfbcf92a4cbc37ae134b2 /media-sound | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d71b7b1ffe5233b21f3311a7fa1924148c4c6bfd.tar.gz gentoo-2-d71b7b1ffe5233b21f3311a7fa1924148c4c6bfd.tar.bz2 gentoo-2-d71b7b1ffe5233b21f3311a7fa1924148c4c6bfd.zip | |
Add patch to build serialmidi driver with kernel 2.6.17. See bug #137147.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/alsa-driver/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/alsa-driver/alsa-driver-1.0.11.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch | 30 |
3 files changed, 40 insertions, 2 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index dcc0b15ef09f..d1d510290f40 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.216 2006/06/09 20:45:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.217 2006/06/19 13:41:43 flameeyes Exp $ + + 19 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/alsa-driver-1.0.11-kernel-2.6.17.patch, alsa-driver-1.0.11.ebuild: + Add patch to build serialmidi driver with kernel 2.6.17. See bug #137147. 09 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> alsa-driver-1.0.11.ebuild: diff --git a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild index f81371ec2bc1..979472a3953b 100644 --- a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild +++ b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.ebuild,v 1.10 2006/06/09 20:45:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild,v 1.11 2006/06/19 13:41:43 flameeyes Exp $ inherit linux-mod flag-o-matic eutils multilib @@ -73,6 +73,10 @@ src_unpack() { epatch "${FILESDIR}/${P}-powermac.patch" epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch + if kernel_is ge 2 6 17 ; then + epatch "${FILESDIR}/${P}-kernel-2.6.17.patch" + fi + 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-kernel-2.6.17.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch new file mode 100644 index 000000000000..825d87f7c8dc --- /dev/null +++ b/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch @@ -0,0 +1,30 @@ +In kernel 2.6.17 non-counting semaphores are replaced by mutexes, this patch +makes serialmidi driver to work with the changes. +Index: alsa-driver-1.0.11/drivers/serialmidi.c +=================================================================== +--- alsa-driver-1.0.11.orig/drivers/serialmidi.c ++++ alsa-driver-1.0.11/drivers/serialmidi.c +@@ -314,12 +314,12 @@ static void tx_loop(serialmidi_t *serial + if (driver == NULL) + return; + +- if (down_trylock(&tty->atomic_write)) ++ if (!mutex_trylock(&tty->atomic_write_lock)) + return; + while (1) { + count = driver->write_room(tty); + if (count <= 0) { +- up(&tty->atomic_write); ++ mutex_unlock(&tty->atomic_write_lock); + return; + } + count = count > TX_BUF_SIZE ? TX_BUF_SIZE : count; +@@ -336,7 +336,7 @@ static void tx_loop(serialmidi_t *serial + break; + } + } +- up(&tty->atomic_write); ++ mutex_unlock(&tty->atomic_write_lock); + } + + static void ldisc_write_wakeup(struct tty_struct *tty) |