From 8a57cac1b7b766e492bdce5af37fed3386e3bc1a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 17 Nov 2019 22:07:53 +0000
Subject: Sun Nov 17 22:07:53 UTC 2019

ap/qpdf-9.1.0-x86_64-1.txz:  Upgraded.
d/check-0.13.0-x86_64-1.txz:  Added.
  This is needed to build PulseAudio using Meson.
l/alsa-lib-1.2.1-x86_64-2.txz:  Rebuilt.
  Merge alsa-topology-conf-1.2.1 and alsa-ucm-conf-1.2.1 into the package.
l/pulseaudio-13.0-x86_64-2.txz:  Rebuilt.
  Rebuilt with meson. This causes esound support to be dropped, but it's
  likely that nobody will care.
l/pyparsing-2.4.5-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/alsa-lib-1.2.1-x86_64-2_alsa.txz:  Rebuilt.
  Merge alsa-topology-conf-1.2.1 and alsa-ucm-conf-1.2.1 into the package.
---
 source/l/alsa-lib/alsa-lib.SlackBuild     | 16 ++++++++-
 source/l/pulseaudio/pulseaudio.SlackBuild | 54 ++++++++++++++++---------------
 2 files changed, 43 insertions(+), 27 deletions(-)

(limited to 'source/l')

diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild
index c2de7e296..436070ed3 100755
--- a/source/l/alsa-lib/alsa-lib.SlackBuild
+++ b/source/l/alsa-lib/alsa-lib.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=alsa-lib
 VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -81,6 +81,15 @@ if [ ! -r src/conf/smixer.conf ]; then
   cp -a $CWD/smixer.conf src/conf
 fi
 
+# Untar the configuration files. We'll install them later.
+( mkdir ucm-and-topology-configs
+  cd ucm-and-topology-configs
+  for file in $CWD/alsa-*conf*tar* ; do
+    tar xvf $file
+    mv README.md README-$(echo $(basename $file) | cut -f 1-3 -d -)
+  done
+)
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -93,6 +102,8 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-mixer-modules \
   --enable-mixer-pymods \
+  --enable-topology \
+  --enable-ucm \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || exit 1
@@ -115,6 +126,9 @@ fi
 chmod 644 $PKG/etc/asound.conf.new
 chown root:root $PKG/etc/asound.conf.new
 
+# Install ucm and topology configs:
+( cd ucm-and-topology-configs ; tar cf - . ) | ( cd $PKG/usr/share/alsa ; tar xf -)
+
 # TODO?
 # ( cd src/pcm/ext
 # make jack
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index bd3b13d46..cf5a33669 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pulseaudio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -98,34 +98,36 @@ zcat $CWD/pulseaudio-autostart.patch.gz | patch -p1 --verbose || exit 1
 # using the upstream default here.
 sed -i 's/; flat-volumes = yes/flat-volumes = no/g' ./src/daemon/daemon.conf.in
 
-# 0131-alsa-lib-1.1.9.patch.gz touches configure.ac, so:
-autoreconf -vif
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./bootstrap.sh \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-tcpwrap \
-  --enable-orc \
-  --disable-static \
-  --disable-hal-compat \
-  --disable-bluez4 \
-  --with-system-user=pulse \
-  --with-system-group=pulse \
-  --with-access-group=audio \
-  --with-bash-completion-dir=/usr/share/bash-completion/completions \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS check || make check || exit 1
-make $NUMJOBS || make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
-
-# Remove .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/lib*.la
+  --buildtype=release \
+  -Dorc=enabled \
+  -Dhal-compat=false \
+  -Dsystem_user="pulse" \
+  -Dsystem_group="pulse" \
+  -Daccess_group="audio" \
+  -Dbashcompletiondir="/usr/share/bash-completion/completions" \
+  .. || 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" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Move config files to .new:
 for f in $( find $PKG/etc/pulse/ -type f ) ; do mv $f $f.new ; done
-- 
cgit v1.2.3-80-g2a13