mr_bones_ 15/02/19 01:06:02 Modified: daphne-1.0.ebuild ChangeLog Log: tidy; use system libmpeg2 with patch from arttuv69 (bug #258332); improve deps (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.9 games-emulation/daphne/daphne-1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?r1=1.8&r2=1.9 Index: daphne-1.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- daphne-1.0.ebuild 17 Jan 2015 14:04:36 -0000 1.8 +++ daphne-1.0.ebuild 19 Feb 2015 01:06:02 -0000 1.9 @@ -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 @@ 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 @@ emake \ CXX=$(tc-getCXX) \ DFLAGS="${CXXFLAGS} ${archflags}" - cd vldp2 - emake \ + emake -C vldp2 \ -f Makefile.linux \ CC=$(tc-getCC) \ DFLAGS="${CFLAGS} ${archflags}" 1.19 games-emulation/daphne/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?r1=1.18&r2=1.19 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ChangeLog 17 Jan 2015 14:04:36 -0000 1.18 +++ ChangeLog 19 Feb 2015 01:06:02 -0000 1.19 @@ -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 <[email protected]> + +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 <[email protected]> daphne-1.0.ebuild: EAPI 5
