From: Tristan Heaven Date: Thu, 28 Dec 2006 00:13:14 +0000 (+0000) Subject: Version bump, bug #119982 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48f5f3462314481dacfb1aab2066f58a01c2f872;p=gentoo.git Version bump, bug #119982 Package-Manager: portage-2.1.2_rc4-r1 --- diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog index 1ea0c4d6d4ba..ba28214527cf 100644 --- a/games-emulation/daphne/ChangeLog +++ b/games-emulation/daphne/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-emulation/daphne # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.10 2006/08/28 01:53:27 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.11 2006/12/28 00:13:14 nyhm Exp $ + +*daphne-0.99.7 (28 Dec 2006) + + 28 Dec 2006; Tristan Heaven + +files/daphne-0.99.7-exec-stack.patch, +files/daphne-0.99.7-gcc41.patch, + +daphne-0.99.7.ebuild: + Version bump, bug #119982 28 Aug 2006; +files/daphne-0.99.6-gcc41.patch, daphne-0.99.6-r2.ebuild: diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest index d487a629748c..f549e75eaf04 100644 --- a/games-emulation/daphne/Manifest +++ b/games-emulation/daphne/Manifest @@ -9,15 +9,28 @@ AUX daphne-0.99.6-gcc41.patch 1109 RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e MD5 ef997d7c8970bb1ef8a1ecf2a71a27a5 files/daphne-0.99.6-gcc41.patch 1109 RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e56 files/daphne-0.99.6-gcc41.patch 1109 SHA256 99e39b8c94157e97e15f8ef6ea2e0d7ddffcce3fcda99aba71169c1b59c8c9bd files/daphne-0.99.6-gcc41.patch 1109 +AUX daphne-0.99.7-exec-stack.patch 360 RMD160 20f49ba81bc5b9fb5e8f2ad01a828ea36920d0dd SHA1 7904d24f3a97798bb69d3ec323f2b6f12a30faf5 SHA256 ad2b25a651fbe5a37646fed02173957a495c027b99372ca492207908aa68ea0a +MD5 d3ec432a288d8285d1b2ab2712a0c714 files/daphne-0.99.7-exec-stack.patch 360 +RMD160 20f49ba81bc5b9fb5e8f2ad01a828ea36920d0dd files/daphne-0.99.7-exec-stack.patch 360 +SHA256 ad2b25a651fbe5a37646fed02173957a495c027b99372ca492207908aa68ea0a files/daphne-0.99.7-exec-stack.patch 360 +AUX daphne-0.99.7-gcc41.patch 522 RMD160 b3b7f1a126648b4088780a29daa5b1835a41a1d9 SHA1 81a2cadeaee6ae9d49ef120e25e7e62718b683e9 SHA256 d3677fe46478c34532fbe0d089dbca4f4ff4d40d9de0eed6e20effe21bc8fed7 +MD5 4e236161637be523f5d44b193429bbf3 files/daphne-0.99.7-gcc41.patch 522 +RMD160 b3b7f1a126648b4088780a29daa5b1835a41a1d9 files/daphne-0.99.7-gcc41.patch 522 +SHA256 d3677fe46478c34532fbe0d089dbca4f4ff4d40d9de0eed6e20effe21bc8fed7 files/daphne-0.99.7-gcc41.patch 522 DIST daphne-0.99.6-src.tar.gz 2685633 RMD160 b4e7902887e6dad03d9ad0b8f9fc5b4b34ca9166 SHA1 40ded2e02163047e097f6309e266a9281fb53219 SHA256 ca8e4365d3af7dd484ce14d30eeffafef7947e41956fa12ec7120308ff3658f9 +DIST daphne-0.99.7-src.tar.gz 3499980 RMD160 0607bf6a275f3ada240d8ee4b5ffca44e7ceb246 SHA1 04f402463d94d68814e48d19cbc541a0d5b83bef SHA256 6b40f2028cac01803318bc2d62ad3a3c7d98b3d49d846312e30d2b52fadfce51 EBUILD daphne-0.99.6-r2.ebuild 2047 RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 SHA1 8d3de811cc7c02e868f2c6daa209d930e728bab4 SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781 MD5 d5848c8fb75201d9b74a585ea60c9c23 daphne-0.99.6-r2.ebuild 2047 RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 daphne-0.99.6-r2.ebuild 2047 SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781 daphne-0.99.6-r2.ebuild 2047 -MISC ChangeLog 1299 RMD160 2f5a9121e5c023e80d7379e0646c651b6558fa7c SHA1 28027eacc9aa1a6bb8cd980924871d17ba7a598c SHA256 8ed78c85ac055b805d9ba7c0eb313750025c655c0e64e0d915d2361b5bade154 -MD5 36561cb2d4cb53de9638a0197e5eb9c5 ChangeLog 1299 -RMD160 2f5a9121e5c023e80d7379e0646c651b6558fa7c ChangeLog 1299 -SHA256 8ed78c85ac055b805d9ba7c0eb313750025c655c0e64e0d915d2361b5bade154 ChangeLog 1299 +EBUILD daphne-0.99.7.ebuild 1635 RMD160 1538259826a1a06e65706a55d3784142bb2119ee SHA1 628c90ed94eb25008d1c72f431f0a299ea416a21 SHA256 b89c33ce03792f315fffa5fca09fdd22cdec7b9c3700964bf06c72abe565a63e +MD5 ed72b2f6b3d34fa434be954c8d926ed3 daphne-0.99.7.ebuild 1635 +RMD160 1538259826a1a06e65706a55d3784142bb2119ee daphne-0.99.7.ebuild 1635 +SHA256 b89c33ce03792f315fffa5fca09fdd22cdec7b9c3700964bf06c72abe565a63e daphne-0.99.7.ebuild 1635 +MISC ChangeLog 1504 RMD160 b91aa45c535082e755b5722c33187a0671186ed0 SHA1 dd877459530d496ce6485a35e5c32947f1d32ad4 SHA256 003765fb72a4e8ccaa9849a49ef97bcddab90551eda01787e41af7e6baec0a80 +MD5 ccac946113a38a01196bb542963c354f ChangeLog 1504 +RMD160 b91aa45c535082e755b5722c33187a0671186ed0 ChangeLog 1504 +SHA256 003765fb72a4e8ccaa9849a49ef97bcddab90551eda01787e41af7e6baec0a80 ChangeLog 1504 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -25,10 +38,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 24ea93c7ac728cbe44ba1c4704749623 files/digest-daphne-0.99.6-r2 256 RMD160 b3f33db51987b0647c67ad8200ac71f97b2aaa27 files/digest-daphne-0.99.6-r2 256 SHA256 2197b763fb5e84394806c5f7ce628259613f444580b3234a4654c042dafbe3fa files/digest-daphne-0.99.6-r2 256 +MD5 1545a5137fa27f0f0c853042a0a6adc7 files/digest-daphne-0.99.7 256 +RMD160 ddb63b15c9cb5c86bbfd7fa02b9bb5b3b1869e49 files/digest-daphne-0.99.7 256 +SHA256 8fa1fc5cec079bae5a7f30625302764d1c3adf843f8fa4b1ee1d18ec1767ba36 files/digest-daphne-0.99.7 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFE8kyk2CTtIKiFlQIRArLgAKCoVU9JbPRSIE9b/QdYK2pbAkn6xQCguEnO -q9jKmttwcXlsOewgOHy26zo= -=DJWc +iD8DBQFFkwwhdz7hIScOURERArtfAKC/3OkSE62SH9Oj94x3xJBTNA6PaACeISB4 +J2rFlEWWYf4qkixNFMDH0bo= +=c3Iy -----END PGP SIGNATURE----- diff --git a/games-emulation/daphne/daphne-0.99.7.ebuild b/games-emulation/daphne/daphne-0.99.7.ebuild new file mode 100644 index 000000000000..ce11fa4a8e04 --- /dev/null +++ b/games-emulation/daphne/daphne-0.99.7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.7.ebuild,v 1.1 2006/12/28 00:13:14 nyhm Exp $ + +inherit eutils toolchain-funcs games + +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" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND="media-libs/libogg + media-libs/libvorbis + media-libs/libsdl + media-libs/sdl-mixer" + +S=${WORKDIR}/${PN}/src + +src_unpack() { + unpack ${A} + cd "${S}" + epatch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-exec-stack.patch + sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \ + io/homedir.cpp \ + || die "sed homedir.cpp failed" + sed -i "s:pics/:${GAMES_DATADIR}/${PN}/&:" \ + video/video.cpp \ + || die "sed video.cpp failed" + sed -i "s:sound/:${GAMES_DATADIR}/${PN}/&:" \ + sound/sound.cpp \ + || die "sed sound.cpp failed" + sed -i "s:./lib:${GAMES_LIBDIR}/${PN}/lib:" \ + io/dll.h \ + || die "sed dll.h failed" + cp Makefile.vars{.linux_x86,} +} + +src_compile() { + emake \ + CXX=$(tc-getCXX) \ + DFLAGS="${CXXFLAGS}" \ + || die "src build failed" + cd vldp2 + egamesconf || die + emake \ + -f Makefile.linux \ + CC=$(tc-getCC) \ + DFLAGS="${CFLAGS}" \ + || die "vldp2 build failed" +} + +src_install() { + cd .. + dogamesbin daphne || die "dogamesbin failed" + exeinto "${GAMES_LIBDIR}"/${PN} + doexe libvldp2.so || die "doexe failed" + insinto "${GAMES_DATADIR}"/${PN} + doins -r pics roms sound || die "doins failed" + dodoc doc/*.{ini,txt} + dohtml -r doc/* + prepgamesdirs +} diff --git a/games-emulation/daphne/files/daphne-0.99.7-exec-stack.patch b/games-emulation/daphne/files/daphne-0.99.7-exec-stack.patch new file mode 100644 index 000000000000..67de83272ac5 --- /dev/null +++ b/games-emulation/daphne/files/daphne-0.99.7-exec-stack.patch @@ -0,0 +1,18 @@ +--- video/blend_mmx-gas.s ++++ video/blend_mmx-gas.s +@@ -93,3 +93,6 @@ + ret + + #################################################### ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif +--- video/rgb2yuv-gas.s ++++ video/rgb2yuv-gas.s +@@ -149,3 +149,6 @@ + popl %ebp + + ret ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/games-emulation/daphne/files/daphne-0.99.7-gcc41.patch b/games-emulation/daphne/files/daphne-0.99.7-gcc41.patch new file mode 100644 index 000000000000..83766ed10fad --- /dev/null +++ b/games-emulation/daphne/files/daphne-0.99.7-gcc41.patch @@ -0,0 +1,22 @@ +--- game/lgp.h ++++ game/lgp.h +@@ -59,7 +59,7 @@ + bool nmie; + Uint8 banks[7]; + void recalc_palette(); +- void lgp::draw_8x8(int character_number, int xcoord, int ycoord); ++ void draw_8x8(int character_number, int xcoord, int ycoord); + }; + + #endif +--- ldp-out/pioneer.h ++++ ldp-out/pioneer.h +@@ -47,7 +47,7 @@ + bool pioneer_audio1; + bool pioneer_audio2; + bool check_result(Uint32, bool); +- bool pioneer::getstring(char *, int, Uint32,bool); ++ bool getstring(char *, int, Uint32,bool); + void printmodel(); + }; + diff --git a/games-emulation/daphne/files/digest-daphne-0.99.7 b/games-emulation/daphne/files/digest-daphne-0.99.7 new file mode 100644 index 000000000000..2adb845a5b1c --- /dev/null +++ b/games-emulation/daphne/files/digest-daphne-0.99.7 @@ -0,0 +1,3 @@ +MD5 887802217036a0bc1827ef2d2b8d17a8 daphne-0.99.7-src.tar.gz 3499980 +RMD160 0607bf6a275f3ada240d8ee4b5ffca44e7ceb246 daphne-0.99.7-src.tar.gz 3499980 +SHA256 6b40f2028cac01803318bc2d62ad3a3c7d98b3d49d846312e30d2b52fadfce51 daphne-0.99.7-src.tar.gz 3499980