multimedia/HandBrake: Fix 32-bit build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 52 insertions, 6 deletions

diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild
index 3278c708c7..521286759e 100644
--- a/multimedia/HandBrake/HandBrake.SlackBuild
+++ b/multimedia/HandBrake/HandBrake.SlackBuild
@@ -24,9 +24,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -73,6 +70,12 @@ 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
 
diff --git a/multimedia/HandBrake/HandBrake.info b/multimedia/HandBrake/HandBrake.info
index f02a4c62e5..3b55d6b603 100644
--- a/multimedia/HandBrake/HandBrake.info
+++ b/multimedia/HandBrake/HandBrake.info
@@ -11,7 +11,6 @@ DOWNLOAD="https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBra
           https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2 \
           https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-11.0.10.1.tar.gz \
           https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz \
-          https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz \
           https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.3.tar.gz"
 MD5SUM="d7fa3057eb830d11d5a18a868bd3ff2d \
         c1e8aae3434b8fe6109e47e88e5b4de4 \
@@ -23,10 +22,9 @@ MD5SUM="d7fa3057eb830d11d5a18a868bd3ff2d \
         09c7423568fb679279fd2a2bc6b10b6e \
         3400a117b9d4291f36be00c522057578 \
         10e99ad6f862598f2f39a50d663bf4f3 \
-        deb5df5cb2ec17bdbae6ac6bbc3b1eef \
         43e157debdfebf737db3a709fc971869"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libass x264 numactl"
+REQUIRES="libass x264 x265 numactl"
 MAINTAINER="klaatu"
 EMAIL="klaatu@member.fsf.org"
diff --git a/multimedia/HandBrake/system_x265.diff b/multimedia/HandBrake/system_x265.diff
new file mode 100644
index 0000000000..0badbab3ec
--- /dev/null
+++ b/multimedia/HandBrake/system_x265.diff
@@ -0,0 +1,45 @@
+diff -Naur HandBrake-1.5.1/libhb/module.defs HandBrake-1.5.1.patched/libhb/module.defs
+--- HandBrake-1.5.1/libhb/module.defs	2022-01-10 14:11:37.000000000 -0500
++++ HandBrake-1.5.1.patched/libhb/module.defs	2022-03-24 15:57:45.803548141 -0400
+@@ -129,10 +129,6 @@
+ LIBHB.dll.libs += $(CONTRIB.build/)lib/libvpl.a
+ endif
+ 
+-ifeq (1,$(FEATURE.x265))
+-LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a
+-endif
+-
+ ifneq ($(HAS.iconv),1)
+ LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
+ else
+diff -Naur HandBrake-1.5.1/make/include/main.defs HandBrake-1.5.1.patched/make/include/main.defs
+--- HandBrake-1.5.1/make/include/main.defs	2022-01-10 14:11:37.000000000 -0500
++++ HandBrake-1.5.1.patched/make/include/main.defs	2022-03-24 15:58:28.972263692 -0400
+@@ -40,13 +40,6 @@
+     MODULES += contrib/fdk-aac
+ endif
+ 
+-ifeq (1,$(FEATURE.x265))
+-    MODULES += contrib/x265
+-    MODULES += contrib/x265_8bit
+-    MODULES += contrib/x265_10bit
+-    MODULES += contrib/x265_12bit
+-endif
+-
+ MODULES += contrib/libdav1d
+ MODULES += contrib/zimg
+ MODULES += contrib/ffmpeg
+diff -Naur HandBrake-1.5.1/test/module.defs HandBrake-1.5.1.patched/test/module.defs
+--- HandBrake-1.5.1/test/module.defs	2022-01-10 14:11:37.000000000 -0500
++++ HandBrake-1.5.1.patched/test/module.defs	2022-03-24 15:59:19.957108790 -0400
+@@ -23,6 +23,10 @@
+     TEST.GCC.l += fontconfig
+ endif
+ 
++ifeq (1,$(FEATURE.x265))
++    TEST.GCC.l += x265
++endif
++
+ ifeq (1,$(FEATURE.qsv))
+     TEST.GCC.l += vpl
+ ifneq (,$(filter $(HOST.system),linux freebsd))