1 files changed, 30 insertions, 17 deletions
diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild
index 4c8a28ff04..e16c80373b 100644
--- a/multimedia/HandBrake/HandBrake.SlackBuild
+++ b/multimedia/HandBrake/HandBrake.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for HandBrake
 
@@ -7,10 +7,13 @@
 # Modified by Erik Hanson at SlackBuilds.org
 # Patched to fix x264 segfault by John Vogel
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=HandBrake
-VERSION=${VERSION:-1.0.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 DOCDIR=${DOCDIR:-/usr/doc}
 
 if [ -z "$ARCH" ]; then
@@ -21,13 +24,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -41,8 +48,6 @@ else
 fi
 
 SLKCFLAGS="$SLKCFLAGS -fno-aggressive-loop-optimizations"
-saved_CFLAGS="$CFLAGS"
-saved_CXXFLAGS="$CFLAGS"
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 
@@ -52,10 +57,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
 cd $PRGNAM-$VERSION
 mkdir -p download
-cp -r $CWD/* download
+cp -r $CWD/*{gz,bz2} download
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -63,25 +68,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# 20220324 bkw: this fixes the 32-bit build, at the cost of adding
+# x265 as a required dep. It's based on Debian's
+# 0001-Remove-embedded-downloaded-copies-of-various-librari.patch
+# ...but it only affects x265.
+patch -p1 < $CWD/system_x265.diff
+
+# Autodetect onevpl support
+if pkg-config --exists vpl ; then qsv="--enable-qsv" ; else qsv="" ; fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --disable-gtk-update-checks \
   --enable-fdk-aac \
-  --disable-libav-aac \
+  --enable-nvenc \
+  --enable-vce \
   --enable-x265 \
+  $qsv \
   --arch=$ARCH
 
 cd build
-  # Fix underlinking by configuring the gtk module first, then sed:
-  make gtk.configure
   make
   make install DESTDIR=$PKG
-cd $TMP/$PRGNAM-$VERSION
+strip $PKG/usr/bin/*
 
-export CFLAGS="$saved_CFLAGS"
-export CXXFLAGS="$saved_CXXFLAGS"
+cd $TMP/$PRGNAM-$VERSION
 
 mkdir -p $PKG/$DOCDIR/$PRGNAM-$VERSION
 cp -a AUTHORS.markdown COPYING NEWS.markdown THANKS.markdown README.markdown \
@@ -93,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE