[gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/, games-emulation/gngeo/files/
commit: 6c8fbcf2f15b94c6fd846688677e69ee9cdae554
Author: Alexey Sokolov google com>
AuthorDate: Wed Sep 16 00:20:10 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Sep 21 21:12:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8fbcf2
games-emulation/gngeo: fix build with gcc 10
Closes: https://bugs.gentoo.org/708062
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: James Le Cuirot gentoo.org>
.../gngeo/files/gngeo-0.8-fcommon.patch| 289 +
games-emulation/gngeo/gngeo-0.8-r2.ebuild | 48
2 files changed, 337 insertions(+)
diff --git a/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch
b/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch
new file mode 100644
index 000..63e1ff097bb
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch
@@ -0,0 +1,289 @@
+--- a/src/memory.h 2011-10-25 18:04:13.0 -
b/src/memory.h 2020-09-15 23:02:48.114069895 -
+@@ -114,30 +114,30 @@ typedef struct neo_mem {
+ Uint32 watchdog;
+ } neo_mem;
+
+-neo_mem memory;
++extern neo_mem memory;
+
+ /* video related */
+ //extern int irq2start, irq2control;
+-Uint8 *current_pal;
+-Uint32 *current_pc_pal;
+-Uint8 *current_fix;
+-Uint8 *fix_usage;
++extern Uint8 *current_pal;
++extern Uint32 *current_pc_pal;
++extern Uint8 *current_fix;
++extern Uint8 *fix_usage;
+
+ /* sram */
+-Uint8 sram_lock;
++extern Uint8 sram_lock;
+ //Uint32 sram_protection_hack;
+ //int sram_protection_hack;
+
+ /* Sound control */
+-Uint8 sound_code;
+-Uint8 pending_command;
+-Uint8 result_code;
++extern Uint8 sound_code;
++extern Uint8 pending_command;
++extern Uint8 result_code;
+
+
+ /* 68k cpu Banking control */
+ extern Uint32 bankaddress;/* current bank */
+ //Uint8 current_cpu_bank;
+-Uint16 z80_bank[4];
++extern Uint16 z80_bank[4];
+
+ /* misc utility func */
+ void update_all_pal(void);
+@@ -263,10 +263,10 @@ void mem68k_store_bk_kof2003_byte(Uint32
+ void mem68k_store_bk_kof2003_word(Uint32 addr, Uint16 data);
+ void mem68k_store_bk_kof2003_long(Uint32 addr, Uint32 data);
+
+-Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
+-Uint16 (*mem68k_fetch_bksw_word)(Uint32);
+-Uint32 (*mem68k_fetch_bksw_long)(Uint32);
+-void (*mem68k_store_bksw_byte)(Uint32,Uint8);
+-void (*mem68k_store_bksw_word)(Uint32,Uint16);
+-void (*mem68k_store_bksw_long)(Uint32,Uint32);
++extern Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
++extern Uint16 (*mem68k_fetch_bksw_word)(Uint32);
++extern Uint32 (*mem68k_fetch_bksw_long)(Uint32);
++extern void (*mem68k_store_bksw_byte)(Uint32,Uint8);
++extern void (*mem68k_store_bksw_word)(Uint32,Uint16);
++extern void (*mem68k_store_bksw_long)(Uint32,Uint32);
+ #endif
+--- a/src/video.h 2011-10-25 18:04:13.0 -
b/src/video.h 2020-09-15 23:01:55.756521216 -
+@@ -67,7 +67,7 @@ typedef struct VIDEO {
+
+ #define RASTER_LINES 261
+
+-unsigned int neogeo_frame_counter;
++extern unsigned int neogeo_frame_counter;
+ extern unsigned int neogeo_frame_counter_speed;
+
+ void init_video(void);
+--- a/src/memory.c 2011-10-25 18:04:13.0 -
b/src/memory.c 2020-09-15 23:08:31.083181700 -
+@@ -896,3 +896,19 @@ void mem68k_store_bk_normal_word(Uint32
+
+ LONG_STORE(mem68k_store_bk_normal)
+ ;
++Uint8* current_pal;
++Uint32 *current_pc_pal;
++Uint8 *current_fix;
++Uint8 *fix_usage;
++Uint8 sram_lock;
++Uint8 sound_code;
++Uint8 pending_command;
++Uint8 result_code;
++Uint16 z80_bank[4];
++Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
++Uint16 (*mem68k_fetch_bksw_word)(Uint32);
++Uint32 (*mem68k_fetch_bksw_long)(Uint32);
++void (*mem68k_store_bksw_byte)(Uint32,Uint8);
++void (*mem68k_store_bksw_word)(Uint32,Uint16);
++void (*mem68k_store_bksw_long)(Uint32,Uint32);
++neo_mem memory;
+--- b/src/video.c 2011-10-25 18:04:13.0 -
b/src/video.c 2020-09-15 23:09:15.113923583 -
+@@ -32,6 +32,7 @@
+ #include "transpack.h"
+
+ extern int neogeo_fix_bank_type;
++unsigned int neogeo_frame_counter;
+
+
+ #ifdef PROCESSOR_ARM
+--- a/src/screen.c 2011-10-25 18:04:13.0 -
b/src2/screen.c2020-09-15 23:14:14.508969030 -
+@@ -401,3 +401,14 @@ void screen_fullscreen() {
+ fullscreen ^= 1;
+ blitter[nblitter].fullscreen();
+ }
++SDL_Surface *screen;
++SDL_Surface *buffer, *sprbuf, *fps_buf, *scan, *fontbuf;
++SDL_Rect visible_area;
++int yscreenpadding;
++Uint8 interpolation;
++Uint8 nblitter;
++Uint8 neffect;
++Uint8 scale;
++Uint8 fullscreen;
++
++
+--- a/src/screen.h 2011-10-25 18:04:13.0 -
b/src/screen.h 2020-09-15 23:14:14.085628561 -
+@@ -17,19 +17,19 @@ extern RGB2YUV rgb2yuv[65536];
+
+ void init_rgb2yuv_table(void);
+
+-SDL_Surface *screen;
+-SDL_Surface *buffer, *sprbuf, *fps_buf, *scan, *fontbuf;
++extern SDL_Surface *screen;
++extern SDL_Surface *buffer, *sprbuf, *fps_buf,
[gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/
commit: 976da2b3b2c40ebfb33e135293548d7d1cb26dc6
Author: Alexey Sokolov google com>
AuthorDate: Wed Sep 16 00:22:17 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Sep 21 21:12:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976da2b3
games-emulation/gngeo: drop 0.8-r1
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17561
Signed-off-by: James Le Cuirot gentoo.org>
games-emulation/gngeo/gngeo-0.8-r1.ebuild | 43 ---
1 file changed, 43 deletions(-)
diff --git a/games-emulation/gngeo/gngeo-0.8-r1.ebuild
b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
deleted file mode 100644
index 3e7f2be86fc..000
--- a/games-emulation/gngeo/gngeo-0.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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}
-}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/
commit: b907cca52ef0028780f11450d01a585aa02d4331
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 29 10:08:20 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 29 11:25:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b907cca5
games-emulation/gngeo: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-emulation/gngeo/Manifest | 1 -
games-emulation/gngeo/gngeo-0.8.ebuild | 47 --
2 files changed, 48 deletions(-)
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
deleted file mode 100644
index 85723c8d9f4..000
--- a/games-emulation/gngeo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gngeo-0.8.tar.gz 1043579 BLAKE2B
b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13
SHA512
4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild
b/games-emulation/gngeo/gngeo-0.8.ebuild
deleted file mode 100644
index 1d34ff20ab7..000
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools flag-o-matic games
-
-DESCRIPTION="A NeoGeo emulator"
-HOMEPAGE="https://code.google.com/p/gngeo/;
-SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz;
-
-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() {
- epatch \
- "${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() {
- egamesconf --disable-i386asm
-}
-
-src_install() {
- DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc )
- default
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- elog "A licensed NeoGeo BIOS copy is required to run the emulator."
- echo
-}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/files/, games-emulation/gngeo/
commit: a1dbc7b3488d5eb526d980b9ec764a50d1f26e05 Author: Pacho Ramos gentoo org> AuthorDate: Sun Apr 29 10:08:50 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Apr 29 11:25:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1dbc7b3 games-emulation/gngeo: Stop using games.eclass Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-emulation/gngeo/Manifest | 2 + games-emulation/gngeo/files/gngeo-0.8-cflags.patch | 4 +- .../gngeo/files/gngeo-0.8-concurrentMake.patch | 4 +- .../gngeo/files/gngeo-0.8-execstacks.patch | 40 ++-- games-emulation/gngeo/gngeo-0.8-r1.ebuild | 43 ++ 5 files changed, 69 insertions(+), 24 deletions(-) diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest new file mode 100644 index 000..b4560bf535a --- /dev/null +++ b/games-emulation/gngeo/Manifest @@ -0,0 +1,2 @@ +DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7 +DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5 diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch index 1a4892abae9..0dcc3e7c5bf 100644 --- a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch +++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch @@ -1,5 +1,5 @@ configure.in.orig 2016-03-31 04:15:45.913917791 -0400 -+++ configure.in 2016-03-31 04:16:23.447607551 -0400 +--- a/configure.in.orig2016-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 diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch index 1afc182c098..f039ecf544d 100644 --- a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch +++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch @@ -1,5 +1,5 @@ src/generator68k/Makefile.am.orig 2015-01-23 18:37:37.998723294 -0500 -+++ src/generator68k/Makefile.am 2015-01-23 18:38:39.995391133 -0500 +--- a/src/generator68k/Makefile.am.orig2015-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 diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch index 17c576b7d63..a3face06f35 100644 --- a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch +++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch @@ -1,5 +1,5 @@ src/effect/2xsaimmx.asm -+++ src/effect/2xsaimmx.asm +--- a/src/effect/2xsaimmx.asm b/src/effect/2xsaimmx.asm @@ -2107,3 +2107,7 @@ final1b resb 8 final2a resb 8 @@ -8,8 +8,8 @@ +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif src/effect/effect_i386.asm -+++ src/effect/effect_i386.asm +--- a/src/effect/effect_i386.asm b/src/effect/effect_i386.asm @@ -88,3 +88,7 @@ emms @@ -18,8 +18,8 @@ +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif src/effect/hq2x16.asm -+++ src/effect/hq2x16.asm +--- a/src/effect/hq2x16.asm b/src/effect/hq2x16.asm @@ -1935,3 +1935,7 @@ dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 @@ -28,8 +28,8 @@ +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif src/effect/hq3x16.asm -+++ src/effect/hq3x16.asm +--- a/src/effect/hq3x16.asm b/src/effect/hq3x16.asm @@ -2520,3 +2520,7 @@ dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 @@ -38,8 +38,8 @@ +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif src/memcpy.S -+++ src/memcpy.S +--- a/src/memcpy.S b/src/memcpy.S @@ -495,4 +495,8 @@ Lmemcpy_bsrcul1l4: @@ -51,8 +51,8 @@ +#ifdef __ELF__ +.section .note.GNU-stack,"",@progbits +#endif src/raze/Makefile.am -+++ src/raze/Makefile.am +--- a/src/raze/Makefile.am b/src/raze/Makefile.am @@ -20,7 +20,7 @@ $(srcdir)/strip_ $< $@ @@ -62,8 +62,8 @@ # This assembles the file, once it's been pre-processed raze.o: raze2.asm
[gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/files/, games-emulation/gngeo/
commit: 7f66870d913ad192d3ec1a8b5fc6d09e79e60d7a
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Mar 31 08:21:43 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Mar 31 08:21:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f66870d
games-emulation/gngeo: build with gcc5 (bug #571056); respect CFLAGS
Package-Manager: portage-2.2.26
games-emulation/gngeo/files/gngeo-0.8-cflags.patch | 41 ++
games-emulation/gngeo/gngeo-0.8.ebuild | 8 +++--
2 files changed, 46 insertions(+), 3 deletions(-)
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 000..1a4892a
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
@@ -0,0 +1,41 @@
+--- configure.in.orig 2016-03-31 04:15:45.913917791 -0400
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/gngeo-0.8.ebuild
b/games-emulation/gngeo/gngeo-0.8.ebuild
index c6b76ce..d994c78 100644
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit eutils autotools games
+inherit eutils autotools flag-o-matic games
DESCRIPTION="A NeoGeo emulator"
HOMEPAGE="https://code.google.com/p/gngeo/;
@@ -23,9 +23,11 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-execstacks.patch \
"${FILESDIR}"/${P}-zlib.patch \
- "${FILESDIR}"/${P}-concurrentMake.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() {
