pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/multimedia/handbrake



Module Name:    pkgsrc
Committed By:   ast
Date:           Mon Aug  1 15:00:13 UTC 2022

Modified Files:
        pkgsrc/multimedia/handbrake: Makefile PLIST.gtk3 distinfo options.mk
Added Files:
        pkgsrc/multimedia/handbrake/patches: patch-configure
            patch-make-include-main.defs patch-make-python_launcher
Removed Files:
        pkgsrc/multimedia/handbrake/patches:
            patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch
            patch-libhb_fifo.c

Log Message:
multimedia/handbrake: update from 1.3.3 to 1.5.1; fix build when python>3.8


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/handbrake/PLIST.gtk3 \
    pkgsrc/multimedia/handbrake/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/handbrake/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/handbrake/patches/patch-configure \
    pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs \
    pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/multimedia/handbrake/patches/patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch \
    pkgsrc/multimedia/handbrake/patches/patch-libhb_fifo.c

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.78 pkgsrc/multimedia/handbrake/Makefile:1.79
--- pkgsrc/multimedia/handbrake/Makefile:1.78   Sun Jul  3 21:38:48 2022
+++ pkgsrc/multimedia/handbrake/Makefile        Mon Aug  1 15:00:13 2022
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.78 2022/07/03 21:38:48 dbj Exp $
+# $NetBSD: Makefile,v 1.79 2022/08/01 15:00:13 ast Exp $
 #
 
-DISTNAME=      HandBrake-1.3.3-source
+DISTNAME=      HandBrake-1.5.1-source
 PKGNAME=       ${DISTNAME:tl:S/-source//}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=HandBrake/}
 EXTRACT_SUFX=  .tar.bz2
 GITHUB_PROJECT=        HandBrake
-GITHUB_RELEASE=        1.3.3
+GITHUB_RELEASE=        1.5.1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://handbrake.fr/
@@ -18,24 +18,11 @@ LICENSE=    gnu-gpl-v2
 DIST_SUBDIR=   handbrake
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
-CDISTFILES=    ffmpeg-4.2.3.tar.bz2 \
-               libbluray-1.1.2.tar.bz2 \
-               libdvdnav-6.0.1.tar.bz2 \
-               libdvdread-6.0.2.tar.bz2 \
-               x265_3.2.1.tar.gz \
-               dav1d-0.5.1.tar.bz2
 
-MESON_DISTFILE=        meson-0.55.0.tar.gz
-DISTFILES+=    ${CDISTFILES}
-DISTFILES+=    ${MESON_DISTFILE}
-
-.for f in ${CDISTFILES}
-SITES.${f}=    https://download.handbrake.fr/handbrake/contrib/
-.endfor
-# handbrake.fr does not have ffmpeg-4.2.3.tar.bz2 as of 2021-01-10.
-SITES.ffmpeg-4.2.3.tar.bz2=    http://www.ffmpeg.org/releases/
+CDISTFILES=    ffmpeg-4.4.2.tar.bz2
+SITES.ffmpeg-4.4.2.tar.bz2=    http://www.ffmpeg.org/releases/
 
-SITES.${MESON_DISTFILE}=       ${MASTER_SITE_PYPI:=m/meson/}
+DISTFILES+=    ${CDISTFILES}
 
 RESTRICTED=            Unresolved patent issues
 NO_BIN_ON_CDROM=       ${RESTRICTED}
@@ -51,18 +38,20 @@ USE_TOOLS+= autoconf automake aclocal au
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
+PYTHON_FOR_BUILD_ONLY?=        yes
+
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-ldl
 
+PLIST_SRC+=    ${PKGDIR}/PLIST
+
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
-BUILD_DIRS=            build
 MAKE_FILE=             GNUmakefile
+BUILD_DIRS=            build
 BUILD_TARGET=          # empty
-BUILD_FLAGS+=          BUILDLINK_DIR=${BUILDLINK_DIR}
 
 BUILD_DEPENDS+=                cmake-[0-9]*:../../devel/cmake
 BUILD_DEPENDS+=                nasm>=2.05.01:../../devel/nasm
 BUILD_DEPENDS+=                meson-[0-9]*:../../devel/meson
-#BUILD_DEPENDS+=       gettext-m4-[0-9]*:../../devel/gettext-m4
 
 .include "../../mk/compiler.mk"
 
@@ -76,8 +65,6 @@ post-extract:
        cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
                ${WRKSRC}/download/
 .endfor
-       cp ${DISTDIR}/${DIST_SUBDIR}/${MESON_DISTFILE} ${WRKSRC}/download/
-       (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE})
 
 .include "options.mk"
 
