Sun Mar 22 19:58:16 UTC 202020200322195816

l/glibmm-2.64.2-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.10_2-x86_64-1.txz:  Upgraded.
l/libcue-2.2.1-x86_64-1.txz:  Added.
  The initial use for this is adding CUE support to audacious-plugins.
l/libdvdnav-6.1.0-x86_64-1.txz:  Upgraded.
l/libdvdread-6.1.0-x86_64-1.txz:  Upgraded.
xap/audacious-4.0-x86_64-1.txz:  Upgraded.
xap/audacious-plugins-4.0-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/audacious-plugins-4.0-x86_64-1_alsa.txz:  Upgraded.

2 files changed, 52 insertions, 49 deletions

diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
index bcb7b7cf..bfb33c58 100755
--- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild
+++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=audacious-plugins
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
+
+# Whether to include faad/aac support:
+FAAD=${FAAD:-false}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -44,24 +47,23 @@ PKG=$TMP/package-${PKGNAM}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHOPTS="--disable-sse2"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  ARCHOPTS="--disable-sse2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX="64"
-  ARCHOPTS=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  ARCHOPTS=""
 fi
 
 # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
 if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
   TAG="_alsa"
+  PULSEOPTS="-Dpulse=false"
+else
+  unset PULSEOPTS
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -87,23 +89,30 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --disable-aac \
-  --program-prefix= \
-  --program-suffix= \
-  ${ARCHOPTS} \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  -Dfaad=$FAAD \
+  -Dmms=false \
+  $PULSEOPTS \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -127,7 +136,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL Mercurial-Access README* \
+  AUTHORS* COPYING* INSTALL* README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild
index c0106cd5..6ef77f72 100755
--- a/source/xap/audacious/audacious.SlackBuild
+++ b/source/xap/audacious/audacious.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006-2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -52,15 +52,12 @@ PKG=$TMP/package-${PKGNAM}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHOPTS="--disable-sse2"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  ARCHOPTS="--disable-sse2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  ARCHOPTS=""
 elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
   LIBDIRSUFFIX=""
@@ -87,30 +84,27 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --docdir=/usr/doc/${PKGNAM}-$VERSION \
-  --program-prefix= \
-  --program-suffix= \
-  ${ARCHOPTS} \
-  --with-buildstamp=$ARCH-slackware-linux \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Fix broken symlinks pointing into the build directory
-#( cd $PKG/usr/bin
-#  rm -f audacious audtool
-#  ln -s audacious2 audacious
-#  ln -s audtool2 audtool
-#)
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -142,7 +136,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL Mercurial-Access NEWS README doc/* \
+  AUTHORS* COPYING* INSTALL* NEWS* README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history