Remove latest old version, remove stale patches, and re-add a needed one.

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index ab6fe35ff00f175f2c62e956f92f3e48b0e2c225..098ce29ddbf3a5c6d8096ddf319135e6e0011ac8 100644 (file)
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.246 2006/12/21 13:28:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.247 2006/12/21 15:57:53 flameeyes Exp $
+
+  21 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/alsa-driver-1.0.10_rc1-include.patch,
+  -files/alsa-driver-mcp55.patch,
+  +files/alsa-driver-1.0.11-kernel-2.6.17.patch, -alsa-driver-1.0.12.ebuild,
+  alsa-driver-1.0.13.ebuild, alsa-driver-1.0.14_rc1.ebuild,
+  alsa-driver-9999.ebuild:
+  Remove latest old version, remove stale patches, and re-add a needed one.
 
   21 Dec 2006; Bryan Østergaard <kloeri@gentoo.org>
   alsa-driver-1.0.13.ebuild:

diff --git a/media-sound/alsa-driver/alsa-driver-1.0.13.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.13.ebuild
index 8bceb7fa61f8171ead2ffff44f6d44bffa6f150c..5bd0780f88167e5eab3d26e39bcac845d79638cd 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-1.0.13.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.13.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.13.ebuild,v 1.6 2006/12/21 13:28:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.13.ebuild,v 1.7 2006/12/21 15:57:53 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib
 
@@ -71,10 +71,6 @@ src_unpack() {
 
        cd "${S}"
 
-       epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
-
-       epatch "${FILESDIR}/${PN}-mcp55.patch"
-
        if kernel_is ge 2 6 17 ; then
                # These are needed for some drivers to build with kernel 2.6.17
                # until a refreshed release of alsa-driver is done

diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild
index 6d7a0ac6ddbdf5089d025571c4ee71fb19b1f5e5..cd7fad72289176bb5f8183bf1e0716a9f93602b4 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.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.14_rc1.ebuild,v 1.1 2006/12/11 19:45:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild,v 1.2 2006/12/21 15:57:53 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -104,10 +104,6 @@ src_unpack() {
 
        cd "${S}"
 
-       epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
-
-       epatch "${FILESDIR}/${PN}-mcp55.patch"
-
        if kernel_is ge 2 6 17 ; then
                # These are needed for some drivers to build with kernel 2.6.17
                # until a refreshed release of alsa-driver is done

diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild
index a8bc9b6faf17ffd05d74ebc80852d080fe43ebe8..029bed228f5ebc6096a8b3e9113c3cf43cfcd8f0 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-9999.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-9999.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-9999.ebuild,v 1.1 2006/10/11 19:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.2 2006/12/21 15:57:53 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib autotools mercurial
 
@@ -67,11 +67,6 @@ src_unpack() {
        mercurial_fetch http://hg.alsa-project.org/alsa-driver
        mercurial_fetch http://hg.alsa-project.org/alsa-kernel alsa-driver/alsa-kernel
 
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
-
-       epatch "${FILESDIR}/${PN}-mcp55.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-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 (file)
index 0000000..825d87f
--- /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)