1 files changed, 29 insertions, 87 deletions
diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild
index 00b7ec3117..ab08d344b7 100644
--- a/games/ags/ags.SlackBuild
+++ b/games/ags/ags.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ags
 
@@ -23,127 +23,69 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ags
-VERSION=${VERSION:-3.5.0.19}
+VERSION=${VERSION:-3.6.1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-# Dependency tarball versions.
-ALLEGRO_VERSION=${ALLEGRO_VERSION:-4.4.2}
-DUMB_VERSION=${DUMB_VERSION:-0.9.3}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=format-truncation"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=format-truncation"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -Wno-error=format-truncation"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC -Wno-error=format-truncation"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -Wno-error=format-truncation"
   LIBDIRSUFFIX=""
 fi
 
 set -e
 
 rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
-rm -rf allegro-${ALLEGRO_VERSION}
-rm -rf dumb-${DUMB_VERSION}
-rm -rf ags-v.${VERSION}
-
-# Build Allegro 4 first.
-
-tar xvf $CWD/allegro-${ALLEGRO_VERSION}.tar.gz
-cd allegro-${ALLEGRO_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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir build
-cd build
-cmake \
-	-DWANT_DOCS=OFF \
-	-DWANT_EXAMPLES=OFF \
-	-DWANT_TESTS=OFF \
-	-DWANT_TOOLS=OFF \
-	-DCMAKE_INSTALL_PREFIX=/opt/ags-$VERSION \
-	-DCMAKE_BUILD_TYPE=Release \
-	..
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
-make install DESTDIR=$PKG
-
-# Then build Dynamic Universal Music Bibliotheque.
-
-cd $TMP
-tar xvf $CWD/dumb-${DUMB_VERSION}.tar.gz
-cd dumb-$DUMB_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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cat << EOF > make/config.txt
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-ALL_TARGETS += allegro allegro-examples allegro-headers
-PREFIX := $PKG/opt/ags-$VERSION
-EOF
-
-PATH="$PATH:$PKG/opt/ags-$VERSION/bin" make \
-	WFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
-	LDFLAGS="-lm -L$PKG/opt/ags-$VERSION/lib $LDFLAGS"
-make install
-
-# And finaly install Adventure Game Studio.
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-cd $TMP
-tar xvf $CWD/v.${VERSION}.tar.gz || tar xvf $CWD/ags-v.${VERSION}.tar.gz
-cd ags-v.$VERSION
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  make --directory=Engine
 
-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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
- CXXFLAGS="-I$PKG/opt/ags-$VERSION/include $SLKCFLAGS" \
- LDFLAGS="-L$PKG/opt/ags-$VERSION/lib -Wl,-rpath,/opt/ags-$VERSION/lib" \
- PATH="$PATH:$PKG/opt/ags-$VERSION/bin" \
- make --directory=Engine
 mkdir -p $PKG/usr/bin
-cp Engine/ags $PKG/opt/ags-$VERSION/bin
-
-(
-cd $PKG/usr/bin
-ln -s ../../opt/ags-$VERSION/bin/ags .
-)
+install -s -m0755 Engine/ags $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -154,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE