gentoo resync : 23.09.2020

3 files changed, 306 insertions, 11 deletions

diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 6d147332d635..54a5bbff5cf6 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,8 +1,9 @@
 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-fcommon.patch 7790 BLAKE2B 908a30c0677520a5140b5f3237b3ce6d6eb47ba77cf9ab48a73e48a8213aa31bbe985de8094635181a6fc77c471071ab3d390f886f880ffcbda7bb807cd9906b SHA512 2f25c1ed1526d691847beabafb6cb0b72bdd477a56e0d297d9c3e68e7b059d4752bca8cb3b60369931784876a3a9ed66f2d47513b1b3ffb53c8649cf16e52115
 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
+EBUILD gngeo-0.8-r2.ebuild 1065 BLAKE2B 7d86cb78bd0a78b0e2c78981831314954b97df9118484d35e396c1187953b25c9244a360ea7a02f69f841dfa59483e23f5a3c21b03381ca0e82fc570acbbab44 SHA512 8755550ed846f75cb623dc62a000fc3e63862b2ef3aed31b6e1aa27c280c084b1cbbf8e2d85a524f7a1d2c0064ca10b9038e2b8776bbd1b6d4dc2b34815415c9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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 000000000000..63e1ff097bb7
--- /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.000000000 -0000
++++ b/src/memory.h	2020-09-15 23:02:48.114069895 -0000
+@@ -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.000000000 -0000
++++ b/src/video.h	2020-09-15 23:01:55.756521216 -0000
+@@ -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.000000000 -0000
++++ b/src/memory.c	2020-09-15 23:08:31.083181700 -0000
+@@ -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.000000000 -0000
++++ b/src/video.c	2020-09-15 23:09:15.113923583 -0000
+@@ -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.000000000 -0000
++++ b/src2/screen.c	2020-09-15 23:14:14.508969030 -0000
+@@ -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.000000000 -0000
++++ b/src/screen.h	2020-09-15 23:14:14.085628561 -0000
+@@ -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, *scan, *fontbuf;
+ //SDL_Surface *triplebuf[2];
+ 
+-SDL_Rect visible_area;
++extern SDL_Rect visible_area;
+ 
+-int yscreenpadding;
++extern int yscreenpadding;
+ 
+-Uint8 interpolation;
+-Uint8 nblitter;
+-Uint8 neffect;
+-Uint8 scale;
+-Uint8 fullscreen;
++extern Uint8 interpolation;
++extern Uint8 nblitter;
++extern Uint8 neffect;
++extern Uint8 scale;
++extern Uint8 fullscreen;
+ 
+ Uint8 get_effect_by_name(char *name);
+ Uint8 get_blitter_by_name(char *name);
+
+--- a/src/emu.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/emu.c	2020-09-15 23:55:31.560725467 -0000
+@@ -64,6 +64,11 @@ extern int irq2enable, irq2start, irq2re
+ extern int lastirq2line;
+ extern int irq2repeat_limit;
+ extern Uint32 irq2pos_value;
++Uint8 key[SDLK_LAST];
++Uint8 *joy_button[2];
++Sint32 *joy_axe[2];
++Uint32 joy_numaxes[2];
++conf_type conf;
+ 
+ void setup_misc_patch(char *name) {
+ 
+--- a/src/emu.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/emu.h	2020-09-15 23:55:31.067383834 -0000
+@@ -45,7 +45,7 @@ typedef enum COUNTRY {
+     CTY_MAX
+ } COUNTRY;
+ 
+-struct {
++typedef struct {
+     char *game;
+     Uint16 x_start;
+     Uint16 y_start;
+@@ -89,7 +89,8 @@ struct {
+ 
+     int p1_hotkey[4];
+     int p2_hotkey[4];
+-} conf;
++} conf_type;
++extern conf_type conf;
+ 
+ enum {
+     HOTKEY_MASK_A = 0x1,
+@@ -123,10 +124,10 @@ enum {
+ 
+ //config conf;
+ 
+-Uint8 key[SDLK_LAST];
+-Uint8 *joy_button[2];
+-Sint32 *joy_axe[2];
+-Uint32 joy_numaxes[2];
++extern Uint8 key[SDLK_LAST];
++extern Uint8 *joy_button[2];
++extern Sint32 *joy_axe[2];
++extern Uint32 joy_numaxes[2];
+ 
+ void debug_loop(void);
+ void main_loop(void);
+--- a/src/state.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/state.c	2020-09-15 23:51:12.333025158 -0000
+@@ -627,6 +627,7 @@ void clear_state_reg(void) {
+ 	st_mod[i].reglist=NULL;
+     }
+ }
++SDL_Surface *state_img;
+ 
+ void neogeo_init_save_state(void) {
+     int i;
+--- a/src/state.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/state.h	2020-09-15 23:50:09.751969676 -0000
+@@ -80,7 +80,7 @@ typedef struct NEOGEO_STATE {
+     Uint8 pal1[0x2000], pal2[0x2000];
+ }NEOGEO_STATE;
+ 
+-SDL_Surface *state_img;
++extern SDL_Surface *state_img;
+ 
+ #define STREAD  0
+ #define STWRITE 1
+--- a/src/event.c	2012-01-13 20:25:07.000000000 -0000
++++ b/src/event.c	2020-09-16 00:13:06.148468785 -0000
+@@ -10,6 +10,8 @@
+ #include "conf.h"
+ #include "emu.h"
+ #include "memory.h"
++JOYMAP *jmap;
++Uint8 joy_state[2][GN_MAX_KEY];
+ 
+ static int get_mapid(char *butid) {
+ 	printf("Get mapid %s\n",butid);
+--- a/src/event.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/event.h	2020-09-16 00:13:05.125118226 -0000
+@@ -41,8 +41,8 @@ typedef struct JOYMAP {
+ 	struct BUT_MAP **jhat;
+ }JOYMAP;
+ 
+-JOYMAP *jmap;
+-Uint8 joy_state[2][GN_MAX_KEY];
++extern JOYMAP *jmap;
++extern Uint8 joy_state[2][GN_MAX_KEY];
+ 
+ 
+ bool init_event(void);
+--- a/src/frame_skip.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/frame_skip.c	2020-09-16 00:14:09.792873267 -0000
+@@ -33,6 +33,7 @@
+ #ifndef uclock_t
+ #define uclock_t Uint32
+ #endif
++char fps_str[32];
+ 
+ #define TICKS_PER_SEC 1000000UL
+ //#define CPU_FPS 60
+--- a/src/frame_skip.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/frame_skip.h	2020-09-16 00:14:10.619553849 -0000
+@@ -22,7 +22,7 @@
+ 
+ extern char skip_next_frame;
+ 
+-char fps_str[32];
++extern char fps_str[32];
+ 
+ void reset_frame_skip(void);
+ int frame_skip(int init);
+--- a/src/transpack.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/transpack.c	2020-09-16 00:14:41.750077802 -0000
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ 
+ #include "transpack.h"
++TRANS_PACK *tile_trans;
+ 
+ 
+ static void trans_pack_add(Uint32 begin,Uint32 end,Uint32 type)
+--- a/src/transpack.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/transpack.h	2020-09-16 00:14:41.073399747 -0000
+@@ -14,7 +14,7 @@ typedef struct TRANS_PACK {
+     Uint8 type;
+     struct TRANS_PACK *next;
+ } TRANS_PACK;
+-TRANS_PACK *tile_trans;
++extern TRANS_PACK *tile_trans;
+ 
+ TRANS_PACK* trans_pack_find(Uint32 tile);
+ void trans_pack_open(char *filename);
diff --git a/games-emulation/gngeo/gngeo-0.8-r1.ebuild b/games-emulation/gngeo/gngeo-0.8-r2.ebuild
index 3e7f2be86fc0..f4e1e906ad79 100644
--- a/games-emulation/gngeo/gngeo-0.8-r1.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop flag-o-matic
 
 DESCRIPTION="A NeoGeo emulator"
@@ -12,20 +13,24 @@ SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="virtual/opengl
+DEPEND="
 	media-libs/libsdl[joystick,opengl,sound,video]
-	sys-libs/zlib[minizip]"
+	sys-libs/zlib[minizip]
+	virtual/opengl
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-execstacks.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-concurrentMake.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fcommon.patch
+)
+
 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)