From 02c9bfff757559ec46bb1fdc183f160777c8117c Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 19 Apr 2019 20:26:12 +0000
Subject: Fri Apr 19 20:26:12 UTC 2019

d/perl-5.28.2-x86_64-1.txz:  Upgraded.
  Modules upgraded:
  DBD-mysql-4.050, IO-Socket-SSL-2.066, TermReadKey-2.38, URI-1.76.
l/gst-plugins-base-1.16.0-x86_64-1.txz:  Upgraded.
l/gst-plugins-good-1.16.0-x86_64-1.txz:  Upgraded.
l/gst-plugins-libav-1.16.0-x86_64-1.txz:  Upgraded.
l/gstreamer-1.16.0-x86_64-1.txz:  Upgraded.
l/python-urllib3-1.24.2-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/gst-plugins-good-1.16.0-x86_64-1_alsa.txz:  Upgraded.
---
 .../l/gst-plugins-good/gst-plugins-good.SlackBuild  |  5 +----
 .../gst-plugins-good.libvpx-1.8.diff                | 21 ---------------------
 .../gst-plugins-libav/gst-plugins-libav.SlackBuild  | 10 +++++++++-
 source/l/python-urllib3/python-urllib3.SlackBuild   |  2 +-
 4 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 source/l/gst-plugins-good/gst-plugins-good.libvpx-1.8.diff

(limited to 'source/l')

diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
index bf052cace..2444a9644 100755
--- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
+++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gst-plugins-good
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -81,9 +81,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION
 
-# Adapt to removed VP8 decoder post processing flags in libvpx-1.8.x:
-zcat $CWD/gst-plugins-good.libvpx-1.8.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/l/gst-plugins-good/gst-plugins-good.libvpx-1.8.diff b/source/l/gst-plugins-good/gst-plugins-good.libvpx-1.8.diff
deleted file mode 100644
index 0d37b44be..000000000
--- a/source/l/gst-plugins-good/gst-plugins-good.libvpx-1.8.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./ext/vpx/gstvpxdec.c.orig	2018-03-23 15:44:48.000000000 -0500
-+++ ./ext/vpx/gstvpxdec.c	2019-02-06 15:46:09.031432673 -0600
-@@ -62,18 +62,6 @@
-     {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
-     {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
-     {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
--    {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
--          "Print frame information",
--        "visualize-frame-info"},
--    {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES),
--          "Show macroblock mode selection overlaid on image",
--        "visualize-macroblock-modes"},
--    {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF),
--          "Show dc diff for each macro block overlaid on image",
--        "visualize-dc-diff"},
--    {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
--          "Print video rate info",
--        "visualize-rate-info"},
-     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
-     {0, NULL, NULL}
-   };
diff --git a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild
index 401a8acd7..a81de63a2 100755
--- a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild
+++ b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild
@@ -82,6 +82,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
     -exec chmod 644 {} \;   
 
+# --with-system-libav now requires ffmpeg4, so we'll use the embedded version
+# until we are able to switch over to that.
+if [ ! "$VERSION" = "1.16.0" ]; then
+  echo "New version detected... if we aren't using ffmpeg4 yet please update"
+  echo "the check in gst-plugins-libav.SlackBuild."
+  echo "Exiting."
+  exit 1
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,7 +100,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
-  --with-system-libav \
   --with-libav-extra-configure=\"--enable-runtime-cpudetect\" \
   --build=$ARCH-slackware-linux || exit 1
 
diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild
index 1736c984a..42fbc26b1 100755
--- a/source/l/python-urllib3/python-urllib3.SlackBuild
+++ b/source/l/python-urllib3/python-urllib3.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-urllib3
 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 SRCNAM=urllib3
 
-- 
cgit v1.2.3