Mon Aug 1 15:00:13 2022 UTC ()
multimedia/handbrake: update from 1.3.3 to 1.5.1; fix build when python>3.8


(ast)
diff -r1.78 -r1.79 pkgsrc/multimedia/handbrake/Makefile
diff -r1.1 -r1.2 pkgsrc/multimedia/handbrake/PLIST.gtk3
diff -r1.1 -r1.2 pkgsrc/multimedia/handbrake/options.mk
diff -r1.14 -r1.15 pkgsrc/multimedia/handbrake/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/handbrake/patches/patch-configure
diff -r0 -r1.1 pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs
diff -r0 -r1.1 pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher
diff -r1.2 -r0 pkgsrc/multimedia/handbrake/patches/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch
diff -r1.2 -r0 pkgsrc/multimedia/handbrake/patches/patch-libhb_fifo.c
cvs diff -r1.78 -r1.79 pkgsrc/multimedia/handbrake/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/Makefile 2022/07/03 21:38:48 1.78
+++ pkgsrc/multimedia/handbrake/Makefile 2022/08/01 15:00:13 1.79
@@ -1,97 +1,94 @@ @@ -1,97 +1,94 @@
1# $NetBSD: Makefile,v 1.78 2022/07/03 21:38:48 dbj Exp $ 1# $NetBSD: Makefile,v 1.79 2022/08/01 15:00:13 ast Exp $
2# 2#
3 3
4DISTNAME= HandBrake-1.3.3-source 4DISTNAME= HandBrake-1.5.1-source
5PKGNAME= ${DISTNAME:tl:S/-source//} 5PKGNAME= ${DISTNAME:tl:S/-source//}
6PKGREVISION= 7 6PKGREVISION= 8
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10GITHUB_PROJECT= HandBrake 10GITHUB_PROJECT= HandBrake
11GITHUB_RELEASE= 1.3.3 11GITHUB_RELEASE= 1.5.1
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://handbrake.fr/ 14HOMEPAGE= https://handbrake.fr/
15COMMENT= Multiplatform, multithreaded video transcoder 15COMMENT= Multiplatform, multithreaded video transcoder
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18DIST_SUBDIR= handbrake 18DIST_SUBDIR= handbrake
19EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 19EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
20DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 20DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
21CDISTFILES= ffmpeg-4.2.3.tar.bz2 \ 
22 libbluray-1.1.2.tar.bz2 \ 
23 libdvdnav-6.0.1.tar.bz2 \ 
24 libdvdread-6.0.2.tar.bz2 \ 
25 x265_3.2.1.tar.gz \ 
26 dav1d-0.5.1.tar.bz2 
27 21
28MESON_DISTFILE= meson-0.55.0.tar.gz 22CDISTFILES= ffmpeg-4.4.2.tar.bz2
29DISTFILES+= ${CDISTFILES} 23SITES.ffmpeg-4.4.2.tar.bz2= http://www.ffmpeg.org/releases/
30DISTFILES+= ${MESON_DISTFILE} 
31 
32.for f in ${CDISTFILES} 
33SITES.${f}= https://download.handbrake.fr/handbrake/contrib/ 
34.endfor 
35# handbrake.fr does not have ffmpeg-4.2.3.tar.bz2 as of 2021-01-10. 
36SITES.ffmpeg-4.2.3.tar.bz2= http://www.ffmpeg.org/releases/ 
37 24
38SITES.${MESON_DISTFILE}= ${MASTER_SITE_PYPI:=m/meson/} 25DISTFILES+= ${CDISTFILES}
39 26
40RESTRICTED= Unresolved patent issues 27RESTRICTED= Unresolved patent issues
41NO_BIN_ON_CDROM= ${RESTRICTED} 28NO_BIN_ON_CDROM= ${RESTRICTED}
42NO_BIN_ON_FTP= ${RESTRICTED} 29NO_BIN_ON_FTP= ${RESTRICTED}
43NO_SRC_ON_CDROM= ${RESTRICTED} 30NO_SRC_ON_CDROM= ${RESTRICTED}
44NO_SRC_ON_FTP= ${RESTRICTED} 31NO_SRC_ON_FTP= ${RESTRICTED}
45 32
46WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 33WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
47 34
48HAS_CONFIGURE= yes 35HAS_CONFIGURE= yes
49USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash 36USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash
50USE_TOOLS+= autoconf automake aclocal autoreconf m4 37USE_TOOLS+= autoconf automake aclocal autoreconf m4
51USE_LIBTOOL= yes 38USE_LIBTOOL= yes
52USE_LANGUAGES= c c++ 39USE_LANGUAGES= c c++
53 40
 41PYTHON_FOR_BUILD_ONLY?= yes
 42
54BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl 43BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl
55 44
 45PLIST_SRC+= ${PKGDIR}/PLIST
 46
56CONFIGURE_ARGS+= --prefix=${PREFIX} 47CONFIGURE_ARGS+= --prefix=${PREFIX}
57BUILD_DIRS= build 
58MAKE_FILE= GNUmakefile 48MAKE_FILE= GNUmakefile
 49BUILD_DIRS= build
59BUILD_TARGET= # empty 50BUILD_TARGET= # empty
60BUILD_FLAGS+= BUILDLINK_DIR=${BUILDLINK_DIR} 
61 51
62BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 52BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
63BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm 53BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm
64BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson 54BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson
65#BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 
66 55
67.include "../../mk/compiler.mk" 56.include "../../mk/compiler.mk"
68 57
69.if !empty(PKGSRC_COMPILER:Mclang) 58.if !empty(PKGSRC_COMPILER:Mclang)
70CFLAGS+= -fheinous-gnu-extensions 59CFLAGS+= -fheinous-gnu-extensions
71.endif 60.endif
72 61
73post-extract: 62post-extract:
74 ${MKDIR} ${WRKSRC}/download 63 ${MKDIR} ${WRKSRC}/download
75.for distfile in ${CDISTFILES} 64.for distfile in ${CDISTFILES}
76 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ 65 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
77 ${WRKSRC}/download/ 66 ${WRKSRC}/download/
78.endfor 67.endfor
79 cp ${DISTDIR}/${DIST_SUBDIR}/${MESON_DISTFILE} ${WRKSRC}/download/ 
80 (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE}) 
81 68
82.include "options.mk" 69.include "options.mk"
83 70
84.include "../../audio/lame/buildlink3.mk" 71.include "../../audio/lame/buildlink3.mk"
85.include "../../audio/libopus/buildlink3.mk" 72.include "../../audio/libopus/buildlink3.mk"
86.include "../../audio/libsamplerate/buildlink3.mk" 73.include "../../audio/libsamplerate/buildlink3.mk"
87.include "../../audio/speex/buildlink3.mk" 74.include "../../audio/speex/buildlink3.mk"
 75.include "../../audio/libvorbis/buildlink3.mk"
