3 files changed, 33 insertions, 13 deletions
diff --git a/games/advancemame/README b/games/advancemame/README
index 483467c54264..b0b04523a169 100644
--- a/games/advancemame/README
+++ b/games/advancemame/README
@@ -4,7 +4,5 @@ Advancemame is a derivative of the well known "mame" emulator.
 It works easily on linux, with joystick support, fullscreen
 support, and more "out of the box."
 
-Optional dependency: SDL2. By default, advancemame is built with
-SDL-1.2. If SDL-2.0 is installed, advancemame will autodetect it and use
-it instead. If you have SDL2 installed, but want to build advancemame
-with SDL-1.2, set SDL2=no in the script's environment.
+By default, advancemame is built with SDL2. If you want to build
+advancemame with SDL-1.2, set SDL2=no in the script's environment.
diff --git a/games/advancemame/advancemame.SlackBuild b/games/advancemame/advancemame.SlackBuild
index 725bf9a5d4ed..aa9c18385a38 100644
--- a/games/advancemame/advancemame.SlackBuild
+++ b/games/advancemame/advancemame.SlackBuild
@@ -8,6 +8,7 @@
 # had no license, modified version released under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211004 bkw: BUILD=2, fix for -current
 # 20180910 bkw: Update for v3.9
 # 20180702 bkw: Update for v3.8
 # 20180206 bkw: Update for v3.7
@@ -28,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=advancemame
 VERSION=${VERSION:-3.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,11 +73,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # 20180702 bkw: This file got left out of the 3.8 release tarball. It
 # xzips down to 8.5K, so just include it here (taken from upstream git).
@@ -99,6 +94,9 @@ PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 # but the link fails. advancemame already builds about 8-10x as fast as
 # mame without it, so not worth worrying about this.
 
+# 20211004 bkw: upstream commit f8688cae needed for -current.
+patch -p1 < $CWD/compilefix.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/games/advancemame/compilefix.diff b/games/advancemame/compilefix.diff
new file mode 100644
index 000000000000..ddf815a4b70f
--- /dev/null
+++ b/games/advancemame/compilefix.diff
@@ -0,0 +1,24 @@
+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)
+ {