handbrake: updated to 1.1.0

1 files changed, 41 insertions, 45 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 6f353eae..add35596 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  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -62,6 +62,8 @@
 #             * Update.
 # 1.0.3-1:    14/mar/2017 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.1.0-1:    16/may/2018 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 .
@@ -71,7 +73,7 @@
 
 
 PRGNAM=handbrake
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.1.0}
 # Find the revision for a release tag (does not currently work!):
 RELREV=${RELREV:-""}
 BUILD=${BUILD:-1}
@@ -86,28 +88,28 @@ DOCS="AUTHORS* COPYING* LICENSE* NEWS* README* THANKS*"
 
 CONTRIBURL="http://download.handbrake.fr/handbrake/contrib"
 
-# Versions of the contribs most of which are compiled-in:
-ASS=0.13.2
-BLURAY="0.9.3"
-FDKAAC="0.1.4"
-FFMPEG="12"
-FONTCONFIG=2.12.1
-FREETYPE=2.6.5
+# Versions of the contribs most of which are compiled-in;
+# A rough guideline as to how to determine the versions and download URLs is
+# $ grep FETCH.url $(find HandBrake-1.1.0/contrib -type f -name module.defs)
+ASS=0.14.0
+BLURAY=1.0.2
+FDKAAC=0.1.5
+FFMPEG=12.3
+FREETYPE=2.8.1
 FRIBIDI=0.19.7
-HARFBUZZ=1.3.0
-JANSSON="2.6"
-LAME=3.98
-DVDNAV=5.0.1
-DVDREAD=5.0.0-6-gcb1ae87
-OGG=1.3.0
-OPUS=1.1.3
-SAMPLERATE=0.1.4
-THEORA=1.1.0
-VORBIS="aotuv_b6.03"
-VPX="1.5.0"
-X264="snapshot-20160920-2245-stable"
-X265="2.1-1"
-XML2="2.7.7"
+HARFBUZZ=1.7.2
+JANSSON=2.10
+LAME=3.100
+DVDNAV=5.0.3
+DVDREAD=5.0.3
+OGG=1.3.2
+OPUS=1.2.1
+THEORA=1.1.1
+VORBIS=1.3.5
+VPX=1.6.1
+X264=snapshot-20171225-2245
+X265=2.6
+XML2=2.9.4
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -121,14 +123,14 @@ OUTPUT=${OUTPUT:-/tmp}
 DLI=0
 
 # Download locations of sources:
-SOURCE[$DLI]="$SRCDIR/HandBrake-${VERSION}.tar.bz2"
+SOURCE[$DLI]="$SRCDIR/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
   # ... how twisted can you get.
   SRCURL[$DLI]=""
 else
-  SRCURL[$DLI]="https://handbrake.fr/mirror/HandBrake-${VERSION}.tar.bz2"
+  SRCURL[$DLI]="https://download.handbrake.fr/releases/${VERSION}/HandBrake-${VERSION}-source.tar.bz2"
 fi
 
 DLI=$(($DLI+1))
@@ -168,8 +170,8 @@ SOURCE[$DLI]="$SRCDIR/libdvdnav-$DVDNAV.tar.bz2"
 SRCURL[$DLI]="$CONTRIBURL/libdvdnav-$DVDNAV.tar.bz2"
 
 DLI=$(($DLI+1))
-SOURCE[$DLI]="$SRCDIR/libdvdread-$DVDREAD.tar.gz"
-SRCURL[$DLI]="$CONTRIBURL/libdvdread-$DVDREAD.tar.gz"
+SOURCE[$DLI]="$SRCDIR/libdvdread-$DVDREAD.tar.bz2"
+SRCURL[$DLI]="$CONTRIBURL/libdvdread-$DVDREAD.tar.bz2"
 
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/libvpx-$VPX.tar.bz2"
@@ -181,7 +183,8 @@ SRCURL[$DLI]="$CONTRIBURL/opus-$OPUS.tar.gz"
 
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/x264-$X264.tar.bz2"
-SRCURL[$DLI]="$CONTRIBURL/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"
@@ -192,19 +195,18 @@ SRCURL[$DLI]="$CONTRIBURL/x265_$X265.tar.gz"
 ##
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
@@ -332,22 +334,13 @@ cd HandBrake-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
+# Apply patches:
 touch $OUTPUT/patch-${PRGNAM}.log
 
 # Handbrake thinks all Linux systems come with libass, lame and x264:
 cat $SRCDIR/patches/handbrake.static_modules.patch |patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Fix compilation of libdvdread and fribidi on Slackware 14.1:
-cat $SRCDIR/patches/handbrake.libdvdread_automake.patch |patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/patches/handbrake.fribidi_autoconf.patch |patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-
-## Fix a potential crash in the 2-pass VP8 encoder (fixed after 1.0.0):
-#cat $SRCDIR/patches/handbrake.encavcodec_crash.patch |patch -p1 --verbose \
-#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-
 ## Add some of our own patches to the build:
 #HBTOPDIR=$(pwd)
 #cd $SRCDIR/patches
@@ -378,6 +371,9 @@ LDFLAGS="$SLKLDFLAGS -lglib-2.0" \
 ./configure \
   --prefix=/usr \
   --launch --launch-jobs=0 \
+  --enable-x265 \
+  --enable-fdk-aac \
+  --enable-libav-aac \
   ${GUI_OPTS} \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log