Closing alsalib-1.0 compilation bug (38995)

4 files changed, 68 insertions, 7 deletions

diff --git a/media-sound/galan/ChangeLog b/media-sound/galan/ChangeLog
index 4bdb86b0d565..76304040cba0 100644
--- a/media-sound/galan/ChangeLog
+++ b/media-sound/galan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/galan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.3 2003/06/12 20:57:16 msterret Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.4 2004/02/01 12:31:14 ferringb Exp $
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org> galan-0.2.14.ebuild, 
+  files/galan-0.2.14-alsalib-fix.patch:
+  Patch to fix alsalib-1.0 compilation issues (38995)
 
   12 Jun 2003; <msterret@gentoo.org> galan-0.2.14.ebuild:
   fix Header
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
index da192674fcc4..a2e737276368 100644
--- a/media-sound/galan/Manifest
+++ b/media-sound/galan/Manifest
@@ -1,6 +1,6 @@
 MD5 ec6db2c234d9c55ef5dcf5238c547f9b galan-0.2.13d.ebuild 1061
-MD5 1063bcae437c2277f4e14f7769687745 ChangeLog 600
-MD5 6e1c54a8c7daabf28f8455a7e75efe5d galan-0.2.14.ebuild 1101
+MD5 d870aade9be62f575330a90c0a3c1611 ChangeLog 768
+MD5 d7515998f2933a8bcd25fae5630b9749 galan-0.2.14.ebuild 1100
 MD5 38bdd7c55254e5267b7daa66e27d1fea files/digest-galan-0.2.14 64
 MD5 31f452566899d2f189a64460bc71fd32 files/digest-galan-0.2.13d 65
-MD5 2252a69f76650687bbb0182d2f94f50a files/galan-0.2.14-alsalib-fix.patch 2006
+MD5 f291c312c9ac1307d9821704d09ed26b files/galan-0.2.14-alsalib-fix.patch 1862
diff --git a/media-sound/galan/files/galan-0.2.14-alsalib-fix.patch b/media-sound/galan/files/galan-0.2.14-alsalib-fix.patch
new file mode 100644
index 000000000000..f3c47a25491a
--- /dev/null
+++ b/media-sound/galan/files/galan-0.2.14-alsalib-fix.patch
@@ -0,0 +1,56 @@
+diff -ur galan-0.2.14/plugins/alsa_midi.c galan-0.2.14-fixed/plugins/alsa_midi.c
+--- galan-0.2.14/plugins/alsa_midi.c	2002-09-18 16:10:24.000000000 -0500
++++ galan-0.2.14-fixed/plugins/alsa_midi.c	2004-01-22 01:49:41.000000000 -0600
+@@ -28,6 +28,10 @@
+ 
+ //#include <sys/ioctl.h>
+ //#include <sys/soundcard.h>
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ 
+ #include <gdk/gdk.h>
+diff -ur galan-0.2.14/plugins/alsa_midi.la.c galan-0.2.14-fixed/plugins/alsa_midi.la.c
+--- galan-0.2.14/plugins/alsa_midi.la.c	2002-09-18 16:10:24.000000000 -0500
++++ galan-0.2.14-fixed/plugins/alsa_midi.la.c	2004-01-22 01:47:43.000000000 -0600
+@@ -28,6 +28,10 @@
+ 
+ //#include <sys/ioctl.h>
+ //#include <sys/soundcard.h>
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ 
+ #include <gdk/gdk.h>
+diff -ur galan-0.2.14/plugins/alsa_out.c galan-0.2.14-fixed/plugins/alsa_out.c
+--- galan-0.2.14/plugins/alsa_out.c	2003-03-15 01:17:25.000000000 -0600
++++ galan-0.2.14-fixed/plugins/alsa_out.c	2004-01-22 01:49:24.000000000 -0600
+@@ -36,6 +36,10 @@
+ #include "gencomp.h"
+ #include "msgbox.h"
+ #include "prefs.h"
++#include "alsa/version.h"
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include "alsa/asoundlib.h"
+ 
+ #define SIG_LEFT_CHANNEL	0
+diff -ur galan-0.2.14/plugins/alsa_out.la.c galan-0.2.14-fixed/plugins/alsa_out.la.c
+--- galan-0.2.14/plugins/alsa_out.la.c	2003-03-15 01:17:25.000000000 -0600
++++ galan-0.2.14-fixed/plugins/alsa_out.la.c	2004-01-22 01:53:49.000000000 -0600
+@@ -36,6 +36,10 @@
+ #include "gencomp.h"
+ #include "msgbox.h"
+ #include "prefs.h"
++#include "alsa/version.h"
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include "alsa/asoundlib.h"
+ 
+ #define SIG_LEFT_CHANNEL	0
diff --git a/media-sound/galan/galan-0.2.14.ebuild b/media-sound/galan/galan-0.2.14.ebuild
index b509184073cd..126bfa1d6856 100644
--- a/media-sound/galan/galan-0.2.14.ebuild
+++ b/media-sound/galan/galan-0.2.14.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/galan/galan-0.2.14.ebuild,v 1.6 2003/09/11 01:21:31 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.2.14.ebuild,v 1.7 2004/02/01 12:31:14 ferringb Exp $
 
 DESCRIPTION="gAlan - Graphical Audio Language"
 SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
@@ -27,6 +27,7 @@ DEPEND=">=x11-libs/gtk+-1.2*
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || die "Alsalib patch failed"
 }
 
 src_compile() {