Thu Feb 20 23:40:12 UTC 202020200220234012

a/ed-1.16-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.14-x86_64-3.txz:  Rebuilt.
  Rebuilt to add wayland backend.
l/libuv-1.34.2-x86_64-1.txz:  Added.
  This is needed by bind-9.16.0.
l/qt5-5.13.2-x86_64-2.txz:  Rebuilt.
  Rebuilt to add wayland support.
  Use the system ffmpeg, not the bundled one.
n/bind-9.16.0-x86_64-1.txz:  Upgraded.
  rc.bind: don't change file ownerships in /var/named. Thanks to voegelas.
n/proftpd-1.3.6c-x86_64-1.txz:  Upgraded.
  No CVEs assigned, but this sure looks like a security issue:
  Use-after-free vulnerability in memory pools during data transfer.
  (* Security fix *)
x/libinput-1.15.2-x86_64-1.txz:  Upgraded.
x/xkbcomp-1.4.3-x86_64-1.txz:  Upgraded.
testing/packages/PAM/proftpd-1.3.6c-x86_64-1_pam.txz:  Upgraded.
  No CVEs assigned, but this sure looks like a security issue:
  Use-after-free vulnerability in memory pools during data transfer.
  (* Security fix *)

1 files changed, 26 insertions, 8 deletions

diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index 01100bd98..58439f31e 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -31,10 +31,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 PKGSRC=$(echo $VERSION | cut -d - -f 1)
 PKGVER=$(echo $VERSION | tr - _)
 
+USE_CODECS=${USE_CODECS:-NO}
+SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES}
+
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -138,13 +141,16 @@ cd qtbase
   zcat $CWD/patches/qt5.cve-2020-0570.patch.gz | patch -p1 --verbose || exit 1
 cd - 1>/dev/null
 
+# If PulseAudio is not found, use the _alsa $TAG and disable it in the build:
 if ! pkg-config --exists libpulse 2>/dev/null ; then
   # Forcibly disable pulseaudio in qtwebengine:
   zcat $CWD/patches/qt5.pulseaudio.diff.gz | patch -p1 --verbose || exit 1
   # Disable pulseaudio in Qt5:
-  PACONF="-no-pulseaudio"
+  PULSEAUDIO_OPTION="-no-pulseaudio"
+  TAG="_alsa"
 else
-  PACONF=" "
+  unset PULSEAUDIO_OPTION
+  unset TAG
 fi
 
 # Use our custom compiler and linker flags:
@@ -153,6 +159,18 @@ sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
 sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
   -i qtbase/mkspecs/common/g++-unix.conf || exit 1
 
+if [ ! "$USE_CODECS" = "NO" ]; then
+  CODEC_OPTION="-proprietary-codecs -webengine-proprietary-codecs"
+else
+  unset CODEC_OPTION
+fi
+
+if [ "$SYSTEM_FFMPEG" = "YES" ]; then
+  FFMPEG_OPTION="-webengine-ffmpeg"
+else
+  unset FFMPEG_OPTION
+fi
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
@@ -171,7 +189,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \
   -docdir /usr/doc/qt5-$PKGVER \
   -examplesdir /usr/doc/qt5-$PKGVER/examples \
-  -proprietary-codecs \
   -system-libpng \
   -system-libjpeg \
   -system-sqlite \
@@ -196,10 +213,11 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -no-separate-debug-info \
   -no-strip \
   -no-use-gold-linker \
-  -webengine-proprietary-codecs \
-  ${PACONF} \
+  ${CODEC_OPTION} \
+  ${FFMPEG_OPTION} \
+  ${PULSEAUDIO_OPTION} \
   ${RELOCATIONS} \
-  -no-pch \
+  -no-pch
   # No-precompiled-headers is ccache-friendly.
   
 # Sometimes a failure happens when parallelizing make.  Try again if make fails,
@@ -333,4 +351,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-${BUILD}${TAG}.txz