handbrake: update to 1.2.2

1 files changed, 49 insertions, 29 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 94e937e2..0f412b71 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -68,6 +68,8 @@
 #             * Try to fix segfaults by borrowing some from the SBo script.
 # 1.1.2-1:    06/oct/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.2.2-1:    07/mar/2019 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh handbrake.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -77,7 +79,7 @@
 
 
 PRGNAM=handbrake
-VERSION=${VERSION:-1.1.2}
+VERSION=${VERSION:-1.2.2}
 # Find the revision for a release tag (does not currently work!):
 RELREV=${RELREV:-""}
 BUILD=${BUILD:-1}
@@ -105,7 +107,7 @@ WITH_GUI=${WITH_GUI:-"YES"}
 
 DOCS="AUTHORS* COPYING* LICENSE* NEWS* README* THANKS*"
 
-CONTRIBURL="http://download.handbrake.fr/handbrake/contrib"
+CONTRIBURL="https://download.handbrake.fr/contrib"
 
 # Versions of the contribs most of which are compiled-in;
 # A rough guideline as to how to determine the versions and download URLs is
@@ -113,7 +115,7 @@ CONTRIBURL="http://download.handbrake.fr/handbrake/contrib"
 ASS=0.14.0
 BLURAY=1.0.2
 FDKAAC=0.1.5
-FFMPEG=12.3
+FFMPEG=4.1
 FREETYPE=2.8.1
 FRIBIDI=0.19.7
 HARFBUZZ=1.7.2
@@ -122,12 +124,13 @@ LAME=3.100
 DVDNAV=6.0.0
 DVDREAD=6.0.0
 OGG=1.3.2
-OPUS=1.2.1
+OPUS=1.3
+SPEEX=1.2.0
 THEORA=1.1.1
 VORBIS=1.3.5
 VPX=1.7.0
-X264=snapshot-20180525-2245
-X265=2.6
+X264=snapshot-20180925-2245
+X265=2.9
 XML2=2.9.4
 
 # Where do we look for sources?
@@ -142,7 +145,7 @@ OUTPUT=${OUTPUT:-/tmp}
 DLI=0
 
 # Download locations of sources:
-SOURCE[$DLI]="$SRCDIR/HandBrake-${VERSION}-source.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/HandBrake-${VERSION}-source.tar.bz2"
 if [ -n "$RELREV" ]; then
   # Download release tag from GIT so that we can create a "release" build,
   # which shows the actual version in the about box instead of a GIT revision
@@ -153,65 +156,73 @@ else
 fi
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libass-$ASS.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/libass-$ASS.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/libass-$ASS.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libbluray-$BLURAY.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/libbluray-$BLURAY.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/libbluray-$BLURAY.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/harfbuzz-$HARFBUZZ.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/harfbuzz-$HARFBUZZ.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/harfbuzz-$HARFBUZZ.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/fdk-aac-$FDKAAC.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/fdk-aac-$FDKAAC.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/fdk-aac-$FDKAAC.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libav-$FFMPEG.tar.gz"
-SRCURL[$DLI]="$CONTRIBURL/libav-$FFMPEG.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/ffmpeg-$FFMPEG.tar.bz2"
+SRCURL[$DLI]="$CONTRIBURL/ffmpeg-$FFMPEG.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/freetype-$FREETYPE.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/freetype-$FREETYPE.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/freetype-$FREETYPE.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/fribidi-$FRIBIDI.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/fribidi-$FRIBIDI.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/fribidi-$FRIBIDI.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/jansson-$JANSSON.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/jansson-$JANSSON.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/jansson-$JANSSON.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/lame-$LAME.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/lame-$LAME.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/lame-$LAME.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libdvdnav-$DVDNAV.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/libdvdnav-$DVDNAV.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/libdvdnav-$DVDNAV.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libdvdread-$DVDREAD.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/libdvdread-$DVDREAD.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/libdvdread-$DVDREAD.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libvpx-$VPX.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/libvpx-$VPX.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/libvpx-$VPX.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/opus-$OPUS.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/opus-$OPUS.tar.gz"
 SRCURL[$DLI]="$CONTRIBURL/opus-$OPUS.tar.gz"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/x264-$X264.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/sources/x264-$X264.tar.bz2"
 #SRCURL[$DLI]="$CONTRIBURL/x264-$X264.tar.bz2"
 SRCURL[$DLI]="https://download.videolan.org/pub/videolan/x264/snapshots/x264-$X264.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/x265_$X265.tar.gz"
-SRCURL[$DLI]="$CONTRIBURL/x265_$X265.tar.gz"
+SOURCE[$DLI]="$SRCDIR/sources/x265_$X265.tar.gz"
+SRCURL[$DLI]="https://download.videolan.org/pub/videolan/x265/x265_$X265.tar.gz"
+
+DLI=$(($DLI+1))
+SOURCE[$DLI]="$SRCDIR/sources/speex-$SPEEX.tar.gz"
+SRCURL[$DLI]="$CONTRIBURL/speex-$SPEEX.tar.gz"
+
+DLI=$(($DLI+1))
+SOURCE[$DLI]="$SRCDIR/sources/libxml2-$XML2.tar.gz"
+SRCURL[$DLI]="$CONTRIBURL/libxml2-$XML2.tar.gz"
 
 if [ "${USE_PATENTS}" == "YES" ]; then
   echo ""
@@ -362,7 +373,7 @@ cd $TMP/tmp-$PRGNAM
 # ---------------------------------------------------------------------------
 #
 
-tar -xvf ${SOURCE[0]}
+tar -xf ${SOURCE[0]}
 cd HandBrake-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -380,6 +391,12 @@ cat $SRCDIR/patches/handbrake.static_modules.patch |patch -p1 --verbose \
 #  cp -a --parent contrib $HBTOPDIR/
 #cd -
 
+# Make the GTK GUI compile on Slackware 14.2:
+if ! pkg-config --atleast-version=3.20 gtk+-3.0 ; then
+  cat $SRCDIR/patches/handbrake.gtk3.lt.3.22.patch | patch -p1 \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
+
 # Assembly code for 10bit and 12bit x265 encoder only exists for x86_64,
 # so prevent compilation errors on other arches:
 if [ "${ARCH}" != "x86_64" ]; then
@@ -396,7 +413,7 @@ else
 fi
 
 if [ "${USE_PATENTS}" == "YES" ]; then
-  USE_NONFREE="--enable-fdk-aac --disable-libav-aac"
+  USE_NONFREE="--enable-fdk-aac --disable-ffmpeg-aac"
 else
   USE_NONFREE=" "
 fi
@@ -412,10 +429,11 @@ echo Building ...
 
 # This will build the commandline and GTK (if requested) programs,
 # adding ' -lglib-2.0' to the LDFLAGS was needed for the program to link
-# against libfribidi.a on 32bit:
+# against libfribidi.a on 32bit.
+# The '-lm' is required to make speex link:
 CFLAGS="$SLKCFLAGS -fno-aggressive-loop-optimizations" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS -lglib-2.0" \
+LDFLAGS="$SLKLDFLAGS -lglib-2.0 -lm" \
 ./configure \
   --prefix=/usr \
   --launch --launch-jobs=0 \
@@ -480,6 +498,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/gtk
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/ || true
 ( cd build/contrib
   find . -iname "LICENS*" -o -iname "COPYING*" -exec cp --parents {} $PKG/usr/doc/$PRGNAM-$VERSION/ \;
+  chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+  chmod -R u+w,go+r-w,a+X-s $PKG/usr/doc/$PRGNAM-$VERSION
 )
 cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION