From 3bf617136cd0aea7bc718c98d503ee0e8a09e58f Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 19 Jul 2019 16:59:51 +0000
Subject: ffmpeg: update to 4.1.4

---
 ffmpeg/build/ffmpeg.SlackBuild | 56 ++++++++++--------------------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

(limited to 'ffmpeg')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 42d36321..374e3e03 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -179,6 +179,8 @@
 #             * Rebuilt for slackware-current.
 # 3.4.6-1:    30/mar/2019 by Eric Hameleers <alien@slackware.com>
 #             * Updated.
+# 4.1.4-1:    19/jul/2019 by Eric Hameleers <alien@slackware.com>
+#             * Updated.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -188,7 +190,7 @@
 
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-3.4.6}
+VERSION=${VERSION:-4.1.4}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 TAG=${TAG:-"alien"}
@@ -274,10 +276,10 @@ MFX=1.25
 FRIBIDI=1.0.5
 GSM=1.0.16
 LAME=3.100
-LIBVA=2.4.0
+LIBVA=2.5.0
 LIBZVBI=0.2.35
-OPUS=1.3
-ORC=0.4.28
+OPUS=1.3.1
+ORC=0.4.29
 RAW1394=2.0.5
 RTMP=2.3
 SCHROEDINGER=1.0.11
@@ -285,9 +287,9 @@ SDL2=2.0.9
 SPEEX=1.2.0
 V4L=1.16.5
 VDPAU=1.2
-VPX=1.8.0
-X264=20190329-2245
-X265=2.8
+VPX=1.8.1
+X264=20190718-2245
+X265=3.1.1
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -1573,16 +1575,11 @@ fi
 cd $TMP/tmp-$PRGNAM/ffmpeg-${VERSION}
 
 # Fix compilation with newer libx264:
-# To actually use the new multi-bitdepth in libx264 we need a newer release
-# of ffmpeg, and then enable 10bit support in make_x264()
+# To actually use the new multi-bitdepth in libx264 we need to
+# enable 10bit support in make_x264()
 #cat $SRCDIR/patches/x264_bitdepth.patch | patch -p1 --verbose \
 #  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
 
-# Fix compilation against newer fdk-aac which slightly changed the API
-# (this already landed in ffmpeg 4.x):
-cat $SRCDIR/patches/fdk-aac_v2.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-
 if [ "$ARCH" = "x86_64" ]; then
   ARCHOPTS="--arch=x86_64 --enable-pic"
 else
@@ -1596,7 +1593,7 @@ TMPDIR="$TMP" \
 CFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \
 CPPFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL" \
 CXXFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL $SLKCFLAGS" \
-LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpng -lXext" \
+LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpthread -lpng -lXext" \
 PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
 ./configure \
@@ -1648,7 +1645,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   ${USE_NONFREE} \
   $ARCHOPTS \
   --extra-cflags="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL2 -DRUNTIME_CPUDETECT" \
-  --extra-ldflags="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} -ldl -lssl -lcrypto -lz -lusb -ldrm" \
+  --extra-ldflags="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} -lpthread -ldl -lssl -lcrypto -lz -lusb -ldrm" \
   --pkg-config-flags="--static" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
   # Use ffmpeg's own implementation:
@@ -1725,33 +1722,6 @@ for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do
          $PCFILE 
 done
 
-# Add a configuration file for the ffserver:
-mkdir -p $PKG/etc
-cp -a doc/ffserver.conf  $PKG/etc/ffserver.conf.new
-
-# Add this to the doinst.sh:
-! [ -d $PKG/install ] && mkdir -p $PKG/install
-cat <<EOINS >> $PKG/install/doinst.sh
-# Handle the incoming configuration files:
-config() {
-  for infile in \$1; do
-    NEW="\$infile"
-    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r \$OLD ]; then
-      mv \$NEW \$OLD
-    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
-      # toss the redundant copy
-      rm \$NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-
-config etc/ffserver.conf.new
-
-EOINS
-
 # Add  documentation (for all the deps as well)
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-- 
cgit v1.2.3