handbrake: updated to 1.3.3

1 files changed, 15 insertions, 5 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 6d9ed835..6baaedea 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -77,6 +77,8 @@
 #             * Update.
 # 1.3.2-1:    11/may/2020 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.3.3-1:    17/nov/2020 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 .
@@ -86,7 +88,7 @@
 
 
 PRGNAM=handbrake
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.3}
 # Find the revision for a release tag (does not currently work!):
 RELREV=${RELREV:-""}
 BUILD=${BUILD:-1}
@@ -118,14 +120,14 @@ 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
-# $ grep FETCH.url $(find HandBrake-1.3.2/contrib -type f -name module.defs)
+# $ grep FETCH.url $(find HandBrake-1.3.3/contrib -type f -name module.defs)
 ASS=0.14.0
 BLURAY=1.1.2
 DAV1D=0.5.1
 DVDNAV=6.0.1
 DVDREAD=6.0.2
 FDKAAC=2.0.1
-FFMPEG=4.2.2
+FFMPEG=4.2.3
 FREETYPE=2.10.1
 FRIBIDI=1.0.7
 HARFBUZZ=2.6.4
@@ -183,7 +185,8 @@ SRCURL[$DLI]="$CONTRIBURL/fdk-aac-$FDKAAC.tar.gz"
 
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/sources/ffmpeg-$FFMPEG.tar.bz2"
-SRCURL[$DLI]="$CONTRIBURL/ffmpeg-$FFMPEG.tar.bz2"
+#SRCURL[$DLI]="$CONTRIBURL/ffmpeg-$FFMPEG.tar.bz2"
+SRCURL[$DLI]="https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.bz2"
 
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/sources/freetype-$FREETYPE.tar.gz"
@@ -423,6 +426,12 @@ if ! pkg-config --atleast-version=3.22 gtk+-3.0 ; then
     2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 fi
 
+# Slackware gettext is too old on 14.2 so we apply a post hb-1.3.3 commit.
+# Note that the developer states that hb-1.4.x will not build on older Linux,
+# see https://github.com/HandBrake/HandBrake/issues/2935
+cat $SRCDIR/patches/handbrake_gettext_metainfo.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
 # 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
@@ -467,9 +476,10 @@ HBDEPSDIR="$TMP/tmp-$PRGNAM/HandBrake-$VERSION/build/contrib"
 # adding ' -lglib-2.0' to the LDFLAGS was needed for the program to link
 # against libfribidi.a on 32bit.
 # The '-lm' is required to make speex link:
+# The '-lpthreead' is  needed to make dav1d link:
 export CFLAGS="-I$HBDEPSDIR/include -fno-aggressive-loop-optimizations -fno-strict-aliasing $SLKCFLAGS"
 export CXXFLAGS="-I$HBDEPSDIR/include -fno-aggressive-loop-optimizations -fno-strict-aliasing $SLKCFLAGS"
-export LDFLAGS="-L$HBDEPSDIR/lib -lglib-2.0 -lm $SLKLDFLAGS"
+export LDFLAGS="-L$HBDEPSDIR/lib -lglib-2.0 -lm -lpthread $SLKLDFLAGS"
 export PATH="$HBDEPSDIR/bin:$PATH"
 export PKG_CONFIG_PATH="$HBDEPSDIR/lib/pkgconfig"
 export LD_LIBRARY_PATH="$HBDEPSDIR/lib"