From 86aaf4d6fceecb3dab2f29be1f899a27a2885e3b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 20 May 2019 21:07:25 +0000
Subject: Mon May 20 21:07:25 UTC 2019

a/btrfs-progs-5.1-x86_64-1.txz:  Upgraded.
a/dbus-1.12.14-x86_64-1.txz:  Upgraded.
a/eudev-3.2.8-x86_64-1.txz:  Upgraded.
d/bison-3.4-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_46-x86_64-1.txz:  Upgraded.
l/pulseaudio-12.2-x86_64-2.txz:  Rebuilt.
  Patched to build against alsa-lib-1.1.9. Thanks to nobodino.
n/ethtool-5.1-x86_64-1.txz:  Upgraded.
xfce/tumbler-0.2.4-x86_64-1.txz:  Upgraded.
---
 source/l/FTBFSlog                             |  3 +++
 source/l/mozjs52/mozjs52.SlackBuild           |  2 +-
 source/l/pulseaudio/0131-alsa-lib-1.1.9.patch | 39 +++++++++++++++++++++++++++
 source/l/pulseaudio/pulseaudio.SlackBuild     |  8 +++++-
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 source/l/pulseaudio/0131-alsa-lib-1.1.9.patch

(limited to 'source/l')

diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index f87be4ac6..3cd6a9daf 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Mon May 20 04:25:26 UTC 2019
+  mozjs52: --disable-tests. Thanks to Matteo Bernardini.
++--------------------------+
 Mon Apr 22 01:42:38 UTC 2019
   qt-gstreamer: Fix for gstreamer-1.16.x API change.
   Thanks to nobodino.
diff --git a/source/l/mozjs52/mozjs52.SlackBuild b/source/l/mozjs52/mozjs52.SlackBuild
index 3934616ce..264a60529 100755
--- a/source/l/mozjs52/mozjs52.SlackBuild
+++ b/source/l/mozjs52/mozjs52.SlackBuild
@@ -136,7 +136,7 @@ CXXFLAGS+="$SLKCFLAGS -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-
   --enable-readline \
   --enable-release \
   --enable-shared-js \
-  --enable-tests \
+  --disable-tests \
   --with-intl-api \
   --with-system-zlib \
   --without-system-icu \
diff --git a/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch b/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch
new file mode 100644
index 000000000..1600417f3
--- /dev/null
+++ b/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch
@@ -0,0 +1,39 @@
+alsa: Fix inclusion of use-case.h
+The recent change in ALSA upstream stripped -I$include/alsa path from
+pkgconfig.  We already fixed for this change in some places but still
+the code for UCM was overlooked, and this resulted in the unresolved
+symbols in alsa card module. Fix them as well.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Diffstat
+-rw-r--r--	configure.ac	2	
+		
+-rw-r--r--	src/modules/alsa/alsa-ucm.h	2	
+		
+2 files changed, 2 insertions, 2 deletions
+diff --git a/configure.ac b/configure.ac
+index c004bd7..b44ed15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
+ AS_IF([test "x$HAVE_ALSA" = "x1"],
+     [
+         save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
+-        AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
++        AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
+         CPPFLAGS="$save_CPPFLAGS"
+     ],
+     HAVE_ALSA_UCM=0)
+diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
+index 53abf3f..c926f3c 100644
+--- a/src/modules/alsa/alsa-ucm.h
++++ b/src/modules/alsa/alsa-ucm.h
+@@ -23,7 +23,7 @@
+ ***/
+ 
+ #ifdef HAVE_ALSA_UCM
+-#include <use-case.h>
++#include <alsa/use-case.h>
+ #else
+ typedef void snd_use_case_mgr_t;
+ #endif
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index b539e2afb..35f84b5a8 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
@@ -87,6 +87,9 @@ zcat $CWD/0002-allow-autospawn-for-root-default.diff.gz | patch -p1 --verbose ||
 # Do not log a warning every time root uses PulseAudio:
 zcat $CWD/0003-no-root-warn.diff.gz | patch -p1 --verbose || exit 1
 
+# Patch to fix building against alsa-lib-1.1.9:
+zcat $CWD/0131-alsa-lib-1.1.9.patch.gz | patch -p1 --verbose || exit 1
+
 sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-x11.in
 echo "X-MATE-Autostart-Phase=Initialization" >> src/daemon/pulseaudio.desktop.in
 
@@ -98,6 +101,9 @@ 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 \
-- 
cgit v1.2.3