From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-emulation/gngeo/Manifest | 8 ++ games-emulation/gngeo/files/gngeo-0.8-cflags.patch | 41 ++++++++ .../gngeo/files/gngeo-0.8-concurrentMake.patch | 16 ++++ .../gngeo/files/gngeo-0.8-execstacks.patch | 105 +++++++++++++++++++++ games-emulation/gngeo/files/gngeo-0.8-zlib.patch | 9 ++ games-emulation/gngeo/gngeo-0.8-r1.ebuild | 43 +++++++++ games-emulation/gngeo/metadata.xml | 8 ++ 7 files changed, 230 insertions(+) create mode 100644 games-emulation/gngeo/Manifest create mode 100644 games-emulation/gngeo/files/gngeo-0.8-cflags.patch create mode 100644 games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch create mode 100644 games-emulation/gngeo/files/gngeo-0.8-execstacks.patch create mode 100644 games-emulation/gngeo/files/gngeo-0.8-zlib.patch create mode 100644 games-emulation/gngeo/gngeo-0.8-r1.ebuild create mode 100644 games-emulation/gngeo/metadata.xml (limited to 'games-emulation/gngeo') diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest new file mode 100644 index 000000000000..6d147332d635 --- /dev/null +++ b/games-emulation/gngeo/Manifest @@ -0,0 +1,8 @@ +AUX gngeo-0.8-cflags.patch 1946 BLAKE2B 208a35296c2d943c65dfdcb02b3724bbc9bad4823103f10ec2fb7b069793a7ca901a51a41543175458f9e4326518f075eed924cdc492b1310159914a8c88e074 SHA512 5df77d438efd9040efcae7f1a19c5939967ae158a50408592b1dd81db26776215ec7994c8173db0e6f9888f45fa2c043bd1338f41a4c535e886c2b0f633a38b7 +AUX gngeo-0.8-concurrentMake.patch 635 BLAKE2B 5f2e96d55ad902a4f9904a28c0de855cd4fe7a65677d5a106688b9194a678b7f4a4be066942839a45c36ae717da62e53be36cdd7832a5abe72bc148b498f1766 SHA512 1d84bac8ad5dbe3f95ff148284d24432aece67191b566927dedf040cab080bf59f2b70f5ae788ab02e5d549b1c56fe2c8f92d5255b8c670433a2efb17483e460 +AUX gngeo-0.8-execstacks.patch 2505 BLAKE2B db1d2bdfe1cc45c76be070c3243439adbebac47b10aba46c85f3d3059d85cc90133e9a75e329b4d3d3ce369018797b166782dd0c795bf18511772013a66bb92d SHA512 cfd0cc424ce0862fb49a1349ec53c65051a13dc031bf66f4df3d96b5d44d9a1a0768c1184b5d6e35d6e72bbf779c0e499989f6b57cde1e25d0ce50bbbdbefdea +AUX gngeo-0.8-zlib.patch 335 BLAKE2B 4b18c076a3285659f7e199a6d86c3ea2a899fe8dade51b03b36035c4cf9378a1b80ae16aa81c12f75a51bf0053f7d44dfb3b1025f7d95274a79689737ce6d1cb SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70 +DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7 +DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5 +EBUILD gngeo-0.8-r1.ebuild 1045 BLAKE2B 0b002644090a65142e44a40fa2b6437318281973c800bc416f7e70f3035194ea5fd70ac22f9df046c22917154a3b16aba85a05f09d41fbf770adba594d13160b SHA512 7193404f6a63cf323f910f132809e865ca9eb65a6406e39252fbcd55980136dfe0879366abeea048edab343ca1bc51115f47eee64cf1eadd736c8a8a7f845fc5 +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch new file mode 100644 index 000000000000..0dcc3e7c5bf8 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch @@ -0,0 +1,41 @@ +--- a/configure.in.orig 2016-03-31 04:15:45.913917791 -0400 ++++ b/configure.in 2016-03-31 04:16:23.447607551 -0400 +@@ -236,20 +236,12 @@ + AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor]) + ALIGNLONGS=0 + proc_i386=true +- CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \ +- -ffast-math -falign-functions=2 -falign-jumps=2 -fexpensive-optimizations \ +- -falign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \ +- -fno-strict-aliasing -pipe -mtune=$target_cpu -DCPU=$target_cpu" + ;; + x86_64) + AC_MSG_RESULT(Turning on x86_64 processor optimisations) + AC_DEFINE(PROCESSOR_ADM64, 1, [Define if you have an x86_64 processor]) + ALIGNLONGS=0 + proc_x64=true +- CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \ +- -ffast-math -fexpensive-optimizations \ +- -malign-double -fomit-frame-pointer -g \ +- -fno-strict-aliasing -pipe -DCPU=$target_cpu" + ;; + sparc*) AC_MSG_RESULT(Turning on sparc processor optimisations) + AC_DEFINE(PROCESSOR_SPARC, 1, [Define if you have a sparc processor]) +@@ -258,8 +250,6 @@ + if test $target_cpu = sparc64 && test $CC_MAJOR -ge 3 ; then + CFLAGS="$CFLAGS -mcpu=v9" + fi +- CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \ +- -ffast-math -fomit-frame-pointer -g" + ;; + arm) AC_MSG_RESULT(Turning on arm processor optimisations) + AC_DEFINE(PROCESSOR_ARM, 1, [Define if you have an ARM processor]) +@@ -273,8 +263,6 @@ + *) AC_MSG_RESULT(Processor type unknown - Use generic optimisations) + ALIGNLONGS=1 + optimum=no +- CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \ +- -ffast-math -g" + ;; + esac + diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch new file mode 100644 index 000000000000..f039ecf544d9 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch @@ -0,0 +1,16 @@ +--- a/src/generator68k/Makefile.am.orig 2015-01-23 18:37:37.998723294 -0500 ++++ b/src/generator68k/Makefile.am 2015-01-23 18:38:39.995391133 -0500 +@@ -71,9 +71,12 @@ + + #def68k : def68k.c + # gcc def68k.c tab68k.c -o def68k -I .. -I ../.. -I . `sdl-config --cflags` +-def68k.o gen68k.o tab68k2.o : %.o : %.c ++def68k.o tab68k2.o : %.o : %.c + $(gcc_build_verbose)$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags` + ++gen68k.o: gen68k.c def68k-iibs.h ++ $(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags` ++ + def68k : def68k.o tab68k2.o + $(gcc_build_verbose)$(CC_FOR_BUILD) def68k.o tab68k2.o -o $@ + diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch new file mode 100644 index 000000000000..a3face06f35c --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch @@ -0,0 +1,105 @@ +--- a/src/effect/2xsaimmx.asm ++++ b/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 +--- a/src/effect/effect_i386.asm ++++ b/src/effect/effect_i386.asm +@@ -88,3 +88,7 @@ + emms + + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- a/src/effect/hq2x16.asm ++++ b/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 +--- a/src/effect/hq3x16.asm ++++ b/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 +--- a/src/memcpy.S ++++ b/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 +--- a/src/raze/Makefile.am ++++ b/src/raze/Makefile.am +@@ -20,7 +20,7 @@ + $(srcdir)/strip_ $< $@ + + raze2.asm: raze.asmu raze.incu raze.regu +- nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@ ++ nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@ + + # This assembles the file, once it's been pre-processed + raze.o: raze2.asm +--- a/src/raze/raze.asm ++++ b/src/raze/raze.asm +@@ -4259,3 +4259,6 @@ + + ;- the end ------------------------------------------------------------------; + ++%ifidn ___OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- a/src/screen_i386.asm ++++ b/src/screen_i386.asm +@@ -96,3 +96,6 @@ + endproc + + ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- a/src/star/star.c ++++ b/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"); + } + + /**************************************************************************** +--- a/src/video_i386.asm ++++ b/src/video_i386.asm +@@ -86,3 +86,7 @@ + + popa + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif diff --git a/games-emulation/gngeo/files/gngeo-0.8-zlib.patch b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch new file mode 100644 index 000000000000..9aa4a6b5f479 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch @@ -0,0 +1,9 @@ +diff -ru gngeo-0.8.orig/configure.in gngeo-0.8/configure.in +--- gngeo-0.8.orig/configure.in 2012-11-15 17:57:57.849578009 -0500 ++++ gngeo-0.8/configure.in 2012-11-15 18:19:55.305923094 -0500 +@@ -95,6 +95,7 @@ + #AC_SUBST(LIBOBJS) + AC_CHECK_LIB([m], [acos]) + AC_CHECK_LIB([z], [inflate]) ++AC_CHECK_LIB([minizip], [unzReadCurrentFile]) + diff --git a/games-emulation/gngeo/gngeo-0.8-r1.ebuild b/games-emulation/gngeo/gngeo-0.8-r1.ebuild new file mode 100644 index 000000000000..3e7f2be86fc0 --- /dev/null +++ b/games-emulation/gngeo/gngeo-0.8-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools desktop flag-o-matic + +DESCRIPTION="A NeoGeo emulator" +HOMEPAGE="https://code.google.com/p/gngeo/" +SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz + https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> ${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="virtual/opengl + media-libs/libsdl[joystick,opengl,sound,video] + sys-libs/zlib[minizip]" +RDEPEND="${DEPEND}" + +src_prepare() { + default + eapply \ + "${FILESDIR}"/${P}-execstacks.patch \ + "${FILESDIR}"/${P}-zlib.patch \ + "${FILESDIR}"/${P}-concurrentMake.patch \ + "${FILESDIR}"/${P}-cflags.patch + mv configure.in configure.ac || die + eautoreconf + append-cflags -std=gnu89 # build with gcc5 (bug #571056) +} + +src_configure() { + econf --disable-i386asm +} + +src_install() { + DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc ) + default + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} +} diff --git a/games-emulation/gngeo/metadata.xml b/games-emulation/gngeo/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-emulation/gngeo/metadata.xml @@ -0,0 +1,8 @@ + + + + + games@gentoo.org + Gentoo Games Project + + -- cgit v1.2.3