From 096f3007a3cd372b9627b46156464c99cb206bda Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 7 Sep 2015 22:07:54 +0000
Subject: ffmpeg: updated to 2.7.2. Also updated internal libraries: fdkaac,
 libass, libva, libvdpau, speex, x264, x265.

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

(limited to 'ffmpeg')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 10ac0dae..0a639079 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -136,6 +136,9 @@
 # 2.4.3-1:    12/nov/2014 by Eric Hameleers <alien@slackware.com>
 #             * Update. Added fdk-aac codec by Android Open Source Project,
 #               and X.265 (HEVC) codec by Videolan project..
+# 2.7.2-1:    07/sep/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update. Also updated internal libraries: fdkaac, libass,
+#               libva, libvdpau, speex, x264, x265
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -160,7 +163,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.7.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
@@ -199,28 +202,28 @@ AACENC=0.1.3
 AACPLUS=2.0.2
 AMRWBENC=0.1.3
 AMR=0.1.3
-ASS=0.11.2
+ASS=0.12.1
 AVC1394=0.5.4
 DC1394=2.1.2
 FAAC=1.28
 FAAD2=2.7
-FDKAAC=0.1.3
+FDKAAC=0.1.4
 FRIBIDI=0.19.6
 GSM=1.0.13
 LAME=3.99.5
-LIBVA=1.4.1
+LIBVA=1.5.1
 LIBZVBI=0.2.35
 OPUS=1.1
 ORC=0.4.18
 RAW1394=2.0.5
 RTMP=2.3
 SCHROEDINGER=1.0.11
-SPEEX=1.2rc1
+SPEEX=1.2rc2
 V4L=1.6.0
-VDPAU=0.8
+VDPAU=1.1.1
 VPX=v1.3.0
-X264=20141111-2245
-X265=1.4
+X264=20150906-2245
+X265=1.7
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -600,7 +603,6 @@ echo Building ...
 mkdir -p $TMP/tmp-$PRGNAM/ffmpegdeps/usr/{bin,include,lib,man}
 FFMPEGDEPSDIR="$TMP/tmp-$PRGNAM/ffmpegdeps"
 
-
 # -----------------------------------------------------------------------------
 # Compile lame libraries
 # The ffmpeg will use these
@@ -1217,8 +1219,7 @@ find . -name "*.a" | xargs strip --strip-unneeded
 echo -e "\n**\n**\n"
 make install DESTDIR=$FFMPEGDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vdpau.log
-# Remove the .so and .la files; we want static linking (but still use
-# the drivers in $(libdir)/va/drivers):
+# Remove the .so and .la files; we want static linking:
 rm -f $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.so*
 rm -f $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/libvdpau*.la
 rm -f $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/vdpau/libvdpau*.so*
@@ -1311,33 +1312,19 @@ cd $TMP/tmp-$PRGNAM/libva-$LIBVA
 # http://www.splitted-desktop.com/~gbeauchesne/xvba-video/ (since I do not own
 # Ati hardware I can not build a package for xvba-video myself)
 
-## Apply a wad of patches:
-#for DPATCH in $(ls debian/patches/*.patch) ; do
-#  cat $DPATCH |patch -p1 --verbose
-#done 2>&1 | tee $OUTPUT/patch-${PRGNAM}_libva.log
-
-# Fix the issue with the pre-generated configure script which will boneheadedly
-# require wayland_scanner. Create 'm4' directory first to prevent another error:
-mkdir m4
-autoreconf -vif \
-  2>&1 | tee $OUTPUT/autoreconf-${PRGNAM}_libva.log
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-wayland=no \
-  --enable-static \
+  --enable-dummy-driver \
   --enable-shared \
-  --enable-glx \
-  --with-drivers-path=/usr/lib${LIBDIRSUFFIX}/va/drivers \
+  --enable-static \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_libva.log
-  #--disable-wayland \
 make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libva.log
 # Strip the static lib to prevent linking errors in 64-bit,
 find . -name "*.a" | xargs strip --strip-unneeded
-- 
cgit v1.2.3-79-gdb01