tidy; use system libmpeg2 with patch from arttuv69 (bug #258332); improve deps

Package-Manager: portage-2.2.14/cvs/Linux x86_64

6 files changed, 75 insertions, 39 deletions

diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog
index ddfd354d4b7c..0b7abcda5ac9 100644
--- a/games-emulation/daphne/ChangeLog
+++ b/games-emulation/daphne/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/daphne
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.18 2015/01/17 14:04:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.19 2015/02/19 01:06:02 mr_bones_ Exp $
+
+  19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/daphne-1.0-system-lmpeg2.patch, daphne-1.0.ebuild,
+  files/daphne-1.0-typefix.patch, files/daphne-1.0-vorbisfilefix.patch:
+  tidy; use system libmpeg2 with patch from arttuv69 (bug #258332); improve deps
 
   17 Jan 2015; Tupone Alfredo <tupone@gentoo.org> daphne-1.0.ebuild:
   EAPI 5
diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
index 39b822bf49e4..92e9ac35da7e 100644
--- a/games-emulation/daphne/Manifest
+++ b/games-emulation/daphne/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX daphne-1.0-gcc43.patch 482 SHA256 a13e0f8490bd099dd70874ff7a8c3906fe7673f7921042f928acb0e258cac929 SHA512 1346714f3fce3e7d73a4bfb00ff379d798c241d61f008116f283ee206bcd9952913eac98565b6acf1d8ba79b9c2f1095a7368c28c78e496615e37567a6352e77 WHIRLPOOL f50fbcf94494fd7da0e64b76114d24c10febc78074f185269a40bc4a8b086162ba9352541de7dd7bf53283a3e15196d9ae68a42bb3ae83a9de49d89216c839c4
 AUX daphne-1.0-ldflags.patch 612 SHA256 f5d6cdb9d2f357a721806ede353d0a7fba3c3dce28f270a430d856e5b6fad9c1 SHA512 05176cff73a06e83df644854551e688f64f1d9fb82387847fc61735d9dea1eeda0d2cf1930350dfcc2dd98aebc9352f9e61b3d3aaca736fd62de6282154c98b4 WHIRLPOOL 79185165ead4522e4766560699465e9b0a538121c203106dba52d3f8118733c73414c8f38b74aff43fa913174a03c96ee5992629cd830b5ba144d05a00631bae
-AUX daphne-1.0-typefix.patch 1959 SHA256 116cd49bbf8558bc082b784388269d1095d50acc4139cd01e9f1c075fbfaba9b SHA512 1bc00343f0f5c532cc23bbc37539282a3161bb56676ce44cbeb229f85bf34d303df6cd05ba9afee790304a277ba223008976613c83da7749fa9c0fb570222e31 WHIRLPOOL 87ad2f6a6d364e758e0db6f3eb4679cf2e5cd866ed4fa6c5576a4637c71b1a9e8594116d354494a1c92bc4a2e81dd88b4496c49018c0e61cb4aac6af639c2b22
+AUX daphne-1.0-system-lmpeg2.patch 1607 SHA256 e0ee0e82cd03d5b3d1b8e70f926fc01c808b0143c7f6961fe43a0db444537c79 SHA512 92a4d60db095deb8ddcdca23e89f82196f912d9c14202070b039443d328e436dd20714fac90db5ae20f88e955c2cef6f4d339b45d4fdf44115c619e7d5e8bb64 WHIRLPOOL a00c2402e60085367bda07790899225c7afad78efe0802bc3a9bd66bb5be74f0f3216bf27a5085c53b84f973b1565f52a05733e80536997d6f40a255b3dd3b70
+AUX daphne-1.0-typefix.patch 1993 SHA256 7a1b62c4ae890d65cba232272148046e0da5c9215a7163de09c4020db8c3c3fa SHA512 d8d084d1ef19526a49ed1a0a6e1c03a79bf4f90a6b1fcf99a4ec9b3137401b4a4aacdcaa9d166857dda649ece865e26c8538681822f19845b6c15a91618adb63 WHIRLPOOL 1e5c5dd17603c4b8aa3979a122c3fd009c67bc4fe823d7836ff669bb8c4d71530d98d9df0e20652236c901fbd631bf434602e0f8b44bdee09e75d739823583fd
 AUX daphne-1.0-underlink.patch 403 SHA256 42651692b7243af89851eafc32f57e5146a686ea59fc2eee143c79068e6201b3 SHA512 752bc994977e7b8a179c1763cda6c89ffe0bad8bf35414de99d9d412ff82e6f6f8ce05856feca728654cb12d770b59bb5ac204ce86371f2515073c89a5c75962 WHIRLPOOL faff322fd2fb428cd21936afc59f5a6af4bd1f0728a9a05dcc3f748b628377f1fa0f96ff3a6649e145f2702872fbd852a35ab06052b747de450dd2fe37934f63
-AUX daphne-1.0-vorbisfilefix.patch 467 SHA256 357a909c253af836f0628ea02f211fbacf9ddb48b82b6bec0d049b5afabbc120 SHA512 309dce8457634181cb25871d9840feed0ef590369330845a013331ef4280c16a903e553be9bbe79b30c964eec830fbcc66a310728594b21b2a599e9a1c426ec0 WHIRLPOOL 5c2f1d346f0e06c906fa0fc26bd4253a75229359316b90ef9b8f0bf11a058524d1393448abbbcac973a039e2b1af62eadf283972a9fb60b1082fef2a197195d1
+AUX daphne-1.0-vorbisfilefix.patch 521 SHA256 3f59e8ca9859f6069c1956751ba7963649f9e75a015bc747eccad2c2b251a6fa SHA512 fb0bd9d56536b5e2688b3398738ccb267ff76ebbe2baec52d80ae2246a1de63e95a85b7bfeb918a827c7fbc0ffa0c735b02d5f523337fc1f0107f1799de436f1 WHIRLPOOL 5d7893173d9842260ad11c3f579fb1a8a7c82acd469e9ee2df0404a097cecc2372795a29b2cad1f5218ce858402e92ad6e5998a1c83558d0351169c6159e05c2
 AUX daphne-1.0-zlib.patch 356 SHA256 3a0b13be874de8c3441ee88047fdc3c1dfd05ada596b54f697b752671cb7f2d6 SHA512 56c64a616791734fdb77b3e3e22aa53285a9a2a241e6b1237edb486674182d16992b3d6fb36b7b5705c9b7acdd5da398638ca384f72f52862dedd85c4449ef6f WHIRLPOOL 545b4ac1dcca23eede51a9c1e79b05dfbb048046f4919c55054fd7dd28975272e0781156ad65089612e8e8b3e5666c835b27cbd79ff51ae74747a1a1c529ab67
 DIST daphne-1.0-src.tar.gz 4316387 SHA256 b3df3cbb49b3b0d1c2d9f8ab9ae22ef39b1627db09b67a4d10122d754443a588 SHA512 e15e3e86cd03b8eea410eedb667c878f9e2fb044a9bf2cc54e54db641f1c2c6fd99e889cfab308bf972336b577059e13d6cf2a353016ded8e28dae9ddedc0ad4 WHIRLPOOL 6e6be7bcd6beb472881870044d7df36c1493585fd2decdaa70b083fa93338a23b07c93be0fa9634df5c84709d5736579684e5fd663f4122b87f9c0317306948c
-EBUILD daphne-1.0.ebuild 2197 SHA256 e21cedbf1062058d431be96d6e46563c91d2683d24c478fe2cd1abf06922d3ab SHA512 21dbcae96108c714f9c5365592317297f84b3cf0d5b50364849e84b04bc1bf962e1c76f69380a8f750a520a3cbfd81c3cd90540c00f873a902d6421cec7a794c WHIRLPOOL 9301d878b30f29bbb5cff2acd20afa239733591d811692bb45d478a3b65a99039584058ccaf238ca81b7fd29535d275ad4a2340eb379e7fa94405fb165df0421
-MISC ChangeLog 2645 SHA256 35a7e0676adde19f9f6f996cae7e19b47dac7541fc13d5b1d32972433bac22ac SHA512 c6a7a586c022a6a6cbeddf4a96abf3cbed32abdddedf7691e4bb1ed816575fbf927d4a5ffce2b3c809c8097afac1bb01766609ce3f6d762cf9b732f5470ac624 WHIRLPOOL 35d4d5f389b9d88b39947db73b190dfc407b4c881d8e1cf33034aef9f4d1bf714e0417da73c37501ed347ef940716709b2df003856d4fd7fe6aa12452b42cd5f
+EBUILD daphne-1.0.ebuild 2083 SHA256 0d67e402306678314823bd0fe439453e0df40cebd3d24757da9f5fe5b092be68 SHA512 fb35dd7ff6f5d384ef1c289e290e83b0e9ddfaadd6ed55ebbbe530e728cd7ba01fe7ee922edc1b1292493f7de60461423fef465a30cb04053689425547737fd8 WHIRLPOOL 5a2bda63af578af47be3e3655de43dc967a1e0623ded60f87cdf8775d9e4abdaabdf27dad6724bfbaaa29eca37dd830822d34b96c56a6a54f238b5cbc96d5a5b
+MISC ChangeLog 2917 SHA256 7a737d18ed5219a33dd7556ffe1f029b6156c74a501a2470956dfa4690f7eb2b SHA512 2f2362d76c5bbb772473eaf73b82f33f7b54ed610041f40fc8b3d51efe1413db103ecef7d9abac6e20797b1d6d8168719626538bbaf7321047499db3c276033f WHIRLPOOL 390c099ebc48cc33277f96887e343beb28eccf97709543d7d13b3ec251c187a48a66db710979cf43e13d3518e4e4a0b9440acaccd8c98d0804facbb1ad688e6a
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlS6a/UACgkQIY77eQFFFC0aOACeI5FZYRbi4RWH2Hou1xYapi5l
-nh8An3hsbaw5lu/PaVKzR+vGOugx+HDV
-=+x7V
------END PGP SIGNATURE-----
diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild
index 3a6de9df2b20..1389ea226a72 100644
--- a/games-emulation/daphne/daphne-1.0.ebuild
+++ b/games-emulation/daphne/daphne-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.8 2015/01/17 14:04:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.9 2015/02/19 01:06:02 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs games
@@ -9,51 +9,47 @@ DESCRIPTION="Laserdisc Arcade Game Emulator"
 HOMEPAGE="http://www.daphne-emu.com/"
 SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-libs/libsdl[video]
+	sys-libs/zlib
+	media-libs/libsdl[joystick,video]
 	media-libs/sdl-mixer
+	media-libs/libmpeg2
+	virtual/opengl
 	media-libs/glew"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/v_1_0/src
 
 src_prepare() {
-	# Fix no sound issue with >=media-libs/libvorbis-1.2.0
-	epatch "${FILESDIR}/${P}"-vorbisfilefix.patch
-
-	# amd64 does not like int pointers
-	epatch "${FILESDIR}/${P}"-typefix.patch
-
-	epatch "${FILESDIR}/${P}"-gcc43.patch \
+	epatch \
+		"${FILESDIR}"/${P}-vorbisfilefix.patch \
+		"${FILESDIR}"/${P}-typefix.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-system-lmpeg2.patch \
 
 	sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \
-		io/homedir.cpp \
-		|| die "sed homedir.cpp failed"
+		io/homedir.cpp || die
 	sed -i "s:pics/:${GAMES_DATADIR}/${PN}/&:" \
-		video/video.cpp \
-		|| die "sed video.cpp failed"
+		video/video.cpp || die
 	sed -i "s:sound/:${GAMES_DATADIR}/${PN}/&:" \
-		sound/sound.cpp \
-		|| die "sed sound.cpp failed"
+		sound/sound.cpp || die
 	sed -i "s:./lib:$(games_get_libdir)/${PN}/lib:" \
-		io/dll.h \
-		|| die "sed dll.h failed"
+		io/dll.h || die
 
 	sed \
 		-e "s:-DNATIVE_CPU_X86::" \
 		-e "s:-DUSE_MMX::" \
 		-e '/export USE_MMX = 1/s:^:# :' \
-		Makefile.vars.linux_x86 >Makefile.vars \
-		|| die "sed failed"
+		Makefile.vars.linux_x86 >Makefile.vars || die
 }
 
 src_configure() {
@@ -75,8 +71,7 @@ src_compile() {
 	emake \
 		CXX=$(tc-getCXX) \
 		DFLAGS="${CXXFLAGS} ${archflags}"
-	cd vldp2
-	emake \
+	emake -C vldp2 \
 		-f Makefile.linux \
 		CC=$(tc-getCC) \
 		DFLAGS="${CFLAGS} ${archflags}"
diff --git a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
new file mode 100644
index 000000000000..7eed630d13f7
--- /dev/null
+++ b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
@@ -0,0 +1,41 @@
+diff -ur v_1_0.old/src/vldp2/Makefile.am v_1_0/src/vldp2/Makefile.am
+--- v_1_0.old/src/vldp2/Makefile.am	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.am	2009-12-29 18:10:42.000000000 +0200
+@@ -1,3 +1,3 @@
+-SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
++SUBDIRS = autotools
+ 
+ EXTRA_DIST = bootstrap
+diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in
+--- v_1_0.old/src/vldp2/Makefile.in	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.in	2009-12-29 18:10:51.000000000 +0200
+@@ -128,7 +128,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
++SUBDIRS = autotools
+ 
+ EXTRA_DIST = bootstrap
+ subdir = .
+diff -ur v_1_0.old/src/vldp2/Makefile.linux v_1_0/src/vldp2/Makefile.linux
+--- v_1_0.old/src/vldp2/Makefile.linux	2009-12-29 18:04:15.000000000 +0200
++++ v_1_0/src/vldp2/Makefile.linux	2009-12-29 18:13:12.000000000 +0200
+@@ -14,14 +14,9 @@
+ DFLAGS = -O3 -march=i686 -fomit-frame-pointer -funroll-loops
+ 
+ CFLAGS = ${DFLAGS} `sdl-config --cflags` -I./include
+-LIBS = `sdl-config --libs`
++LIBS = `sdl-config --libs` -lmpeg2
+ 
+-OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o \
+-	libmpeg2/cpu_accel.o libmpeg2/alloc.o libmpeg2/cpu_state.o \
+-	libmpeg2/decode.o libmpeg2/header.o libmpeg2/motion_comp.o	\
+-	libmpeg2/idct.o libmpeg2/idct_mmx.o libmpeg2/motion_comp_mmx.o \
+-		libmpeg2/slice.o	\
+-	libvo/video_out.o libvo/video_out_null.o 
++OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o
+ 
+ LIBNAME =	libvldp2.so
+ 
+ 
diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch
index eaa97e46accf..f47511a0cd03 100644
--- a/games-emulation/daphne/files/daphne-1.0-typefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-typefix.patch
@@ -1,3 +1,5 @@
+amd64 does not like int pointers
+
 diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp
 --- v_1_0.orig/src/ldp-in/ldv1000.cpp	2008-01-29 18:04:34.000000000 +0100
 +++ v_1_0/src/ldp-in/ldv1000.cpp	2008-09-19 14:29:40.000000000 +0200
diff --git a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
index 715040243314..49eb1aaab62d 100644
--- a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
@@ -1,3 +1,5 @@
+Fix no sound issue with >=media-libs/libvorbis-1.2.0
+
 diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp
 --- v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp	2008-01-29 18:04:07.000000000 +0100
 +++ v_1_0/src/ldp-out/ldp-vldp-audio.cpp	2008-09-19 13:43:10.000000000 +0200