Received: by mail.netbsd.org (Postfix, from userid 605) id 45B0584D95; Mon, 3 Oct 2022 10:46:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 75AA884D5F for ; Mon, 3 Oct 2022 10:46:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uAp36AAAptik for ; Mon, 3 Oct 2022 10:46:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 41AF484D25 for ; Mon, 3 Oct 2022 10:46:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E0584FA90; Mon, 3 Oct 2022 10:46:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1664793965224330" MIME-Version: 1.0 Date: Mon, 3 Oct 2022 10:46:05 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia/handbrake To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20221003104605.E0584FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1664793965224330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Oct 3 10:46:05 UTC 2022 Modified Files: pkgsrc/multimedia/handbrake: Makefile PLIST PLIST.gtk3 distinfo options.mk pkgsrc/multimedia/handbrake/patches: patch-make-include-main.defs Added Files: pkgsrc/multimedia/handbrake/patches: patch-test_module.defs Log Message: handbrake: switch to stable x264; fix build on Darwin; fix PLIST when gtk3 option is disabled; pkglint fixes; bump revision To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/multimedia/handbrake/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/handbrake/PLIST cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/handbrake/PLIST.gtk3 \ pkgsrc/multimedia/handbrake/options.mk cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/handbrake/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/handbrake/patches/patch-test_module.defs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1664793965224330 Content-Disposition: inline Content-Length: 11522 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/handbrake/Makefile diff -u pkgsrc/multimedia/handbrake/Makefile:1.85 pkgsrc/multimedia/handbrake/Makefile:1.86 --- pkgsrc/multimedia/handbrake/Makefile:1.85 Tue Sep 27 20:58:25 2022 +++ pkgsrc/multimedia/handbrake/Makefile Mon Oct 3 10:46:05 2022 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.85 2022/09/27 20:58:25 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2022/10/03 10:46:05 adam Exp $ DISTNAME= HandBrake-1.5.1-source PKGNAME= ${DISTNAME:tl:S/-source//} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/} EXTRACT_SUFX= .tar.bz2 GITHUB_PROJECT= HandBrake -GITHUB_RELEASE= 1.5.1 +GITHUB_RELEASE= ${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://handbrake.fr/ @@ -39,6 +39,7 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl PLIST_SRC+= ${PKGDIR}/PLIST CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --disable-xcode CONFIGURE_ARGS+= --enable-nls MAKE_FILE= GNUmakefile @@ -49,7 +50,7 @@ BUILD_DEPENDS+= cmake-[0-9]*:../../deve BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CFLAGS+= -fheinous-gnu-extensions @@ -64,7 +65,7 @@ post-build: set -e; cd ${WRKSRC}; \ for po in ${GHB_LOCALES}; do \ mo="../.destdir/usr/pkg/share/locale/$${po%%.po}/LC_MESSAGES" ; \ - ${MKDIR} $${mo} ; ${ECHO} -n "msgfmt $${po}: " ; \ + ${MKDIR} $${mo} ; ${ECHO_N} "msgfmt $${po}: " ; \ ${SED} -e '/^"Project-Id-Version:/ s/PACKAGE VERSION/ghb 0.1/' \ gtk/po/$${po}.po | ${TOOLS_DIR}/bin/msgfmt -v -c - \ -o $${mo}/ghb.mo ; \ @@ -91,17 +92,13 @@ post-build: .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" .include "../../multimedia/libvpx/buildlink3.mk" -.include "../../multimedia/x264-devel/buildlink3.mk" +.include "../../multimedia/x264/buildlink3.mk" .include "../../multimedia/x265/buildlink3.mk" .include "../../textproc/jansson/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" - # Note that libjpeg-turbo is required by the Handbrake library libhb: when gtk3 is # enabled (as per default) it is built and linked statically in the build phase as # not to conflict with the "default" jpeg required by gtk3 -JPEG_DEFAULT= jpeg +#JPEG_DEFAULT= jpeg .include "../../mk/jpeg.buildlink3.mk" - -.include "../../mk/compiler.mk" - .include "../../mk/bsd.pkg.mk" Index: pkgsrc/multimedia/handbrake/PLIST diff -u pkgsrc/multimedia/handbrake/PLIST:1.7 pkgsrc/multimedia/handbrake/PLIST:1.8 --- pkgsrc/multimedia/handbrake/PLIST:1.7 Mon Aug 22 13:56:41 2022 +++ pkgsrc/multimedia/handbrake/PLIST Mon Oct 3 10:46:05 2022 @@ -1,31 +1,2 @@ -@comment $NetBSD: PLIST,v 1.7 2022/08/22 13:56:41 ast Exp $ +@comment $NetBSD: PLIST,v 1.8 2022/10/03 10:46:05 adam Exp $ bin/HandBrakeCLI -share/locale/af/LC_MESSAGES/ghb.mo -share/locale/co/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/he/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/si/LC_MESSAGES/ghb.mo -share/locale/sk/LC_MESSAGES/ghb.mo -share/locale/sl_SI/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/locale/zh_TW/LC_MESSAGES/ghb.mo Index: pkgsrc/multimedia/handbrake/PLIST.gtk3 diff -u pkgsrc/multimedia/handbrake/PLIST.gtk3:1.2 pkgsrc/multimedia/handbrake/PLIST.gtk3:1.3 --- pkgsrc/multimedia/handbrake/PLIST.gtk3:1.2 Mon Aug 1 15:00:13 2022 +++ pkgsrc/multimedia/handbrake/PLIST.gtk3 Mon Oct 3 10:46:05 2022 @@ -1,6 +1,35 @@ -@comment $NetBSD: PLIST.gtk3,v 1.2 2022/08/01 15:00:13 ast Exp $ +@comment $NetBSD: PLIST.gtk3,v 1.3 2022/10/03 10:46:05 adam 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/co/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/he/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/si/LC_MESSAGES/ghb.mo +share/locale/sk/LC_MESSAGES/ghb.mo +share/locale/sl_SI/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/locale/zh_TW/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.2 pkgsrc/multimedia/handbrake/options.mk:1.3 --- pkgsrc/multimedia/handbrake/options.mk:1.2 Mon Aug 1 15:00:13 2022 +++ pkgsrc/multimedia/handbrake/options.mk Mon Oct 3 10:46:05 2022 @@ -1,9 +1,13 @@ -# $NetBSD: options.mk,v 1.2 2022/08/01 15:00:13 ast Exp $ +# $NetBSD: options.mk,v 1.3 2022/10/03 10:46:05 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.handbrake PKG_SUPPORTED_OPTIONS= gtk3 +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} != "Darwin" PKG_SUGGESTED_OPTIONS= gtk3 +.endif .include "../../mk/bsd.options.mk" Index: pkgsrc/multimedia/handbrake/distinfo diff -u pkgsrc/multimedia/handbrake/distinfo:1.16 pkgsrc/multimedia/handbrake/distinfo:1.17 --- pkgsrc/multimedia/handbrake/distinfo:1.16 Mon Aug 22 13:56:41 2022 +++ pkgsrc/multimedia/handbrake/distinfo Mon Oct 3 10:46:05 2022 @@ -1,14 +1,9 @@ -$NetBSD: distinfo,v 1.16 2022/08/22 13:56:41 ast Exp $ +$NetBSD: distinfo,v 1.17 2022/10/03 10:46:05 adam 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/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 SHA1 (patch-configure) = 5f0452587c82ac9a419ac5fc06f07d35d174bc24 -SHA1 (patch-make-include-main.defs) = b15457b804a63ece613e71c08526029170e20a1e +SHA1 (patch-make-include-main.defs) = b1bab1deecf7a34a40288f6cc3fca003afbbce35 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.2 pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.3 --- pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs:1.2 Mon Aug 22 13:56:41 2022 +++ pkgsrc/multimedia/handbrake/patches/patch-make-include-main.defs Mon Oct 3 10:46:05 2022 @@ -1,11 +1,10 @@ -$NetBSD: patch-make-include-main.defs,v 1.2 2022/08/22 13:56:41 ast Exp $ +$NetBSD: patch-make-include-main.defs,v 1.3 2022/10/03 10:46:05 adam Exp $ Use comon pkgsrc libraries - ---- make/include/main.defs.orig 2022-01-10 20:11:37.000000000 +0100 -+++ make/include/main.defs 2022-08-22 13:43:55.300892530 +0200 -@@ -13,46 +13,43 @@ +--- 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) endif endif @@ -31,33 +30,7 @@ Use comon pkgsrc libraries - 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 endif @@ -75,12 +48,7 @@ Use comon pkgsrc libraries -MODULES += contrib/libdvdread -MODULES += contrib/libdvdnav -MODULES += contrib/libbluray -+## ifeq (1,$(FEATURE.x265)) -+## MODULES += contrib/x265 -+## MODULES += contrib/x265_8bit -+## MODULES += contrib/x265_10bit -+## MODULES += contrib/x265_12bit -+## endif - +- ifeq (1,$(FEATURE.qsv)) ifeq (,$(filter $(HOST.system),freebsd)) + MODULES += contrib/libvpl Added files: Index: pkgsrc/multimedia/handbrake/patches/patch-test_module.defs diff -u /dev/null pkgsrc/multimedia/handbrake/patches/patch-test_module.defs:1.1 --- /dev/null Mon Oct 3 10:46:05 2022 +++ pkgsrc/multimedia/handbrake/patches/patch-test_module.defs Mon Oct 3 10:46:05 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-test_module.defs,v 1.1 2022/10/03 10:46:05 adam Exp $ + +Link against x265. + +--- test/module.defs.orig 2022-10-03 09:45:30.000000000 +0000 ++++ test/module.defs +@@ -16,7 +16,7 @@ TEST.libs = $(LIBHB.a) + TEST.GCC.l = \ + ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \ + dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \ +- x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \ ++ x264 x265 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \ + turbojpeg zimg + + ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) --_----------=_1664793965224330--