@@ -85,13 +72,23 @@ post-extract:
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../converters/fribidi/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.include "../../multimedia/x265/buildlink3.mk"
+.include "../../multimedia/dav1d/buildlink3.mk"
 .include "../../multimedia/libass/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/libvpx/buildlink3.mk"
-.include "../../multimedia/x264-devel/buildlink3.mk"
+.include "../../multimedia/libdvdnav/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libbluray/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/handbrake/PLIST.gtk3
diff -u pkgsrc/multimedia/handbrake/PLIST.gtk3:1.1 pkgsrc/multimedia/handbrake/PLIST.gtk3:1.2
--- pkgsrc/multimedia/handbrake/PLIST.gtk3:1.1  Sun Jul  3 21:38:48 2022
+++ pkgsrc/multimedia/handbrake/PLIST.gtk3      Mon Aug  1 15:00:13 2022
@@ -1,30 +1,6 @@
-@comment $NetBSD: PLIST.gtk3,v 1.1 2022/07/03 21:38:48 dbj Exp $
+@comment $NetBSD: PLIST.gtk3,v 1.2 2022/08/01 15:00:13 ast Exp $
 bin/ghb
 share/applications/fr.handbrake.ghb.desktop
 share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
 share/icons/hicolor/scalable/apps/hb-icon.svg
-share/locale/af/LC_MESSAGES/ghb.mo
-share/locale/cs/LC_MESSAGES/ghb.mo
-share/locale/da/LC_MESSAGES/ghb.mo
-share/locale/de/LC_MESSAGES/ghb.mo
-share/locale/es/LC_MESSAGES/ghb.mo
-share/locale/eu/LC_MESSAGES/ghb.mo
-share/locale/fr/LC_MESSAGES/ghb.mo
-share/locale/hr/LC_MESSAGES/ghb.mo
-share/locale/it/LC_MESSAGES/ghb.mo
-share/locale/ja/LC_MESSAGES/ghb.mo
-share/locale/ko/LC_MESSAGES/ghb.mo
-share/locale/nl/LC_MESSAGES/ghb.mo
-share/locale/no/LC_MESSAGES/ghb.mo
-share/locale/pl/LC_MESSAGES/ghb.mo
-share/locale/pt/LC_MESSAGES/ghb.mo
-share/locale/pt_BR/LC_MESSAGES/ghb.mo
-share/locale/ro/LC_MESSAGES/ghb.mo
-share/locale/ru/LC_MESSAGES/ghb.mo
-share/locale/sk/LC_MESSAGES/ghb.mo
-share/locale/sv/LC_MESSAGES/ghb.mo
-share/locale/th/LC_MESSAGES/ghb.mo
-share/locale/tr/LC_MESSAGES/ghb.mo
-share/locale/uk_UA/LC_MESSAGES/ghb.mo
-share/locale/zh_CN/LC_MESSAGES/ghb.mo
 share/metainfo/fr.handbrake.ghb.metainfo.xml
Index: pkgsrc/multimedia/handbrake/options.mk
diff -u pkgsrc/multimedia/handbrake/options.mk:1.1 pkgsrc/multimedia/handbrake/options.mk:1.2
--- pkgsrc/multimedia/handbrake/options.mk:1.1  Sun Jul  3 21:38:48 2022
+++ pkgsrc/multimedia/handbrake/options.mk      Mon Aug  1 15:00:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/07/03 21:38:48 dbj Exp $
+# $NetBSD: options.mk,v 1.2 2022/08/01 15:00:13 ast Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.handbrake
 PKG_SUPPORTED_OPTIONS= gtk3
@@ -7,11 +7,11 @@ PKG_SUGGESTED_OPTIONS=        gtk3
 
 .include "../../mk/bsd.options.mk"
 
-.if empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=       --disable-gtk
-.else
+.if !empty(PKG_OPTIONS:Mgtk3)
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 PLIST_SRC+=    ${PKGDIR}/PLIST.gtk3
+.else
+CONFIGURE_ARGS+=       --disable-gtk
 .endif

Index: pkgsrc/multimedia/handbrake/distinfo
diff -u pkgsrc/multimedia/handbrake/distinfo:1.14 pkgsrc/multimedia/handbrake/distinfo:1.15
--- pkgsrc/multimedia/handbrake/distinfo:1.14   Tue Oct 26 11:01:05 2021
+++ pkgsrc/multimedia/handbrake/distinfo        Mon Aug  1 15:00:13 2022
@@ -1,28 +1,14 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:01:05 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/08/01 15:00:13 ast Exp $
 
