Alsalib-1.0.* compilation fix (39095).

4 files changed, 37 insertions, 12 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 753fd4bca6f2..f8b80d390d78 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.22 2003/12/18 22:07:29 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.23 2004/02/01 12:59:26 ferringb Exp $
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild,
+  files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch:
+  Alsalib-1.0 compilation fix (39095)
 
   18 Dec 2003; Martin Holzer <mholzer@gentoo.org>
   jack-audio-connection-kit-0.75.0.ebuild,
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 8018ca8fdef6..bddecb16ec53 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,14 +1,15 @@
-MD5 1dbd8a07a841ce29bcaa941e78bcada6 ChangeLog 5460
-MD5 d532aa19216192d8ce60e24f7cf0d4c8 jack-audio-connection-kit-0.94.0.ebuild 1647
+MD5 188e2c3c1470b73105e743bcd7092fb6 jack-audio-connection-kit-0.80.0.ebuild 1666
 MD5 059883f82bda244d942e2e482f210437 jack-audio-connection-kit-0.90.1-r1.ebuild 1670
-MD5 d6caa1c1da4b5cfc226ad6cb65eff09d jack-audio-connection-kit-0.80.0.ebuild 1546
-MD5 39e329946c27d6e851079654466a44dc jack-audio-connection-kit-0.91.1.ebuild 1667
 MD5 dcf18370c825d7fc7b1f5894ea8609c3 jack-audio-connection-kit-0.75.0.ebuild 1542
+MD5 e6a691ef39887c14d87fd4ba0abf13f3 ChangeLog 5654
+MD5 39e329946c27d6e851079654466a44dc jack-audio-connection-kit-0.91.1.ebuild 1667
+MD5 d532aa19216192d8ce60e24f7cf0d4c8 jack-audio-connection-kit-0.94.0.ebuild 1647
 MD5 1f70b26f31a68be5e74991837146a502 jack-audio-connection-kit-0.90.1.ebuild 1546
 MD5 bf663ce8a92c2873735ff360edf99f5a metadata.xml 220
+MD5 8c4ad67d3f17536a7da2b84c8eac4424 files/digest-jack-audio-connection-kit-0.91.1 84
 MD5 7d6d70bef836d5da076c9ad12bfc10cf files/digest-jack-audio-connection-kit-0.94.0 84
-MD5 7463ea77f8d170d27b84fa8e7a9d498b files/digest-jack-audio-connection-kit-0.75.0 84
-MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
-MD5 5623bf1f03c3aa5bbc1ba1c8fb82cdac files/digest-jack-audio-connection-kit-0.90.1 84
 MD5 5623bf1f03c3aa5bbc1ba1c8fb82cdac files/digest-jack-audio-connection-kit-0.90.1-r1 84
-MD5 8c4ad67d3f17536a7da2b84c8eac4424 files/digest-jack-audio-connection-kit-0.91.1 84
+MD5 5623bf1f03c3aa5bbc1ba1c8fb82cdac files/digest-jack-audio-connection-kit-0.90.1 84
+MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
+MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
+MD5 7463ea77f8d170d27b84fa8e7a9d498b files/digest-jack-audio-connection-kit-0.75.0 84
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch
new file mode 100644
index 000000000000..9e92d1212cac
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch
@@ -0,0 +1,14 @@
+diff -ur jack-audio-connection-kit-0.80.0/drivers/alsa/alsa_driver.h jack-audio-connection-kit-0.80.0-fixed/drivers/alsa/alsa_driver.h
+--- jack-audio-connection-kit-0.80.0/drivers/alsa/alsa_driver.h	2003-08-28 19:06:30.000000000 -0500
++++ jack-audio-connection-kit-0.80.0-fixed/drivers/alsa/alsa_driver.h	2004-01-22 21:08:30.000000000 -0600
+@@ -21,6 +21,10 @@
+ #ifndef __jack_alsa_driver_h__
+ #define __jack_alsa_driver_h__
+ 
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ 
+ #include <jack/types.h>
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild
index 3256f003def9..4da69d76225c 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild,v 1.5 2004/01/19 07:48:09 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild,v 1.6 2004/02/01 12:59:26 ferringb Exp $
 
 inherit flag-o-matic
 
@@ -25,7 +25,12 @@ DEPEND=">=media-libs/alsa-lib-0.9.1
 
 PROVIDE="virtual/jack"
 
-
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || \
+		die "Alsalib-1.0 patch failed"
+}
 
 src_compile() {
 	local myconf