From 3852d09256ab91a0a73fc65a3d3bfd2ccefeeeba Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 4 Nov 2003 08:11:02 +0000 Subject: patch fix #32586 --- games-emulation/daphne/ChangeLog | 7 ++- games-emulation/daphne/daphne-0.99.6-r1.ebuild | 61 ---------------------- games-emulation/daphne/daphne-0.99.6-r2.ebuild | 61 ++++++++++++++++++++++ .../daphne/files/0.99.6-local-dapinput.patch | 29 +++++++--- .../daphne/files/digest-daphne-0.99.6-r1 | 1 - .../daphne/files/digest-daphne-0.99.6-r2 | 1 + 6 files changed, 90 insertions(+), 70 deletions(-) delete mode 100644 games-emulation/daphne/daphne-0.99.6-r1.ebuild create mode 100644 games-emulation/daphne/daphne-0.99.6-r2.ebuild delete mode 100644 games-emulation/daphne/files/digest-daphne-0.99.6-r1 create mode 100644 games-emulation/daphne/files/digest-daphne-0.99.6-r2 (limited to 'games-emulation') diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog index 1b578a9e8d82..c9a3e403a1e0 100644 --- a/games-emulation/daphne/ChangeLog +++ b/games-emulation/daphne/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/daphne # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.3 2003/10/30 09:52:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.4 2003/11/04 08:11:02 vapier Exp $ + +*daphne-0.99.6-r2 (04 Nov 2003) + + 04 Nov 2003; Mike Frysinger : + Update patch to resolve #32586. *daphne-0.99.6-r1 (30 Oct 2003) diff --git a/games-emulation/daphne/daphne-0.99.6-r1.ebuild b/games-emulation/daphne/daphne-0.99.6-r1.ebuild deleted file mode 100644 index e4ab28a8804a..000000000000 --- a/games-emulation/daphne/daphne-0.99.6-r1.ebuild +++ /dev/null @@ -1,61 +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/daphne/daphne-0.99.6-r1.ebuild,v 1.1 2003/10/30 09:52:56 vapier Exp $ - -inherit games eutils flag-o-matic - -DESCRIPTION="Laserdisc Arcade Game Emulator" -SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz" -HOMEPAGE="http://www.daphne-emu.com/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" - -RDEPEND="virtual/glibc - media-libs/libogg - media-libs/libvorbis - media-libs/libsdl - media-libs/sdl-mixer - sys-libs/zlib" - -S=${WORKDIR}/${PN} - -src_unpack() { - unpack ${A} - - cd ${S}/src - sed -e "s:-march=i686:${CFLAGS}:" Makefile.vars.linux_x86 > Makefile.vars - - # lets make this guy play nice with our filesystem setup - sed -i "s:pics/:${GAMES_DATADIR}/${PN}/pics/:g" video/video.cpp - sed -i "s:roms/:${GAMES_DATADIR}/${PN}/roms/:g" game/game.cpp - sed -i "s:sound/:${GAMES_DATADIR}/${PN}/sound/:g" sound/sound.cpp - sed -i "s:./lib:${GAMES_LIBDIR}/${PN}/lib:g" io/dll.h - sed -i 's:daphne_log.txt:/tmp/daphne_log.txt:g' daphne.cpp daphne.h io/error.cpp - epatch ${FILESDIR}/${PV}-local-dapinput.patch -} - -src_compile() { - replace-flags -march=i686 -march=i586 # Bug 18807 Comment #11 - replace-flags -march=pentium3 -march=i586 # Bug 18807 Comment #4 - - cd ${S}/src - emake || die "src build failed" - cd ${S}/src/vldp - emake -f Makefile.linux || die "vldp build failed" - cd ${S}/src/vldp2 - egamesconf || die - emake -f Makefile.linux || die "vldp2 build failed" -} - -src_install() { - dogamesbin daphne - exeinto ${GAMES_LIBDIR}/${PN} - doexe libvldp*.so - dodir ${GAMES_DATADIR}/${PN} - cp -rf pics sound roms ${D}/${GAMES_DATADIR}/${PN}/ - dodoc doc/*.{ini,txt} - dohtml -r doc/* - prepgamesdirs -} diff --git a/games-emulation/daphne/daphne-0.99.6-r2.ebuild b/games-emulation/daphne/daphne-0.99.6-r2.ebuild new file mode 100644 index 000000000000..f2052f054412 --- /dev/null +++ b/games-emulation/daphne/daphne-0.99.6-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.6-r2.ebuild,v 1.1 2003/11/04 08:11:02 vapier Exp $ + +inherit games eutils flag-o-matic + +DESCRIPTION="Laserdisc Arcade Game Emulator" +SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz" +HOMEPAGE="http://www.daphne-emu.com/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86" + +RDEPEND="virtual/glibc + media-libs/libogg + media-libs/libvorbis + media-libs/libsdl + media-libs/sdl-mixer + sys-libs/zlib" + +S=${WORKDIR}/${PN} + +src_unpack() { + unpack ${A} + + cd ${S}/src + sed -e "s:-march=i686:${CFLAGS}:" Makefile.vars.linux_x86 > Makefile.vars + + # lets make this guy play nice with our filesystem setup + sed -i "s:pics/:${GAMES_DATADIR}/${PN}/pics/:g" video/video.cpp + sed -i "s:roms/:${GAMES_DATADIR}/${PN}/roms/:g" game/game.cpp + sed -i "s:sound/:${GAMES_DATADIR}/${PN}/sound/:g" sound/sound.cpp + sed -i "s:./lib:${GAMES_LIBDIR}/${PN}/lib:g" io/dll.h + sed -i 's:daphne_log.txt:/tmp/daphne_log.txt:g' daphne.cpp daphne.h io/error.cpp + epatch ${FILESDIR}/${PV}-local-dapinput.patch +} + +src_compile() { + replace-flags -march=i686 -march=i586 # Bug 18807 Comment #11 + replace-flags -march=pentium3 -march=i586 # Bug 18807 Comment #4 + + cd ${S}/src + emake || die "src build failed" + cd ${S}/src/vldp + emake -f Makefile.linux || die "vldp build failed" + cd ${S}/src/vldp2 + egamesconf || die + emake -f Makefile.linux || die "vldp2 build failed" +} + +src_install() { + dogamesbin daphne + exeinto ${GAMES_LIBDIR}/${PN} + doexe libvldp*.so + dodir ${GAMES_DATADIR}/${PN} + cp -rf pics sound roms ${D}/${GAMES_DATADIR}/${PN}/ + dodoc doc/*.{ini,txt} + dohtml -r doc/* + prepgamesdirs +} diff --git a/games-emulation/daphne/files/0.99.6-local-dapinput.patch b/games-emulation/daphne/files/0.99.6-local-dapinput.patch index 7867be6712ec..3226ba94bf4a 100644 --- a/games-emulation/daphne/files/0.99.6-local-dapinput.patch +++ b/games-emulation/daphne/files/0.99.6-local-dapinput.patch @@ -1,14 +1,29 @@ ---- src/io/input.cpp.orig 2003-10-30 04:47:16.997745896 -0500 -+++ src/io/input.cpp 2003-10-30 04:47:46.725226632 -0500 -@@ -25,0 +25,1 @@ +--- src/io/input.cpp.orig 2003-11-04 02:51:56.308868080 -0500 ++++ src/io/input.cpp 2003-11-04 02:53:57.283477144 -0500 +@@ -22,6 +22,9 @@ + + // Handles SDL input functions (low-level keyboard/joystick input) + +#include -@@ -113,7 +113,8 @@ ++#include ++#include + #include + #include "input.h" + #include "conout.h" +@@ -113,6 +116,9 @@ char strTemp[25] = {0}; char thisChar = 0; -- F = fopen("dapinput.ini", "rt"); + chdir(getenv("HOME")); -+ F = fopen(".dapinput.ini", "rt"); ++ mkdir(".daphne", 0600); ++ chdir(".daphne"); + F = fopen("dapinput.ini", "rt"); // if we opened the file successfully - if (F != NULL) +@@ -589,4 +595,4 @@ + } + idle_timer = refresh_ms_time(); + } +-// end edit +\ No newline at end of file ++// end edit diff --git a/games-emulation/daphne/files/digest-daphne-0.99.6-r1 b/games-emulation/daphne/files/digest-daphne-0.99.6-r1 deleted file mode 100644 index 115b93db4360..000000000000 --- a/games-emulation/daphne/files/digest-daphne-0.99.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7602c8c1c7d54f61e23e55fe55b44ffd daphne-0.99.6-src.tar.gz 2685633 diff --git a/games-emulation/daphne/files/digest-daphne-0.99.6-r2 b/games-emulation/daphne/files/digest-daphne-0.99.6-r2 new file mode 100644 index 000000000000..115b93db4360 --- /dev/null +++ b/games-emulation/daphne/files/digest-daphne-0.99.6-r2 @@ -0,0 +1 @@ +MD5 7602c8c1c7d54f61e23e55fe55b44ffd daphne-0.99.6-src.tar.gz 2685633 -- cgit v1.2.3-65-gdbad