alsa-1.0.0 fix #35522

7 files changed, 37 insertions, 57 deletions

diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index 5175050d59ae..631b84919c7a 100644
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,13 +1,16 @@
 # ChangeLog for games-emulation/dosbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.4 2003/10/18 07:28:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.5 2003/12/12 06:08:34 vapier Exp $
+
+*dosbox-0.60 (16 Oct 2003)
+
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add an alsa-1.0.0 patch to fix #35522.
 
   18 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> dosbox-0.60.ebuild:
   removed the depend on ncurses since we don't use the debugger; added
   src_compile
 
-*dosbox-0.60 (16 Oct 2003)
-
   16 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> dosbox-0.60.ebuild:
   version bump
 
diff --git a/games-emulation/dosbox/dosbox-0.57.ebuild b/games-emulation/dosbox/dosbox-0.57.ebuild
deleted file mode 100644
index ef7d8545451f..000000000000
--- a/games-emulation/dosbox/dosbox-0.57.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.57.ebuild,v 1.1 2003/09/09 16:26:49 vapier Exp $
-
-DESCRIPTION="DOSBox - DOS emulator"
-HOMEPAGE="http://dosbox.zophar.net"
-SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="sys-libs/ncurses
-	>=media-libs/libsdl-1.2.0
-	sys-libs/zlib"
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	#make DESTDIR=${D} install || die
-	einstall
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEW README THANKS
-}
diff --git a/games-emulation/dosbox/dosbox-0.58.ebuild b/games-emulation/dosbox/dosbox-0.58.ebuild
deleted file mode 100644
index 80e2448bff1c..000000000000
--- a/games-emulation/dosbox/dosbox-0.58.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.58.ebuild,v 1.1 2003/09/09 16:26:49 vapier Exp $
-
-inherit games
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND="sys-libs/ncurses
-	>=media-libs/libsdl-1.2.0
-	sys-libs/zlib"
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
-}
diff --git a/games-emulation/dosbox/dosbox-0.60.ebuild b/games-emulation/dosbox/dosbox-0.60.ebuild
index 4f6cc7fb2962..c204b1eedc56 100644
--- a/games-emulation/dosbox/dosbox-0.60.ebuild
+++ b/games-emulation/dosbox/dosbox-0.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.60.ebuild,v 1.2 2003/10/18 07:28:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.60.ebuild,v 1.3 2003/12/12 06:08:34 vapier Exp $
 
 inherit games
 
@@ -9,9 +9,8 @@ HOMEPAGE="http://dosbox.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
-
+KEYWORDS="x86"
 IUSE="alsa ncurses png"
 
 DEPEND="png? ( media-libs/libpng sys-libs/zlib )
@@ -19,9 +18,16 @@ DEPEND="png? ( media-libs/libpng sys-libs/zlib )
 	media-libs/sdl-net
 	>=media-libs/libsdl-1.2.0"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-alsa-1.0.0.patch
+}
+
 src_compile() {
 	egamesconf \
-		`use_enable alsa alsatest` || die
+		`use_enable alsa alsatest` \
+		|| die
 	emake || die "emake failed"
 }
 
diff --git a/games-emulation/dosbox/files/0.60-alsa-1.0.0.patch b/games-emulation/dosbox/files/0.60-alsa-1.0.0.patch
new file mode 100644
index 000000000000..998da4e00a1e
--- /dev/null
+++ b/games-emulation/dosbox/files/0.60-alsa-1.0.0.patch
@@ -0,0 +1,21 @@
+--- dosbox-0.60.orig/src/gui/midi_alsa.h	2003-12-12 01:02:33.207257320 -0500
++++ dosbox-0.60/src/gui/midi_alsa.h	2003-12-12 01:02:45.245427240 -0500
+@@ -16,12 +16,17 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <alsa/version.h>
++# if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#define ALSA_PCM_NEW_HW_PARAMS_API
++# endif
+ #include <alsa/asoundlib.h>
+ #include <ctype.h>
+ 
+ #define ADDR_DELIM	".:"
+ 
+-#if SND_LIB_MINOR >= 6
++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR==1
+ #define snd_seq_flush_output(x) snd_seq_drain_output(x)
+ #define snd_seq_set_client_group(x,name)	/*nop */
+ #define my_snd_seq_open(seqp) snd_seq_open(seqp, "hw", SND_SEQ_OPEN_OUTPUT, 0)
diff --git a/games-emulation/dosbox/files/digest-dosbox-0.57 b/games-emulation/dosbox/files/digest-dosbox-0.57
deleted file mode 100644
index f1e74fdb1099..000000000000
--- a/games-emulation/dosbox/files/digest-dosbox-0.57
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b12c73d00fea1e8dc9dbc2df7276637 dosbox-0.57.tar.gz 351897
diff --git a/games-emulation/dosbox/files/digest-dosbox-0.58 b/games-emulation/dosbox/files/digest-dosbox-0.58
deleted file mode 100644
index d69a70486cca..000000000000
--- a/games-emulation/dosbox/files/digest-dosbox-0.58
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91c49a597134f35f899d32a8b253205b dosbox-0.58.tar.gz 421487