From b316bcb973aa879bba9d623ddcd12726cae715fd Mon Sep 17 00:00:00 2001 From: B. Watson Date: Wed, 20 Mar 2024 16:05:44 -0400 Subject: games/advancemame: Updated for version 3.10. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/advancemame/advancemame.SlackBuild | 24 +++++++++--------------- games/advancemame/advancemame.info | 6 +++--- games/advancemame/compilefix.diff | 24 ------------------------ games/advancemame/joverride.dat.xz | Bin 8640 -> 0 bytes 4 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 games/advancemame/compilefix.diff delete mode 100644 games/advancemame/joverride.dat.xz (limited to 'games') diff --git a/games/advancemame/advancemame.SlackBuild b/games/advancemame/advancemame.SlackBuild index c96b68d18a..9384419a66 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. +# 20240320 bkw: update for v3.10 # 20220401 bkw: BUILD=3, add SlackBuild to doc dir # 20211004 bkw: BUILD=2, fix for -current # 20180910 bkw: Update for v3.9 @@ -29,8 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=advancemame -VERSION=${VERSION:-3.9} -BUILD=${BUILD:-3} +VERSION=${VERSION:-3.10} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,15 +75,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -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). -JOVER="joverride.dat" -if [ -e $CWD/$JOVER.xz -a ! -e advance/linux/$JOVER ]; then - xzcat $CWD/$JOVER.xz > advance/linux/$JOVER -fi +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + if [ "${SDL2:-yes}" != "yes" ]; then SDL2OPT="--enable-sdl --disable-sdl2" @@ -95,9 +89,6 @@ 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 \ @@ -118,7 +109,10 @@ make # into them, resulting in a mess. make -j1 install prefix=$PKG/usr bindir=$PKG/usr/games docdir=$PKGDOC -# Binaries are installed stripped. Man pages are in the wrong section! +# 20240320 bkw: in 3.9, binaries were installed stripped. Not so in 3.10. +strip $PKG/usr/games/* + +# Man pages are in the wrong section! mv $PKG/usr/man/man1 $PKG/usr/man/man6 sed -i '/^\.TH.* 1$/s,1$,6,' $PKG/usr/man/man6/*.1 rename .1 .6 $PKG/usr/man/man6/*.1 diff --git a/games/advancemame/advancemame.info b/games/advancemame/advancemame.info index 6be22610ef..c5dc259449 100644 --- a/games/advancemame/advancemame.info +++ b/games/advancemame/advancemame.info @@ -1,8 +1,8 @@ PRGNAM="advancemame" -VERSION="3.9" +VERSION="3.10" HOMEPAGE="http://advancemame.sourceforge.net" -DOWNLOAD="https://github.com/amadvance/advancemame/releases/download/v3.9/advancemame-3.9.tar.gz" -MD5SUM="2a5fce5892b95db9f6129f84c9369869" +DOWNLOAD="https://github.com/amadvance/advancemame/releases/download/v3.10/advancemame-3.10.tar.gz" +MD5SUM="620129fd17916e052bf594b866714133" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/advancemame/compilefix.diff b/games/advancemame/compilefix.diff deleted file mode 100644 index ddf815a4b7..0000000000 --- a/games/advancemame/compilefix.diff +++ /dev/null @@ -1,24 +0,0 @@ -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) - { diff --git a/games/advancemame/joverride.dat.xz b/games/advancemame/joverride.dat.xz deleted file mode 100644 index 6f3f694840..0000000000 Binary files a/games/advancemame/joverride.dat.xz and /dev/null differ -- cgit v1.2.3