CVS commit: pkgsrc/multimedia/handbrake

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Jun 21 09:00:48 UTC 2020

Modified Files:
        pkgsrc/multimedia/handbrake: Makefile distinfo

Log Message:
(multimedia/handbrake) Adhoc fix build. Could be 'tar' used in Makefile ?


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/handbrake/distinfo

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.60 pkgsrc/multimedia/handbrake/Makefile:1.61
--- pkgsrc/multimedia/handbrake/Makefile:1.60   Tue Jun  2 08:24:26 2020
+++ pkgsrc/multimedia/handbrake/Makefile        Sun Jun 21 09:00:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/06/02 08:24:26 adam Exp $
+# $NetBSD: Makefile,v 1.61 2020/06/21 09:00:48 mef Exp $
 #
 
 DISTNAME=      HandBrake-1.3.1-source
@@ -22,12 +22,17 @@ CDISTFILES= ffmpeg-4.2.2.tar.bz2 \
                libdvdread-6.0.2.tar.bz2 \
                x265_3.2.1.tar.gz \
                dav1d-0.5.1.tar.bz2
+
+MESON_DISTFILE=        meson-0.54.2.tar.gz
 DISTFILES+=    ${CDISTFILES}
+DISTFILES+=    ${MESON_DISTFILE}
 
 .for f in ${CDISTFILES}
 SITES.${f}=    https://download.handbrake.fr/contrib/
 .endfor
 
+SITES.${MESON_DISTFILE}=       ${MASTER_SITE_PYPI:=m/meson/}
+
 RESTRICTED=            Unresolved patent issues
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
@@ -42,7 +47,7 @@ USE_TOOLS+=   autoconf automake aclocal au
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
-TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+=                 gettext-tools-[0-9]*:../../devel/gettext-tools
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 USE_BUILTIN.gettext=           no
 
@@ -70,6 +75,8 @@ post-extract:
        cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
                ${WRKSRC}/download/
 .endfor
+       cp ${DISTDIR}/${MESON_DISTFILE} ${WRKSRC}/download/
+       (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE})
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"

Index: pkgsrc/multimedia/handbrake/distinfo
diff -u pkgsrc/multimedia/handbrake/distinfo:1.9 pkgsrc/multimedia/handbrake/distinfo:1.10
--- pkgsrc/multimedia/handbrake/distinfo:1.9    Thu Feb 13 23:12:37 2020
+++ pkgsrc/multimedia/handbrake/distinfo        Sun Jun 21 09:00:48 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/02/13 23:12:37 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2020/06/21 09:00:48 mef Exp $
 
 SHA1 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 213da9cebb19215d6e7ea49ac390ecc9cb6c749f
 RMD160 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 2e586c8dae9d4a8b7c2fcb036fcdbff62f5c26d6
@@ -24,6 +24,10 @@ SHA1 (handbrake/libdvdread-6.0.2.tar.bz2
 RMD160 (handbrake/libdvdread-6.0.2.tar.bz2) = 811f3199acabd487edce8741060e6499b53deb68
 SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
 Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes
+SHA1 (handbrake/meson-0.54.2.tar.gz) = 42d632ef821a01ffb46c0a84a49b4daf69a25077
+RMD160 (handbrake/meson-0.54.2.tar.gz) = 925f77346b04d85ca34d3cf37fc2d1125b223408
+SHA512 (handbrake/meson-0.54.2.tar.gz) = ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
+Size (handbrake/meson-0.54.2.tar.gz) = 1691270 bytes
 SHA1 (handbrake/x265_3.2.1.tar.gz) = 0bd4889ff3ad596372ce2338f2d896947a2eec53
 RMD160 (handbrake/x265_3.2.1.tar.gz) = 7386c00a49a2fc143cd3c8cea657872235a8ba77
 SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568