Alsalib-1.0 compilation fix (35457)

5 files changed, 76 insertions, 9 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 5842c20b31e8..8e42419a9eb7 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.11 2003/12/26 23:38:40 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.12 2004/02/01 13:32:34 ferringb Exp $
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  files/timidity++-2.12.0-alsalib-fix.patch:
+  Alsalib-1.0 compilation fix (35457)
 
   26 Dec 2003; Jason Wever <weeve@gentoo.org> timidity++-2.12.0-r3.ebuild:
   Added ~sparc keyword.
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index e224796577d8..4e52566bff83 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,8 +1,9 @@
 MD5 bf138e338b49ce80c3dd3818bf7e7765 ChangeLog 1909
-MD5 63bb779dd1814f0195335406d91c9cdd timidity++-2.12.0-r3.ebuild 2565
-MD5 699e087cff385ae5feb864aacc3d2c49 timidity++-2.12.0.ebuild 1938
+MD5 a0c9aa5bfe017a46385bc0e218990774 timidity++-2.12.0-r3.ebuild 2682
+MD5 c2b690b108bdd58d0ed4f23ce8a7f34d timidity++-2.12.0.ebuild 2055
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0 75
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
-MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
 MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
 MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
+MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
+MD5 8bbea1ed225e28e6c00e1cc57622b2d5 files/timidity++-2.12.0-alsalib-fix.patch 1355
diff --git a/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch b/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch
new file mode 100644
index 000000000000..1dedd0bd0397
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch
@@ -0,0 +1,49 @@
+diff -urN interface/alsaseq_c.c interface/alsaseq_c.c
+--- interface/alsaseq_c.c	2002-01-16 04:21:49.000000000 -0600
++++ interface/alsaseq_c.c	2004-01-21 01:46:55.414954936 -0600
+@@ -45,6 +45,7 @@
+ #endif
+ #include <signal.h>
+ 
++#define ALSA_PCM_OLD_HW_PARAMS_API
+ #include <sys/asoundlib.h>
+ 
+ #include "timidity.h"
+@@ -76,7 +77,7 @@
+ 
+ static struct seq_context alsactx;
+ 
+-#if SND_LIB_MINOR >= 6
++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR==1
+ /* !! this is a dirty hack.  not sure to work in future !! */
+ static int snd_seq_file_descriptor(snd_seq_t *handle)
+ {
+@@ -536,7 +537,7 @@
+ 			seq_play_event(&ev);
+ 		break;
+ 
+-#if SND_LIB_MINOR >= 6
++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR==1
+ #define snd_seq_addr_equal(a,b)	((a)->client == (b)->client && (a)->port == (b)->port)
+ 	case SND_SEQ_EVENT_PORT_SUBSCRIBED:
+ 		if (snd_seq_addr_equal(&aevp->data.connect.dest, &aevp->dest)) {
+diff -urN timidity/alsa_a.c timidity/alsa_a.c
+--- timidity/alsa_a.c	2002-01-16 04:15:20.000000000 -0600
++++ timidity/alsa_a.c	2004-01-21 00:39:51.324709640 -0600
+@@ -41,10 +41,15 @@
+ #endif
+ 
+ /*ALSA header file*/
++#define ALSA_PCM_OLD_HW_PARAMS_API
+ #include <sys/asoundlib.h>
+ 
+ #if defined(SND_LIB_MINOR)
+-#define ALSA_LIB  SND_LIB_MINOR
++# if SND_LIB_MAJOR==1
++# define ALSA_LIB 10
++# else
++# define ALSA_LIB  SND_LIB_MINOR
++# endif
+ #else
+ #define ALSA_LIB  3
+ #endif
diff --git a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
index a8436a2d80d5..27c57e5c0bef 100644
--- a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.7 2003/12/26 23:38:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.8 2004/02/01 13:32:34 ferringb Exp $
 
 MY_P=TiMidity++-${PV}-pre1
 S=${WORKDIR}/${MY_P}
@@ -26,6 +26,12 @@ DEPEND=">=sys-libs/ncurses-5.0
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	sys-devel/autoconf"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || die "Alsalib-1.0 patch failed"
+}
+
 src_compile() {
 	local myconf
 	local audios
diff --git a/media-sound/timidity++/timidity++-2.12.0.ebuild b/media-sound/timidity++/timidity++-2.12.0.ebuild
index dcf206fa0bcc..7f2132226a45 100644
--- a/media-sound/timidity++/timidity++-2.12.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0.ebuild,v 1.8 2003/09/08 07:09:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0.ebuild,v 1.9 2004/02/01 13:32:34 ferringb Exp $
 
 MY_P=TiMidity++-${PV}-pre1
 S=${WORKDIR}/${MY_P}
@@ -24,6 +24,12 @@ DEPEND=">=sys-libs/ncurses-5.0
 	tcltk? ( >=dev-lang/tk-8.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || die "Alsalib-1.0 patch failed"
+}
+
 src_compile() {
 	local myconf
 	local audios