88.include "../../devel/gettext-lib/buildlink3.mk" 76.include "../../devel/gettext-lib/buildlink3.mk"
89.include "../../devel/gettext-tools/msgfmt-desktop.mk" 77.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 78.include "../../converters/fribidi/buildlink3.mk"
90.include "../../multimedia/gstreamer1/buildlink3.mk" 79.include "../../multimedia/gstreamer1/buildlink3.mk"
 80.include "../../multimedia/x264-devel/buildlink3.mk"
 81.include "../../multimedia/x265/buildlink3.mk"
 82.include "../../multimedia/dav1d/buildlink3.mk"
91.include "../../multimedia/libass/buildlink3.mk" 83.include "../../multimedia/libass/buildlink3.mk"
92.include "../../multimedia/libtheora/buildlink3.mk" 84.include "../../multimedia/libtheora/buildlink3.mk"
93.include "../../multimedia/libvpx/buildlink3.mk" 85.include "../../multimedia/libvpx/buildlink3.mk"
94.include "../../multimedia/x264-devel/buildlink3.mk" 86.include "../../multimedia/libdvdnav/buildlink3.mk"
 87.include "../../multimedia/libdvdread/buildlink3.mk"
 88.include "../../multimedia/libbluray/buildlink3.mk"
 89.include "../../graphics/freetype2/buildlink3.mk"
 90.include "../../fonts/harfbuzz/buildlink3.mk"
 91.include "../../fonts/fontconfig/buildlink3.mk"
