Added alsa fix, fixes #38114.

4 files changed, 42 insertions, 9 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 2d9201551a1d..8ba1103cce37 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/kaffe
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.12 2004/01/09 09:23:46 karltk Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.13 2004/01/17 16:48:07 strider Exp $
+
+  17 Jan 2004; Adrian Almenar <strider@gentoo.org> kaffe-1.1.3.ebuild,
+  files/kaffe-1.1.3-alsa-fix.patch:
+  Added alsa fix, fixes #38114.
 
 *kaffe-1.1.3 (09 Jan 2004)
 
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 37bb143f3d12..b892c54e04ac 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,15 +1,16 @@
+MD5 ad55937f63a11874f18afa20ec5afad8 kaffe-1.0.7_rc1-r1.ebuild 840
+MD5 a78545a263af580081e354506bc6a8dd kaffe-1.1.3.ebuild 961
+MD5 cee7ebfd6273eab3199a9040518ddb88 kaffe-1.1.0.ebuild 840
+MD5 6ca75d42cc5f9d5abcb8288cbb748644 kaffe-1.0.6-r3.ebuild 902
+MD5 0184b42ccd6d5637140fa7171a75e91a ChangeLog 2119
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 0a77b3e87d6be7b2253a581fedc865bf files/kaffe-1.1.0 550
 MD5 63bb35d4480ac67d75e064e275936710 files/kaffe-1.1.3 550
 MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89
 MD5 e1e85617ddd8dde310270aca97602090 files/kaffe-1.0.6-r3-gentoo.diff 380
+MD5 eba08dacb4ca2151bb44966c8f3fc005 files/kaffe-1.1.3-alsa-fix.patch 1129
 MD5 ef9811f6125f5297bd5af820e74053c9 files/digest-kaffe-1.1.0 64
 MD5 10a58379e740914e03778358a2864f77 files/digest-kaffe-1.1.3 64
 MD5 9a19e608288e9877e97f98ca8de8ef9a files/digest-kaffe-1.0.6-r3 64
 MD5 e553b1020af1c1c8d98041dffca2f51b files/kaffe-1.0.7_rc1 603
 MD5 08588ae6ef3e4824baadb98e32d77267 files/digest-kaffe-1.0.7_rc1-r1 68
-MD5 ad55937f63a11874f18afa20ec5afad8 kaffe-1.0.7_rc1-r1.ebuild 840
-MD5 838059907282265dbee0d6dfec0a982c kaffe-1.1.3.ebuild 913
-MD5 cee7ebfd6273eab3199a9040518ddb88 kaffe-1.1.0.ebuild 840
-MD5 6ca75d42cc5f9d5abcb8288cbb748644 kaffe-1.0.6-r3.ebuild 902
-MD5 0bdce886e5f3517f63c4d649394d1bc6 ChangeLog 1978
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/kaffe/files/kaffe-1.1.3-alsa-fix.patch b/dev-java/kaffe/files/kaffe-1.1.3-alsa-fix.patch
new file mode 100644
index 000000000000..ef72fefe5c0d
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.3-alsa-fix.patch
@@ -0,0 +1,27 @@
+--- kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmHWParams.c.ark 2003-12-09 15:24:29.000000000 +0100
++++ kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmHWParams.c 2003-12-09 15:25:24.000000000 +0100
+@@ -20,6 +20,11 @@
+  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++/* The following is needed for ALSA 1.x and doesn't have any effect on
++ * ALSA 0.9.x
++ */
++#define ALSA_PCM_OLD_HW_PARAMS_API 1
++
+ #include "org_tritonus_lowlevel_alsa_AlsaPcmHWParams.h"
+ #include "common.h"
+ 
+--- kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmSWParams.c.ark 2003-12-09 15:25:46.000000000 +0100
++++ kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmSWParams.c 2003-12-09 15:26:09.000000000 +0100
+@@ -20,6 +20,11 @@
+  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++/* The following is required on ALSA 1.0.x and doesn't have any effect
++ * on ALSA 0.9.x
++ */
++#define ALSA_PCM_OLD_SW_PARAMS_API 1
++
+ #include "common.h"
+ #include "org_tritonus_lowlevel_alsa_AlsaPcmSWParams.h"
diff --git a/dev-java/kaffe/kaffe-1.1.3.ebuild b/dev-java/kaffe/kaffe-1.1.3.ebuild
index a49c268f59cd..dd09795327df 100644
--- a/dev-java/kaffe/kaffe-1.1.3.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.3.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/dev-java/kaffe/kaffe-1.1.3.ebuild,v 1.1 2004/01/09 09:23:46 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.3.ebuild,v 1.2 2004/01/17 16:48:07 strider Exp $
 
 inherit java
 
@@ -20,6 +20,7 @@ KEYWORDS="~x86"
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/kaffe-1.1.3-alsa-fix.patch
 }
 
 src_compile() {