From: Michael Sterrett Date: Tue, 20 Jun 2006 20:28:23 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca64e8c4da5d9cfce4b4c88167f86e5e28a0a18f;p=gentoo.git version bump Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog index 3bbaa1ed79b7..d457117b9130 100644 --- a/games-emulation/gngeo/ChangeLog +++ b/games-emulation/gngeo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-emulation/gngeo # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.13 2006/05/21 03:44:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.14 2006/06/20 20:28:22 mr_bones_ Exp $ + +*gngeo-0.6.12 (20 Jun 2006) + + 20 Jun 2006; Michael Sterrett + +files/gngeo-0.6.12-execstacks.patch, +gngeo-0.6.12.ebuild: + version bump 21 May 2006; Michael Sterrett gngeo-0.6.11.ebuild: force newer gcc for bug #128587 diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest index fa95c520e3fe..64927d0926bc 100644 --- a/games-emulation/gngeo/Manifest +++ b/games-emulation/gngeo/Manifest @@ -1,20 +1,32 @@ -AUX gngeo-0.6.11-execstacks.patch 2834 RMD160 3be24c792743d3468e82872ee5e0959bb80eff70 SHA1 8faadc47870e9bdc54126ca4e8af67a853292197 SHA256 4a10fd9ae0a62bf9a449877c24adb204e6a1cae9dbd33ee28a511985f4fca616 size 2834 +AUX gngeo-0.6.11-execstacks.patch 2834 RMD160 3be24c792743d3468e82872ee5e0959bb80eff70 SHA1 8faadc47870e9bdc54126ca4e8af67a853292197 SHA256 4a10fd9ae0a62bf9a449877c24adb204e6a1cae9dbd33ee28a511985f4fca616 MD5 442e92bbf89563e8f6772d4512c6c0f2 files/gngeo-0.6.11-execstacks.patch 2834 RMD160 3be24c792743d3468e82872ee5e0959bb80eff70 files/gngeo-0.6.11-execstacks.patch 2834 SHA256 4a10fd9ae0a62bf9a449877c24adb204e6a1cae9dbd33ee28a511985f4fca616 files/gngeo-0.6.11-execstacks.patch 2834 -DIST gngeo-0.6.11.tar.gz 1014372 RMD160 08b296af04c0ad59b02b7c2a010ea0c7c1ba3011 SHA256 6ec67cdec7775caf81b81eb9c1c0a6209a2e1cf2cc4dfa670d4aaef40f24c45a size 1014372 -EBUILD gngeo-0.6.11.ebuild 979 RMD160 c0267298f87565ad508ae9c2f67647ffd48ddbfd SHA1 2d2bade9e3ca1def5c650fd343195e873695dc7a SHA256 a95598ac7a6ed279565e512ff204b227ec222230450e9b333b01392b4523e40e size 979 +AUX gngeo-0.6.12-execstacks.patch 2838 RMD160 bb20b613cb4123462c365689fa5ac8c2c6708e8b SHA1 ee30e522d4e35d585bf4a96d277546d6270bb4e5 SHA256 eb6e32796eee57a50f8d5d25efa861ce0fb41dae7c5f81d4a872e13cf2518af9 +MD5 9243b20f5240d89194e1809f92b6ae86 files/gngeo-0.6.12-execstacks.patch 2838 +RMD160 bb20b613cb4123462c365689fa5ac8c2c6708e8b files/gngeo-0.6.12-execstacks.patch 2838 +SHA256 eb6e32796eee57a50f8d5d25efa861ce0fb41dae7c5f81d4a872e13cf2518af9 files/gngeo-0.6.12-execstacks.patch 2838 +DIST gngeo-0.6.11.tar.gz 1014372 RMD160 08b296af04c0ad59b02b7c2a010ea0c7c1ba3011 SHA1 698ba80d65e02d45afe9e3d0c8692e8ab1f4510a SHA256 6ec67cdec7775caf81b81eb9c1c0a6209a2e1cf2cc4dfa670d4aaef40f24c45a +DIST gngeo-0.6.12.tar.gz 826845 RMD160 a5c0a70b4b8b53cc660d18d227cd0da2eeda54d2 SHA1 948f944bfbc04949d58844ea035622781065b84f SHA256 f67cd32baf54286f6c6f75655847ebb86266a198c5292a3116db595ad0c091be +EBUILD gngeo-0.6.11.ebuild 979 RMD160 c0267298f87565ad508ae9c2f67647ffd48ddbfd SHA1 2d2bade9e3ca1def5c650fd343195e873695dc7a SHA256 a95598ac7a6ed279565e512ff204b227ec222230450e9b333b01392b4523e40e MD5 a19b486ddbad54df959abbd1919e9eb9 gngeo-0.6.11.ebuild 979 RMD160 c0267298f87565ad508ae9c2f67647ffd48ddbfd gngeo-0.6.11.ebuild 979 SHA256 a95598ac7a6ed279565e512ff204b227ec222230450e9b333b01392b4523e40e gngeo-0.6.11.ebuild 979 -MISC ChangeLog 1675 RMD160 a21cce92ce1f97d017b0246f1b0dccd1c2773801 SHA1 18f2ccbc8a76b3bafe6f47fa09f183b9163ff3a1 SHA256 adb413f62be53c987ba927add5765df1f5a52815e4fb9b4a881c5976d350ff41 size 1675 -MD5 637b309f7786297f344410d692c199f3 ChangeLog 1675 -RMD160 a21cce92ce1f97d017b0246f1b0dccd1c2773801 ChangeLog 1675 -SHA256 adb413f62be53c987ba927add5765df1f5a52815e4fb9b4a881c5976d350ff41 ChangeLog 1675 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 +EBUILD gngeo-0.6.12.ebuild 979 RMD160 65637d9afa13ceddbb844d3caf18a15d503bd504 SHA1 794eb3db9ccda6992feb374ae522d2822f7d6270 SHA256 e1ce4d4bed59397e50acdcab0cf49f1fcf7119a2af7527aab80c4b1b9e5cc045 +MD5 6b5c59cb17519fe2e06b04e4745d3061 gngeo-0.6.12.ebuild 979 +RMD160 65637d9afa13ceddbb844d3caf18a15d503bd504 gngeo-0.6.12.ebuild 979 +SHA256 e1ce4d4bed59397e50acdcab0cf49f1fcf7119a2af7527aab80c4b1b9e5cc045 gngeo-0.6.12.ebuild 979 +MISC ChangeLog 1837 RMD160 20d3b5634bb8a9f78d622b899efd305023420ee3 SHA1 1421de6184b1d18576bbe0ba585106878a94542a SHA256 925cf4837478639985dd94db9cf2c59791596638336181c518a847633c663e74 +MD5 f5c63373f0adb69daaff2f5dcde0b08b ChangeLog 1837 +RMD160 20d3b5634bb8a9f78d622b899efd305023420ee3 ChangeLog 1837 +SHA256 925cf4837478639985dd94db9cf2c59791596638336181c518a847633c663e74 ChangeLog 1837 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 MD5 c1883a2f6eca7f426147edb91222e11d files/digest-gngeo-0.6.11 241 RMD160 0ae12f336c8e59a8d0b0fb4f38d948707933759a files/digest-gngeo-0.6.11 241 SHA256 b9104eab7258d745325a4739293ce735714b9afbefe11e0ce9f36a6d5c16f731 files/digest-gngeo-0.6.11 241 +MD5 dfd8847c1c5312839a6ed36957d08f13 files/digest-gngeo-0.6.12 238 +RMD160 84a8f46b974c143848b19f44d746e5bbe899519d files/digest-gngeo-0.6.12 238 +SHA256 db594fbd806593015de22767756211cfe60f852574e215523be44205962753f8 files/digest-gngeo-0.6.12 238 diff --git a/games-emulation/gngeo/files/digest-gngeo-0.6.12 b/games-emulation/gngeo/files/digest-gngeo-0.6.12 new file mode 100644 index 000000000000..38eace2f6c3e --- /dev/null +++ b/games-emulation/gngeo/files/digest-gngeo-0.6.12 @@ -0,0 +1,3 @@ +MD5 cad0232606b7c4f0449445ba0dea080f gngeo-0.6.12.tar.gz 826845 +RMD160 a5c0a70b4b8b53cc660d18d227cd0da2eeda54d2 gngeo-0.6.12.tar.gz 826845 +SHA256 f67cd32baf54286f6c6f75655847ebb86266a198c5292a3116db595ad0c091be gngeo-0.6.12.tar.gz 826845 diff --git a/games-emulation/gngeo/files/gngeo-0.6.12-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.6.12-execstacks.patch new file mode 100644 index 000000000000..a2b18cbdcbad --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.6.12-execstacks.patch @@ -0,0 +1,118 @@ +--- src/memcpy.S ++++ src/memcpy.S +@@ -495,4 +495,8 @@ + + Lmemcpy_bsrcul1l4: + add r1, r1, #1 +-b Lmemcpy_bl4 +\ No newline at end of file ++b Lmemcpy_bl4 ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +--- src/video_arm.s ++++ src/video_arm.s +@@ -763,3 +763,7 @@ + ldmfd sp!, {r4-r10} @ restore the registers + mov pc, lr @ return + ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif ++ +--- ./src/effect/hq3x16.asm ++++ ./src/effect/hq3x16.asm +@@ -2520,3 +2520,7 @@ + dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, + dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- ./src/effect/2xsaimmx.asm ++++ ./src/effect/2xsaimmx.asm +@@ -2107,3 +2107,7 @@ + final1b resb 8 + final2a resb 8 + final2b resb 8 ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- ./src/effect/effect_i386.asm ++++ ./src/effect/effect_i386.asm +@@ -88,3 +88,7 @@ + emms + + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- ./src/effect/hq2x16.asm ++++ ./src/effect/hq2x16.asm +@@ -1935,3 +1935,7 @@ + dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, + dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- ./src/video_i386.asm ++++ ./src/video_i386.asm +@@ -86,3 +86,7 @@ + + popa + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif + + *Note: there are three underscores here on purpose ... otherwise the strip_ + script will produce _OUTPUT_FORMAT__ instead of __OUTPUT_FORMAT__ +--- ./src/raze/raze.asm ++++ ./src/raze/raze.asm +@@ -4259,3 +4259,6 @@ + + ;- the end ------------------------------------------------------------------; + ++%ifidn ___OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- ./src/screen_i386.asm ++++ ./src/screen_i386.asm +@@ -96,3 +96,6 @@ + endproc + + ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/raze/Makefile.in ++++ src/raze/Makefile.in +@@ -238,7 +238,7 @@ + ./strip_ raze.reg raze.regu + + raze2.asm: raze.asmu raze.incu raze.regu +- nasm -w+orphan-labels -e $< -o $@ ++ nasm -w+orphan-labels -f elf -e $< -o $@ + + # This assembles the file, once it's been pre-processed + raze.o: raze2.asm +--- src/star/star.c ++++ src/star/star.c +@@ -2431,6 +2431,10 @@ + */ + static void suffixes(void) { + emit("end\n"); ++ ++ emit("%%ifidn ___OUTPUT_FORMAT__,elf\n"); ++ emit("section .note.GNU-stack noalloc noexec nowrite progbits\n"); ++ emit("%%endif\n"); + } + + /**************************************************************************** diff --git a/games-emulation/gngeo/gngeo-0.6.12.ebuild b/games-emulation/gngeo/gngeo-0.6.12.ebuild new file mode 100644 index 000000000000..8e3b71aeec94 --- /dev/null +++ b/games-emulation/gngeo/gngeo-0.6.12.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.6.12.ebuild,v 1.1 2006/06/20 20:28:23 mr_bones_ Exp $ + +inherit eutils games + +DESCRIPTION="A NeoGeo emulator" +HOMEPAGE="http://m.peponas.free.fr/gngeo/" +SRC_URI="http://m.peponas.free.fr/gngeo/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="ppc x86" +IUSE="" + +RDEPEND="virtual/opengl + sys-libs/zlib + media-libs/sdl-image + >=media-libs/libsdl-1.2" +# gcc-3.3 gets it wrong - bug #128587 +DEPEND="${RDEPEND} + >=sys-devel/gcc-3.4 + x86? ( >=dev-lang/nasm-0.98 )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-execstacks.patch" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS NEWS README sample_gngeorc + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + echo + einfo "A licensed NeoGeo BIOS copy is required to run the emulator." + echo +}