Add patch to build serialmidi driver with kernel 2.6.17. See bug #137147.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 55 insertions, 13 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/Manifest b/media-sound/alsa-driver/Manifest
index c586f4843956..ed314979d148 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -13,6 +13,10 @@ AUX alsa-driver-1.0.10_rc1-include.patch 346 RMD160 ec6016414723673e089a4c8cda7e
 MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch 346
 RMD160 ec6016414723673e089a4c8cda7e7efe54904280 files/alsa-driver-1.0.10_rc1-include.patch 346
 SHA256 ad4f3c447e3b0f2b0ebdd5dfa9723875660b58210ddab7fc6fbb669d4628135d files/alsa-driver-1.0.10_rc1-include.patch 346
+AUX alsa-driver-1.0.11-kernel-2.6.17.patch 953 RMD160 8790da12c78912a4dec53f287838846e303a18dd SHA1 71b552329bc6ab179956b3f7d65f92fa393dec4c SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c
+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.11-powermac.patch 606 RMD160 00cabe7d0c0fb1839edf4718582fcb690920ec50 SHA1 71621053ab9efa1fd1d94108bff3af211edb5161 SHA256 af98ea8acbcdaec4210cd1370eebfdbd750e074600451a7473b26205c70433db
 MD5 781a67b4cfef4c9d809cefb8af2eeda8 files/alsa-driver-1.0.11-powermac.patch 606
 RMD160 00cabe7d0c0fb1839edf4718582fcb690920ec50 files/alsa-driver-1.0.11-powermac.patch 606
@@ -23,14 +27,14 @@ EBUILD alsa-driver-1.0.10-r2.ebuild 4791 RMD160 4940a1d64edb487b93b0d29f48d937fa
 MD5 9916e84eeec916e6f6ec0f3aeffccb6a alsa-driver-1.0.10-r2.ebuild 4791
 RMD160 4940a1d64edb487b93b0d29f48d937fa2563c3cc alsa-driver-1.0.10-r2.ebuild 4791
 SHA256 bdaa51fefcad30e94b4a663fb64db3aa9eaa089c9162dec3b8236407bd49c2fc alsa-driver-1.0.10-r2.ebuild 4791
-EBUILD alsa-driver-1.0.11.ebuild 4800 RMD160 140335ff0866eb25f42b85f675496e46ff0c8fac SHA1 b81f6c2c879ee2240a2f6d8aa1f3762e9a9d7940 SHA256 a1f320a583830fa04576f7b59aa2370ad712d9ec6928a05b8ce074d2082b3b65
-MD5 c97d339bc5647d0ae5ce709af6cb1da2 alsa-driver-1.0.11.ebuild 4800
-RMD160 140335ff0866eb25f42b85f675496e46ff0c8fac alsa-driver-1.0.11.ebuild 4800
-SHA256 a1f320a583830fa04576f7b59aa2370ad712d9ec6928a05b8ce074d2082b3b65 alsa-driver-1.0.11.ebuild 4800
-MISC ChangeLog 37024 RMD160 1c52187471cc7f34bf84fdc1c12e05c11ee5a568 SHA1 67f0d32aba0f782e0868761f13c515b7d68efc61 SHA256 e19184bb99e61d883e3d777176d92ffe9bfb13fe823626a79f119847e26ac01d
-MD5 7c88383f4e227720aa1808049a379402 ChangeLog 37024
-RMD160 1c52187471cc7f34bf84fdc1c12e05c11ee5a568 ChangeLog 37024
-SHA256 e19184bb99e61d883e3d777176d92ffe9bfb13fe823626a79f119847e26ac01d ChangeLog 37024
+EBUILD alsa-driver-1.0.11.ebuild 4884 RMD160 8adf73908233f8013fa49f2fa46834154bc926d3 SHA1 35d63fab01b46b1e5922bbd8196b4f53276e225f SHA256 d16fdbe9488fdb09a89b63af22cd51c19e03c701d2fcb628a1ced536811aba53
+MD5 62b628f8f3525e6bd5ec43cfb371c876 alsa-driver-1.0.11.ebuild 4884
+RMD160 8adf73908233f8013fa49f2fa46834154bc926d3 alsa-driver-1.0.11.ebuild 4884
+SHA256 d16fdbe9488fdb09a89b63af22cd51c19e03c701d2fcb628a1ced536811aba53 alsa-driver-1.0.11.ebuild 4884
+MISC ChangeLog 37230 RMD160 64d6598c664dfc83dc62c0b2be6d37dbe46778ac SHA1 95baa78c5ab8a18dc8d9dfae1c88e8fcb4484bc5 SHA256 155bb0d02ce3bf84d1ac691101412d07ff7a73c4741189cb9facd24b56d3cb98
+MD5 99b6789679f9c44333f623fa9f32676e ChangeLog 37230
+RMD160 64d6598c664dfc83dc62c0b2be6d37dbe46778ac ChangeLog 37230
+SHA256 155bb0d02ce3bf84d1ac691101412d07ff7a73c4741189cb9facd24b56d3cb98 ChangeLog 37230
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -44,7 +48,7 @@ SHA256 685909b916bf91fe04291a0f9dcb11865ed4efb588efb3b876ec3e367fede2ad files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEid3eAiZjviIA2XgRAl7sAJ9CUaeBYxp9Wy975Zy+7D6Gkn+rNQCgwBWX
-amkTBP/FaMMXxT88G/WDotk=
-=vyQv
+iD8DBQFElqmeAiZjviIA2XgRArg0AJ9cRQSzksj4V4mKI8JlhpaHzRhmRwCfeVKb
+r7JpibDC6ECNy6Gt2epAfLQ=
+=U/G5
 -----END PGP SIGNATURE-----
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)