CVS commit: pkgsrc/multimedia/handbrake

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Sun Apr  9 08:57:19 UTC 2023

Modified Files:
        pkgsrc/multimedia/handbrake: Makefile distinfo
        pkgsrc/multimedia/handbrake/patches: patch-make-include-main.defs

Log Message:
fix build

HandBrake requires libjpeg-turbo, and as this conflicts with the default libjpeg
which is used by gtk3, remove the jpeg dependency and provide libjpeg-turbo
directly, which will be linked statically.

fixes PR#57070


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/handbrake/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/handbrake/Makefile
diff -u pkgsrc/multimedia/handbrake/Makefile:1.90 pkgsrc/multimedia/handbrake/Makefile:1.91
--- pkgsrc/multimedia/handbrake/Makefile:1.90   Sun Jan 29 21:17:18 2023
+++ pkgsrc/multimedia/handbrake/Makefile        Sun Apr  9 08:57:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2023/01/29 21:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2023/04/09 08:57:19 plunky Exp $
 
 DISTNAME=      HandBrake-1.5.1-source
 PKGNAME=       ${DISTNAME:tl:S/-source//}
@@ -18,6 +18,11 @@ DIST_SUBDIR= handbrake
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 
+# see contrib/libjpeg-turbo/module.defs for required version
+LIBJPEG_TURBO=         libjpeg-turbo-2.1.2.tar.gz
+DISTFILES+=            ${LIBJPEG_TURBO}
+SITES.${LIBJPEG_TURBO}=        https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/
+
 RESTRICTED=            Unresolved patent issues
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
@@ -61,6 +66,11 @@ CFLAGS+=     -fheinous-gnu-extensions
 BROKEN_GETTEXT_DETECTION=      yes
 GHB_LOCALES=   af co cs da de es eu fr he hr it ja ko nl no pl pt pt_BR ro ru si sk sl_SI sv th tr uk_UA zh_CN zh_TW
 
+# the build phase will attempt to download libjpeg-turbo if not provided
+pre-build:
+       ${MKDIR} ${WRKSRC}/download
+       ${LN} -fs ${DISTDIR}/${DIST_SUBDIR}/${LIBJPEG_TURBO} ${WRKSRC}/download/${LIBJPEG_TURBO}
+
 post-build:
        set -e; cd ${WRKSRC};                                                   \
        for po in ${GHB_LOCALES}; do                                            \
@@ -96,6 +106,4 @@ post-build:
 .include "../../multimedia/x265/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-JPEG_ACCEPTED= libjpeg-turbo
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/handbrake/distinfo
diff -u pkgsrc/multimedia/handbrake/distinfo:1.17 pkgsrc/multimedia/handbrake/distinfo:1.18
--- pkgsrc/multimedia/handbrake/distinfo:1.17   Mon Oct  3 10:46:05 2022
+++ pkgsrc/multimedia/handbrake/distinfo        Sun Apr  9 08:57:19 2023
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.17 2022/10/03 10:46:05 adam Exp $
+$NetBSD: distinfo,v 1.18 2023/04/09 08:57:19 plunky Exp $
 
 BLAKE2s (handbrake/HandBrake-1.5.1-source.tar.bz2) = 47b0351cc3edf04e3cf946b052431f851a006779a5feb63bb5bf8faa41b1fd3b
 SHA512 (handbrake/HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
 Size (handbrake/HandBrake-1.5.1-source.tar.bz2) = 16137974 bytes
+BLAKE2s (handbrake/libjpeg-turbo-2.1.2.tar.gz) = 41d420e6aac0098326644768b51b745160402384b811956bdada22837a1047ca
+SHA512 (handbrake/libjpeg-turbo-2.1.2.tar.gz) = 172c3d8bdad62c32c4560754422fb36f0e80c8316e44d08708f0cba8ee9fd0830f5295d380de34d0f90ec07df6ab4dbe2f0c8451bc60553371c022c9077447c2
+Size (handbrake/libjpeg-turbo-2.1.2.tar.gz) = 2257645 bytes
 SHA1 (patch-configure) = 5f0452587c82ac9a419ac5fc06f07d35d174bc24
-SHA1 (patch-make-include-main.defs) = b1bab1deecf7a34a40288f6cc3fca003afbbce35
+SHA1 (patch-make-include-main.defs) = 53ca462076392c2ee2901b05b12d81faf145d3ab
 SHA1 (patch-make-python_launcher) = db0e01e9a5063b0d083f56840079e74909c729c6
 SHA1 (patch-test_module.defs) = f88ffc65f8e8bddb87de1af0fcc91f2abc6f819a

Index: pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs
diff -u pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.3 pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.4
--- pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.3        Mon Oct  3 10:46:05 2022
+++ pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs    Sun Apr  9 08:57:19 2023
@@ -1,13 +1,15 @@
-$NetBSD: patch-make-include-main.defs,v 1.3 2022/10/03 10:46:05 adam Exp $
+$NetBSD: patch-make-include-main.defs,v 1.4 2023/04/09 08:57:19 plunky Exp $
 
-Use comon pkgsrc libraries
+Use comon pkgsrc libraries, except for libjpeg-turbo which is required but
+cannot coexist with libjpeg (required by gtk3)
 
 --- make/include/main.defs.orig        2022-01-10 19:11:37.000000000 +0000
 +++ make/include/main.defs
-@@ -13,47 +13,10 @@ ifneq ($(HAS.bz2),1)
+@@ -13,47 +13,11 @@ ifneq ($(HAS.bz2),1)
  endif
  endif
  
++MODULES += contrib/libjpeg-turbo
 -ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
 -    MODULES += contrib/freetype
 -    MODULES += contrib/fribidi