95.include "../../textproc/libxml2/buildlink3.mk" 92.include "../../textproc/libxml2/buildlink3.mk"
96.include "../../textproc/jansson/buildlink3.mk" 93.include "../../textproc/jansson/buildlink3.mk"
97.include "../../mk/bsd.pkg.mk" 94.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/handbrake/PLIST.gtk3 (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/PLIST.gtk3 2022/07/03 21:38:48 1.1
+++ pkgsrc/multimedia/handbrake/PLIST.gtk3 2022/08/01 15:00:13 1.2
@@ -1,30 +1,6 @@ @@ -1,30 +1,6 @@
1@comment $NetBSD: PLIST.gtk3,v 1.1 2022/07/03 21:38:48 dbj Exp $ 1@comment $NetBSD: PLIST.gtk3,v 1.2 2022/08/01 15:00:13 ast Exp $
2bin/ghb 2bin/ghb
3share/applications/fr.handbrake.ghb.desktop 3share/applications/fr.handbrake.ghb.desktop
4share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg 4share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
5share/icons/hicolor/scalable/apps/hb-icon.svg 5share/icons/hicolor/scalable/apps/hb-icon.svg
6share/locale/af/LC_MESSAGES/ghb.mo 
7share/locale/cs/LC_MESSAGES/ghb.mo 
8share/locale/da/LC_MESSAGES/ghb.mo 
9share/locale/de/LC_MESSAGES/ghb.mo 
10share/locale/es/LC_MESSAGES/ghb.mo 
11share/locale/eu/LC_MESSAGES/ghb.mo 
12share/locale/fr/LC_MESSAGES/ghb.mo 
13share/locale/hr/LC_MESSAGES/ghb.mo 
14share/locale/it/LC_MESSAGES/ghb.mo 
15share/locale/ja/LC_MESSAGES/ghb.mo 
16share/locale/ko/LC_MESSAGES/ghb.mo 
17share/locale/nl/LC_MESSAGES/ghb.mo 
18share/locale/no/LC_MESSAGES/ghb.mo 
19share/locale/pl/LC_MESSAGES/ghb.mo 
20share/locale/pt/LC_MESSAGES/ghb.mo 
21share/locale/pt_BR/LC_MESSAGES/ghb.mo 
22share/locale/ro/LC_MESSAGES/ghb.mo 
23share/locale/ru/LC_MESSAGES/ghb.mo 
24share/locale/sk/LC_MESSAGES/ghb.mo 
25share/locale/sv/LC_MESSAGES/ghb.mo 
26share/locale/th/LC_MESSAGES/ghb.mo 
27share/locale/tr/LC_MESSAGES/ghb.mo 
28share/locale/uk_UA/LC_MESSAGES/ghb.mo 
29share/locale/zh_CN/LC_MESSAGES/ghb.mo 
30share/metainfo/fr.handbrake.ghb.metainfo.xml 6share/metainfo/fr.handbrake.ghb.metainfo.xml
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/handbrake/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/options.mk 2022/07/03 21:38:48 1.1
+++ pkgsrc/multimedia/handbrake/options.mk 2022/08/01 15:00:13 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.1 2022/07/03 21:38:48 dbj Exp $ 1# $NetBSD: options.mk,v 1.2 2022/08/01 15:00:13 ast Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.handbrake 3PKG_OPTIONS_VAR= PKG_OPTIONS.handbrake
4PKG_SUPPORTED_OPTIONS= gtk3 4PKG_SUPPORTED_OPTIONS= gtk3
5 5
6PKG_SUGGESTED_OPTIONS= gtk3 6PKG_SUGGESTED_OPTIONS= gtk3
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if empty(PKG_OPTIONS:Mgtk3) 10.if !empty(PKG_OPTIONS:Mgtk3)
11CONFIGURE_ARGS+= --disable-gtk 
12.else 
13.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 11.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
14.include "../../x11/gtk3/buildlink3.mk" 12.include "../../x11/gtk3/buildlink3.mk"
15.include "../../sysutils/desktop-file-utils/desktopdb.mk" 13.include "../../sysutils/desktop-file-utils/desktopdb.mk"
16PLIST_SRC+= ${PKGDIR}/PLIST.gtk3 14PLIST_SRC+= ${PKGDIR}/PLIST.gtk3
 15.else
 16CONFIGURE_ARGS+= --disable-gtk
17.endif 17.endif
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/handbrake/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/distinfo 2021/10/26 11:01:05 1.14
+++ pkgsrc/multimedia/handbrake/distinfo 2022/08/01 15:00:13 1.15
@@ -1,28 +1,14 @@ @@ -1,28 +1,14 @@
1$NetBSD: distinfo,v 1.14 2021/10/26 11:01:05 nia Exp $ 1$NetBSD: distinfo,v 1.15 2022/08/01 15:00:13 ast Exp $
2 2
3BLAKE2s (handbrake/HandBrake-1.3.3-source.tar.bz2) = dc19db7821477a376f15ebdce7c1440c772db5ee7f78313c777b11e575fc752d 3BLAKE2s (handbrake/HandBrake-1.5.1-source.tar.bz2) = 47b0351cc3edf04e3cf946b052431f851a006779a5feb63bb5bf8faa41b1fd3b
4SHA512 (handbrake/HandBrake-1.3.3-source.tar.bz2) = a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c 4SHA512 (handbrake/HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
5Size (handbrake/HandBrake-1.3.3-source.tar.bz2) = 16804119 bytes 5Size (handbrake/HandBrake-1.5.1-source.tar.bz2) = 16137974 bytes
6BLAKE2s (handbrake/dav1d-0.5.1.tar.bz2) = 0bd0ab8b77932d5d2ae049ba1821d160e8bf3def37d60ef6d28675f36a866c75 6BLAKE2s (handbrake/ffmpeg-4.4.2.tar.bz2) = 95a59673d4f6d2f8ee4e4e4be713a01af1a216c18358ad998d4dd8dda69c10df
7SHA512 (handbrake/dav1d-0.5.1.tar.bz2) = 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b 7SHA512 (handbrake/ffmpeg-4.4.2.tar.bz2) = b457070abb8b63befc08e6200078df8effe2f02cc46260f6611205a88fbc6228587960b0e345f8ea243714a817132ded9378260420e8cda51b75742ac13cbe44
8Size (handbrake/dav1d-0.5.1.tar.bz2) = 548584 bytes 8Size (handbrake/ffmpeg-4.4.2.tar.bz2) = 11499285 bytes
9BLAKE2s (handbrake/ffmpeg-4.2.3.tar.bz2) = b67914caf0078180eb99105b06402430e27937b172a8c0c70c992889d59114cc 
10SHA512 (handbrake/ffmpeg-4.2.3.tar.bz2) = ca9b0c8df41783689d80e9d0a43acef8b457fb4003ff4173a7b0898cefabc76efc24257e8990ab2559a3e409c9a1a66f90343a421579a85fe7398b1a898b60b5 
11Size (handbrake/ffmpeg-4.2.3.tar.bz2) = 10957405 bytes 
12BLAKE2s (handbrake/libbluray-1.1.2.tar.bz2) = ce9ece81266f4c4b84ea9dd36575927a07b98254bd07937e2369435f400d3a62 
13SHA512 (handbrake/libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 
14Size (handbrake/libbluray-1.1.2.tar.bz2) = 745779 bytes 
15BLAKE2s (handbrake/libdvdnav-6.0.1.tar.bz2) = 42d6ddcefbebf85fb1afae812c06b8e3d3eca11baf694da8f44b592493cb360f 
16SHA512 (handbrake/libdvdnav-6.0.1.tar.bz2) = 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f 
17Size (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491 bytes 
18BLAKE2s (handbrake/libdvdread-6.0.2.tar.bz2) = b6a9659fb5b236b6323ca03b64cef8331c476f48afa5df935892b3de3bf8b070 
19SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c 
20Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes 
21BLAKE2s (handbrake/meson-0.55.0.tar.gz) = 1891054c5b88427f4383c5ba5e35baba1ed09e6e027e091bab988d16ebd88fa8 9BLAKE2s (handbrake/meson-0.55.0.tar.gz) = 1891054c5b88427f4383c5ba5e35baba1ed09e6e027e091bab988d16ebd88fa8
22SHA512 (handbrake/meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2 10SHA512 (handbrake/meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
23Size (handbrake/meson-0.55.0.tar.gz) = 1742882 bytes 11Size (handbrake/meson-0.55.0.tar.gz) = 1742882 bytes
24BLAKE2s (handbrake/x265_3.2.1.tar.gz) = ee673d6174b785fb6ecc45932967862c3584512dab1cc9906a2691e5ef0e27ab 12SHA1 (patch-configure) = 5f0452587c82ac9a419ac5fc06f07d35d174bc24
25SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568 13SHA1 (patch-make-include-main.defs) = 176faef9b587a99b6218e8d34781128ca8a5438b
26Size (handbrake/x265_3.2.1.tar.gz) = 1426255 bytes 14SHA1 (patch-make-python_launcher) = db0e01e9a5063b0d083f56840079e74909c729c6
27SHA1 (patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch) = 8538213d147d2bb9bec455408147bd7bd40df8c2 
28SHA1 (patch-libhb_fifo.c) = 46c5ec1f2c665da297830c326e703160e3e911d2 
File Added: pkgsrc/multimedia/handbrake/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2022/08/01 15:00:13 ast Exp $

Use correct python


--- configure.orig	2022-07-29 12:02:10.891326507 +0200
+++ configure	2022-07-29 12:02:39.737161708 +0200
@@ -15,7 +15,7 @@
 
 if ( inpath bash ); then
     pp=""
-    for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
+    for p in python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
     do
         if ( inpath $p ); then
             pp="$p"
File Added: pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs
$NetBSD: patch-make-include-main.defs,v 1.1 2022/08/01 15:00:13 ast Exp $

Use comon pkgsrc libraries


--- make/include/main.defs.orig	2022-01-10 20:11:37.000000000 +0100
+++ make/include/main.defs	2022-08-01 12:41:38.928984695 +0200
@@ -13,28 +13,32 @@
 endif
 endif
 
-ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
-    MODULES += contrib/freetype
-    MODULES += contrib/fribidi
-    MODULES += contrib/harfbuzz
-    MODULES += contrib/libxml2
-    MODULES += contrib/libass
-    MODULES += contrib/libogg
-    MODULES += contrib/libvorbis
-    MODULES += contrib/libopus
-    MODULES += contrib/libspeex
-    MODULES += contrib/libtheora
-    MODULES += contrib/lame
-    MODULES += contrib/x264
-    MODULES += contrib/jansson
-    MODULES += contrib/libvpx
-    MODULES += contrib/libjpeg-turbo
-endif
-
-ifeq (1,$(FEATURE.flatpak))
-    MODULES += contrib/jansson
-    MODULES += contrib/x264
-endif
+MODULES += contrib/zimg
+MODULES += contrib/ffmpeg
+MODULES += contrib/libjpeg-turbo
+
+## ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
+##     MODULES += contrib/freetype
+##     MODULES += contrib/fribidi
+##     MODULES += contrib/harfbuzz
+##     MODULES += contrib/libxml2
+##     MODULES += contrib/libass
+##     MODULES += contrib/libogg
+##     MODULES += contrib/libvorbis
+##     MODULES += contrib/libopus
+##     MODULES += contrib/libspeex
+##     MODULES += contrib/libtheora
+##     MODULES += contrib/lame
+##     MODULES += contrib/x264
+##     MODULES += contrib/jansson
+##     MODULES += contrib/libvpx
+##     MODULES += contrib/libjpeg-turbo
+## endif
+## 
+## ifeq (1,$(FEATURE.flatpak))
+##     MODULES += contrib/jansson
+##     MODULES += contrib/x264
+## endif
 
 ifeq (1,$(FEATURE.fdk_aac))
     MODULES += contrib/fdk-aac
@@ -47,13 +51,6 @@
     MODULES += contrib/x265_12bit
 endif
 
-MODULES += contrib/libdav1d
-MODULES += contrib/zimg
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
 ifeq (1,$(FEATURE.qsv))
 ifeq (,$(filter $(HOST.system),freebsd))
     MODULES += contrib/libvpl
File Added: pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher
$NetBSD: patch-make-python_launcher,v 1.1 2022/08/01 15:00:13 ast Exp $

Launch correct correct python


--- make/python_launcher.orig	2022-08-01 14:38:04.652928969 +0200
+++ make/python_launcher	2022-08-01 14:38:24.938211784 +0200
@@ -13,7 +13,7 @@
     return 1
 }
 
-for p in python3 python2 python python3.7 python3.6 python2.7
+for p in python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
 do
     if ( inpath $p ); then
         exec $p "$@"
File Deleted: pkgsrc/multimedia/handbrake/patches/Attic/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch
File Deleted: pkgsrc/multimedia/handbrake/patches/Attic/patch-libhb_fifo.c