Merge pull request #3442 from cmitu/advmame-fixes

advmame: build fixes when using a newer `gcc`

Author: joolswills

scriptmodules/emulators/advmame-0.94.sh

@@ -25,6 +25,8 @@ function depends_advmame-0.94() {
 function sources_advmame-0.94() {
     downloadAndExtract "$md_repo_url" "$md_build" --strip-components 1
     _sources_patch_advmame-1.4
+    # Fix the global vars missing the 'external' qualifier, needed for gcc > 10
+    applyPatch "${md_path%/*}/advmame/02_fix_extern_globals_0_94.diff"
 }
 
 function build_advmame-0.94() {

scriptmodules/emulators/advmame-1.4.sh

@@ -39,13 +39,15 @@ function _sources_patch_advmame-1.4() {
 
         # patch advmame to use a fake generated mode with the exact dimensions for fb - avoids need for configuring monitor / clocks.
         # the pi framebuffer doesn't use any of the framebuffer timing configs - it hardware scales from chosen dimensions to actual size
-        applyPatch "$scriptdir/scriptmodules/$md_type/advmame/01_rpi_framebuffer.diff"
+        applyPatch "${md_path%/*}/advmame/01_rpi_framebuffer.diff"
     fi
 }
 
 function sources_advmame-1.4() {
     downloadAndExtract "$md_repo_url" "$md_build" --strip-components 1
     _sources_patch_advmame-1.4 1.4
+    # Fix the global vars missing the 'external' qualifier, needed for gcc > 10
+    applyPatch "${md_path%/*}/advmame/02_fix_extern_globals_1_4.diff"
 }
 
 function build_advmame-1.4() {

scriptmodules/emulators/advmame.sh

@@ -43,9 +43,9 @@ function sources_advmame() {
 function build_advmame() {
     local params=()
     if isPlatform "videocore"; then
-        params+=(--enable-sdl1 --disable-sdl2 --enable-vc)
+        params+=(--enable-sdl --disable-sdl2 --enable-vc)
     else
-        params+=(--enable-sdl2 --disable-sdl1 --disable-vc)
+        params+=(--enable-sdl2 --disable-sdl --disable-vc)
     fi
     ./autogen.sh
     ./configure CFLAGS="$CFLAGS -fno-stack-protector" --prefix="$md_inst" "${params[@]}"

scriptmodules/emulators/advmame/02_fix_extern_globals_0_94.diff

@@ -0,0 +1,13 @@
+diff --git a/src/drivers/seibuspi.c b/src/drivers/seibuspi.c
+index 143dcc2..91187f8 100644
+--- a/src/drivers/seibuspi.c
++++ b/src/drivers/seibuspi.c
+@@ -602,7 +602,7 @@ WRITE32_HANDLER( video_dma_length_w );
+ WRITE32_HANDLER( video_dma_address_w );
+ WRITE32_HANDLER( sprite_dma_start_w );
+ 
+-UINT32 *scroll_ram;
++extern UINT32 *scroll_ram;
+ extern int old_vidhw;
+ extern int bg_size;
+ data32_t *spimainram;

scriptmodules/emulators/advmame/02_fix_extern_globals_1_4.diff

@@ -0,0 +1,36 @@
+From f8688cae05799a30cd5337e626a07fa9f004c0a3 Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni <[email protected]>
+Date: Fri, 23 Oct 2020 21:29:41 +0200
+Subject: [PATCH] Fix build errors due new gcc 10 default for -fno-common
+
+---
+ src/drivers/cavepgm.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c
+index 38d3dae8..df6e97ab 100644
+--- a/src/drivers/cavepgm.c
++++ b/src/drivers/cavepgm.c
+@@ -287,7 +287,7 @@ Notes:
+ #include "timer.h"
+ 
+ 
+-UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
++extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
+ static UINT8 *z80_mainram;
+ static UINT32 *arm7_shareram;
+ static UINT32 arm7_latch;
+@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void)
+ /* This function expands the sprite colour data (in the A Roms) from 3 pixels
+    in each word to a byte per pixel making it easier to use */
+ 
+-UINT8 *pgm_sprite_a_region;
+-size_t	pgm_sprite_a_region_allocate;
++extern UINT8 *pgm_sprite_a_region;
++extern size_t	pgm_sprite_a_region_allocate;
+ 
+ static void expand_colourdata(void)
+ {
+-- 
+2.32.0
+