alsa-1.0.0 patch #35108

6 files changed, 18 insertions, 151 deletions

diff --git a/games-emulation/xmess/ChangeLog b/games-emulation/xmess/ChangeLog
index 16862b6c7b4c..137a94272551 100644
--- a/games-emulation/xmess/ChangeLog
+++ b/games-emulation/xmess/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for games-emulation/xmess
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.6 2003/11/30 05:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.7 2003/12/12 17:32:33 vapier Exp $
 
 *xmess-0.77.1 (30 Nov 2003)
 
+  12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to work with alsa-1.0.0 #35108.
+
   30 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump #33889.
 
diff --git a/games-emulation/xmess/files/0.76.1-glx-fix.patch b/games-emulation/xmess/files/0.76.1-glx-fix.patch
deleted file mode 100644
index 20d29a9d0573..000000000000
--- a/games-emulation/xmess/files/0.76.1-glx-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN xmame-0.70.1-orig/src/unix/osd_cpu.h xmame-0.70.1/src/unix/osd_cpu.h
---- xmame-0.70.1-orig/src/unix/osd_cpu.h	2003-06-12 05:37:50.000000000 +0200
-+++ xmame-0.70.1/src/unix/osd_cpu.h	2003-07-15 15:09:03.000000000 +0200
-@@ -39,11 +39,15 @@
- #endif
- 
- /* grrr work around some stupid header conflicts */
-+#ifndef xgl
- #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
- typedef signed   char      INT8;
- typedef signed   short     INT16;
- typedef signed   int       INT32;
- #endif
-+#else
-+#include <X11/Xmd.h>
-+#endif
- 
- #ifndef LONG64
- typedef signed   long long INT64;
diff --git a/games-emulation/xmess/files/0.77.1-alsa-1.0.0.patch b/games-emulation/xmess/files/0.77.1-alsa-1.0.0.patch
new file mode 100644
index 000000000000..c092e98da603
--- /dev/null
+++ b/games-emulation/xmess/files/0.77.1-alsa-1.0.0.patch
@@ -0,0 +1,12 @@
+--- src/unix/sysdep/dsp-drivers/alsa-old.c	2003-12-09 23:29:46.000000000 -0700
++++ src/unix/sysdep/dsp-drivers/alsa.c	2003-12-09 23:28:33.000000000 -0700
+@@ -59,6 +59,9 @@
+ 
+ #ifdef SYSDEP_DSP_ALSA
+ 
++/* Eventually we should use the 1.0 API. */
++#define ALSA_PCM_OLD_HW_PARAMS_API 1
++
+ #include <sys/ioctl.h>       /* System and I/O control */
+ #include <alsa/asoundlib.h>  /* ALSA sound library header */
+ #include "sysdep/sysdep_dsp.h"
diff --git a/games-emulation/xmess/files/digest-xmess-0.76.1 b/games-emulation/xmess/files/digest-xmess-0.76.1
deleted file mode 100644
index aab1d446aa1e..000000000000
--- a/games-emulation/xmess/files/digest-xmess-0.76.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 daccd7bd8068617b9a4fd0a5925b78a1 xmame-0.76.1.tar.bz2 11662704
diff --git a/games-emulation/xmess/xmess-0.76.1.ebuild b/games-emulation/xmess/xmess-0.76.1.ebuild
deleted file mode 100644
index 10d23a72ba2f..000000000000
--- a/games-emulation/xmess/xmess-0.76.1.ebuild
+++ /dev/null
@@ -1,129 +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/xmess/xmess-0.76.1.ebuild,v 1.1 2003/10/26 01:26:23 vapier Exp $
-
-inherit games flag-o-matic gcc eutils
-
-TARGET=${PN}
-
-DESCRIPTION="Multiple Arcade Machine Emulator for X11"
-SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
-HOMEPAGE="http://x.mame.net/"
-
-LICENSE="xmame"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha"
-IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick"
-
-DEPEND="sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	alsa? ( media-libs/alsa-lib )
-	xv? ( >=x11-base/xfree-4.1.0 )
-	dga? ( >=x11-base/xfree-4.1.0 )
-	esd? ( >=media-sound/esound-0.2.29 )
-	svga? ( media-libs/svgalib )
-	ggi? ( media-libs/libggi )
-	arts? ( kde-base/arts )
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/xmame-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-glx-fix.patch
-
-	[ ${ARCH} == "x86" ] && sed -i -e '/X86_ASM_68000 =/s:#::' -e '/X86_MIPS3_DRC =/s:#::' Makefile
-	[ ${ARCH} == "ppc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
-	[ ${ARCH} == "sparc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
-	[ ${ARCH} == "alpha" ] && sed -i '/^MY_CPU/s:i386:alpha:' Makefile
-	[ ${ARCH} == "mips" ] && sed -i '/^MY_CPU/s:i386:mips:' Makefile
-
-	[ ${ARCH} == "x86" ] && [ `use joystick` ] && sed -i '/JOY_I386.*=/s:#::' Makefile
-
-	[ `use esd` ] && sed -i '/SOUND_ESOUND/s:#::' Makefile
-	[ `use alsa` ] && sed -i '/SOUND_ALSA/s:#::' Makefile
-	[ `use arts` ] && sed -i '/SOUND_ARTS/s:#::' Makefile
-	[ `use sdl` ] && sed -i '/SOUND_SDL/s:#::' Makefile
-
-	if [ `use dga` ] ; then
-		sed -i '/X11_DGA/s:#::' Makefile
-		[ `use 3dfx` ] && sed -i '/TDFX_DGA_WORKAROUND/s:#::' Makefile
-	fi
-
-	[ `use xv` ] && sed -i '/X11_XV/s:#::' Makefile
-
-	sed -i \
-		-e "/^PREFIX/s:=.*:=/usr:" \
-		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
-		-e "/^TARGET/s:mame:${TARGET:1}:" \
-		Makefile
-
-	case ${ARCH} in
-		x86)	append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce -ffast-math
-			[ `gcc-major-version` -eq 3 ] \
-				&& append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
-				|| append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
-			;;
-		ppc)	append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
-			;;
-	esac
-	sed -i "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	[ ! -z "`use X``use dga``use xv`" ] && { make DISPLAY_METHOD=x11 || die; }
-	[ `use sdl` ] && { make DISPLAY_METHOD=SDL || die; }
-	[ `use svga` ] && { make DISPLAY_METHOD=svgalib || die; }
-	[ `use ggi` ] && { make DISPLAY_METHOD=ggi || die; }
-	[ `use opengl` ] && { make DISPLAY_METHOD=xgl || die; }
-}
-
-src_install() {
-	sed -i \
-		-e "s:Xmame:${TARGET}:g" \
-		-e "s:xmame:${TARGET}:g" \
-		doc/*.6
-	sed -i \
-		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
-		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
-		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
-		Makefile
-
-	[ ! -z "`use X``use dga``use xv`" ]	&& { make DISPLAY_METHOD=x11 install || die; }
-	[ `use sdl` ]				&& { make DISPLAY_METHOD=SDL install || die; }
-	[ `use svga` ]				&& { make DISPLAY_METHOD=svgalib install || die; }
-	[ `use ggi` ]				&& { make DISPLAY_METHOD=ggi install || die; }
-	[ `use opengl` ]			&& { make DISPLAY_METHOD=xgl install || die; }
-
-	cp -r ctrlr ${D}/${GAMES_DATADIR}/${PN}/
-	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
-	dohtml -r doc/*
-
-	if [ `use opengl` ] ; then
-		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
-	elif [ ! -z "`use X``use dga``use xv`" ] ; then
-		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
-	elif [ `use sdl` ] ; then
-		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
-	elif [ `use svga` ] ; then
-		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
-	elif [ `use ggi` ] ; then
-		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "Your available MAME binaries are:"
-	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
-	[ `use sdl` ] && einfo " ${TARGET}.SDL"
-	[ `use svga` ] && einfo " ${TARGET}.svgalib"
-	[ `use ggi` ] && einfo " ${TARGET}.ggi"
-	[ `use opengl` ] && einfo " ${TARGET}.xgl"
-}
diff --git a/games-emulation/xmess/xmess-0.77.1.ebuild b/games-emulation/xmess/xmess-0.77.1.ebuild
index 1853ae5b13ce..6ccfa0cd79f2 100644
--- a/games-emulation/xmess/xmess-0.77.1.ebuild
+++ b/games-emulation/xmess/xmess-0.77.1.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/xmess/xmess-0.77.1.ebuild,v 1.1 2003/11/30 05:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.77.1.ebuild,v 1.2 2003/12/12 17:32:33 vapier Exp $
 
 inherit games flag-o-matic gcc eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-glx-fix.patch
+	epatch ${FILESDIR}/${PV}-alsa-1.0.0.patch
 
 	ln -s makefile.unix Makefile
 	case "${ARCH}" in