-BLAKE2s (handbrake/HandBrake-1.3.3-source.tar.bz2) = dc19db7821477a376f15ebdce7c1440c772db5ee7f78313c777b11e575fc752d
-SHA512 (handbrake/HandBrake-1.3.3-source.tar.bz2) = a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
-Size (handbrake/HandBrake-1.3.3-source.tar.bz2) = 16804119 bytes
-BLAKE2s (handbrake/dav1d-0.5.1.tar.bz2) = 0bd0ab8b77932d5d2ae049ba1821d160e8bf3def37d60ef6d28675f36a866c75
-SHA512 (handbrake/dav1d-0.5.1.tar.bz2) = 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
-Size (handbrake/dav1d-0.5.1.tar.bz2) = 548584 bytes
-BLAKE2s (handbrake/ffmpeg-4.2.3.tar.bz2) = b67914caf0078180eb99105b06402430e27937b172a8c0c70c992889d59114cc
-SHA512 (handbrake/ffmpeg-4.2.3.tar.bz2) = ca9b0c8df41783689d80e9d0a43acef8b457fb4003ff4173a7b0898cefabc76efc24257e8990ab2559a3e409c9a1a66f90343a421579a85fe7398b1a898b60b5
-Size (handbrake/ffmpeg-4.2.3.tar.bz2) = 10957405 bytes
-BLAKE2s (handbrake/libbluray-1.1.2.tar.bz2) = ce9ece81266f4c4b84ea9dd36575927a07b98254bd07937e2369435f400d3a62
-SHA512 (handbrake/libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
-Size (handbrake/libbluray-1.1.2.tar.bz2) = 745779 bytes
-BLAKE2s (handbrake/libdvdnav-6.0.1.tar.bz2) = 42d6ddcefbebf85fb1afae812c06b8e3d3eca11baf694da8f44b592493cb360f
-SHA512 (handbrake/libdvdnav-6.0.1.tar.bz2) = 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
-Size (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491 bytes
-BLAKE2s (handbrake/libdvdread-6.0.2.tar.bz2) = b6a9659fb5b236b6323ca03b64cef8331c476f48afa5df935892b3de3bf8b070
-SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
-Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes
+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/ffmpeg-4.4.2.tar.bz2) = 95a59673d4f6d2f8ee4e4e4be713a01af1a216c18358ad998d4dd8dda69c10df
+SHA512 (handbrake/ffmpeg-4.4.2.tar.bz2) = b457070abb8b63befc08e6200078df8effe2f02cc46260f6611205a88fbc6228587960b0e345f8ea243714a817132ded9378260420e8cda51b75742ac13cbe44
+Size (handbrake/ffmpeg-4.4.2.tar.bz2) = 11499285 bytes
 BLAKE2s (handbrake/meson-0.55.0.tar.gz) = 1891054c5b88427f4383c5ba5e35baba1ed09e6e027e091bab988d16ebd88fa8
 SHA512 (handbrake/meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
 Size (handbrake/meson-0.55.0.tar.gz) = 1742882 bytes
-BLAKE2s (handbrake/x265_3.2.1.tar.gz) = ee673d6174b785fb6ecc45932967862c3584512dab1cc9906a2691e5ef0e27ab
-SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
-Size (handbrake/x265_3.2.1.tar.gz) = 1426255 bytes
-SHA1 (patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch) = 8538213d147d2bb9bec455408147bd7bd40df8c2
-SHA1 (patch-libhb_fifo.c) = 46c5ec1f2c665da297830c326e703160e3e911d2
+SHA1 (patch-configure) = 5f0452587c82ac9a419ac5fc06f07d35d174bc24
+SHA1 (patch-make-include-main.defs) = 176faef9b587a99b6218e8d34781128ca8a5438b
+SHA1 (patch-make-python_launcher) = db0e01e9a5063b0d083f56840079e74909c729c6

Added files:

Index: pkgsrc/multimedia/handbrake/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/handbrake/patches/patch-configure:1.1
--- /dev/null   Mon Aug  1 15:00:13 2022
+++ pkgsrc/multimedia/handbrake/patches/patch-configure Mon Aug  1 15:00:13 2022
@@ -0,0 +1,16 @@
+$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"
Index: pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs
diff -u /dev/null pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.1
--- /dev/null   Mon Aug  1 15:00:13 2022
+++ pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs    Mon Aug  1 15:00:13 2022
@@ -0,0 +1,76 @@
+$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
Index: pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher
diff -u /dev/null pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher:1.1
--- /dev/null   Mon Aug  1 15:00:13 2022
+++ pkgsrc/multimedia/handbrake/patches/patch-make-python_launcher      Mon Aug  1 15:00:13 2022
@@ -0,0 +1,16 @@
+$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 "$@"



Home | Main Index | Thread Index | Old Index