diff options
author | ast <ast@pkgsrc.org> | 2022-08-22 13:56:41 +0000 |
---|---|---|
committer | ast <ast@pkgsrc.org> | 2022-08-22 13:56:41 +0000 |
commit | cbe782aa42bf1765186100eae25d4bbcbf8ac67e (patch) | |
tree | df1615c71254b21f1a8febafbe1e32e67da01492 /multimedia | |
parent | 77a75f41b42756d39ede4e7eabd24568b5c46548 (diff) | |
download | pkgsrc-cbe782aa42bf1765186100eae25d4bbcbf8ac67e.tar.gz |
multimedia/handbrake: avoid download/build of other packages already in pkgsrc
(with the exception of libjpeg-turbo as gtk wants jpeg which cannot coexist).
Retrofit locales that we silently dropped as we updated from 1.3 to 1.5
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/handbrake/Makefile | 33 | ||||
-rw-r--r-- | multimedia/handbrake/PLIST | 31 | ||||
-rw-r--r-- | multimedia/handbrake/distinfo | 4 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-make-include-main.defs | 28 |
4 files changed, 71 insertions, 25 deletions
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 658ab67bf84..54f98e37ee7 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.81 2022/08/11 05:09:06 gutteridge Exp $ +# $NetBSD: Makefile,v 1.82 2022/08/22 13:56:41 ast Exp $ DISTNAME= HandBrake-1.5.1-source PKGNAME= ${DISTNAME:tl:S/-source//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/} EXTRACT_SUFX= .tar.bz2 @@ -18,11 +18,6 @@ DIST_SUBDIR= handbrake EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -CDISTFILES= ffmpeg-4.4.2.tar.bz2 -SITES.ffmpeg-4.4.2.tar.bz2= http://www.ffmpeg.org/releases/ - -DISTFILES+= ${CDISTFILES} - RESTRICTED= Unresolved patent issues NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} @@ -44,6 +39,8 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl PLIST_SRC+= ${PKGDIR}/PLIST CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --enable-nls + MAKE_FILE= GNUmakefile BUILD_DIRS= build BUILD_TARGET= # empty @@ -58,15 +55,23 @@ BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson CFLAGS+= -fheinous-gnu-extensions .endif -post-extract: - ${MKDIR} ${WRKSRC}/download -.for distfile in ${CDISTFILES} - cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ - ${WRKSRC}/download/ -.endfor +# libjpeg-turbo is also required to build Handbrake: buuilt and linked statically as not to conflict with jpeg for gtk +JPEG_DEFAULT= jpeg +.include "../../mk/jpeg.buildlink3.mk" .include "options.mk" +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 + +post-build: + set -e; cd ${WRKSRC}; \ + for po in ${GHB_LOCALES}; do \ + mo="../.destdir/usr/pkg/share/locale/$${po%%.po}/LC_MESSAGES"; \ + ${MKDIR} $${mo}; \ + ${TOOLS_DIR}/bin/msgfmt -v -c -o $${mo}/ghb.mo gtk/po/$${po}; \ + done + .include "../../audio/lame/buildlink3.mk" .include "../../audio/libopus/buildlink3.mk" .include "../../audio/libsamplerate/buildlink3.mk" @@ -85,6 +90,8 @@ post-extract: .include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libbluray/buildlink3.mk" +.include "../../multimedia/ffmpeg4/buildlink3.mk" +.include "../../graphics/zimg/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/harfbuzz/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/multimedia/handbrake/PLIST b/multimedia/handbrake/PLIST index 3ce068f6c41..62814502722 100644 --- a/multimedia/handbrake/PLIST +++ b/multimedia/handbrake/PLIST @@ -1,2 +1,31 @@ -@comment $NetBSD: PLIST,v 1.6 2022/07/03 21:38:48 dbj Exp $ +@comment $NetBSD: PLIST,v 1.7 2022/08/22 13:56:41 ast 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 diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo index 3d4b2807cfe..9cbdc21d295 100644 --- a/multimedia/handbrake/distinfo +++ b/multimedia/handbrake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2022/08/01 15:00:13 ast Exp $ +$NetBSD: distinfo,v 1.16 2022/08/22 13:56:41 ast Exp $ BLAKE2s (handbrake/HandBrake-1.5.1-source.tar.bz2) = 47b0351cc3edf04e3cf946b052431f851a006779a5feb63bb5bf8faa41b1fd3b SHA512 (handbrake/HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568 @@ -10,5 +10,5 @@ BLAKE2s (handbrake/meson-0.55.0.tar.gz) = 1891054c5b88427f4383c5ba5e35baba1ed09e 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) = 176faef9b587a99b6218e8d34781128ca8a5438b +SHA1 (patch-make-include-main.defs) = b15457b804a63ece613e71c08526029170e20a1e SHA1 (patch-make-python_launcher) = db0e01e9a5063b0d083f56840079e74909c729c6 diff --git a/multimedia/handbrake/patches/patch-make-include-main.defs b/multimedia/handbrake/patches/patch-make-include-main.defs index 3c9bc825826..8210529d3fe 100644 --- a/multimedia/handbrake/patches/patch-make-include-main.defs +++ b/multimedia/handbrake/patches/patch-make-include-main.defs @@ -1,11 +1,11 @@ -$NetBSD: patch-make-include-main.defs,v 1.1 2022/08/01 15:00:13 ast Exp $ +$NetBSD: patch-make-include-main.defs,v 1.2 2022/08/22 13:56:41 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 @@ ++++ make/include/main.defs 2022-08-22 13:43:55.300892530 +0200 +@@ -13,46 +13,43 @@ endif endif @@ -31,8 +31,8 @@ Use comon pkgsrc libraries - MODULES += contrib/jansson - MODULES += contrib/x264 -endif -+MODULES += contrib/zimg -+MODULES += contrib/ffmpeg ++## MODULES += contrib/zimg ++## MODULES += contrib/ffmpeg +MODULES += contrib/libjpeg-turbo + +## ifneq (,$(filter $(HOST.system),darwin cygwin mingw)) @@ -60,17 +60,27 @@ Use comon pkgsrc libraries ifeq (1,$(FEATURE.fdk_aac)) MODULES += contrib/fdk-aac -@@ -47,13 +51,6 @@ - MODULES += contrib/x265_12bit 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 -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 |