Sun Jun 21 09:00:48 2020 UTC ()
(multimedia/handbrake) Adhoc fix build. Could be 'tar' used in Makefile ?


(mef)
diff -r1.60 -r1.61 pkgsrc/multimedia/handbrake/Makefile
diff -r1.9 -r1.10 pkgsrc/multimedia/handbrake/distinfo
cvs diff -r1.60 -r1.61 pkgsrc/multimedia/handbrake/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/Makefile 2020/06/02 08:24:26 1.60
+++ pkgsrc/multimedia/handbrake/Makefile 2020/06/21 09:00:48 1.61
@@ -1,58 +1,63 @@ @@ -1,58 +1,63 @@
1# $NetBSD: Makefile,v 1.60 2020/06/02 08:24:26 adam Exp $ 1# $NetBSD: Makefile,v 1.61 2020/06/21 09:00:48 mef Exp $
2# 2#
3 3
4DISTNAME= HandBrake-1.3.1-source 4DISTNAME= HandBrake-1.3.1-source
5PKGNAME= ${DISTNAME:tl:S/-source//} 5PKGNAME= ${DISTNAME:tl:S/-source//}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= https://download.handbrake.fr/releases/${PKGVERSION_NOREV}/ 8MASTER_SITES= https://download.handbrake.fr/releases/${PKGVERSION_NOREV}/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://handbrake.fr/ 12HOMEPAGE= https://handbrake.fr/
13COMMENT= Multiplatform, multithreaded video transcoder 13COMMENT= Multiplatform, multithreaded video transcoder
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16DIST_SUBDIR= handbrake 16DIST_SUBDIR= handbrake
17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
18DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 18DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
19CDISTFILES= ffmpeg-4.2.2.tar.bz2 \ 19CDISTFILES= ffmpeg-4.2.2.tar.bz2 \
20 libbluray-1.1.2.tar.bz2 \ 20 libbluray-1.1.2.tar.bz2 \
21 libdvdnav-6.0.1.tar.bz2 \ 21 libdvdnav-6.0.1.tar.bz2 \
22 libdvdread-6.0.2.tar.bz2 \ 22 libdvdread-6.0.2.tar.bz2 \
23 x265_3.2.1.tar.gz \ 23 x265_3.2.1.tar.gz \
24 dav1d-0.5.1.tar.bz2 24 dav1d-0.5.1.tar.bz2
 25
 26MESON_DISTFILE= meson-0.54.2.tar.gz
25DISTFILES+= ${CDISTFILES} 27DISTFILES+= ${CDISTFILES}
 28DISTFILES+= ${MESON_DISTFILE}
26 29
27.for f in ${CDISTFILES} 30.for f in ${CDISTFILES}
28SITES.${f}= https://download.handbrake.fr/contrib/ 31SITES.${f}= https://download.handbrake.fr/contrib/
29.endfor 32.endfor
30 33
 34SITES.${MESON_DISTFILE}= ${MASTER_SITE_PYPI:=m/meson/}
 35
31RESTRICTED= Unresolved patent issues 36RESTRICTED= Unresolved patent issues
32NO_BIN_ON_CDROM= ${RESTRICTED} 37NO_BIN_ON_CDROM= ${RESTRICTED}
33NO_BIN_ON_FTP= ${RESTRICTED} 38NO_BIN_ON_FTP= ${RESTRICTED}
34NO_SRC_ON_CDROM= ${RESTRICTED} 39NO_SRC_ON_CDROM= ${RESTRICTED}
35NO_SRC_ON_FTP= ${RESTRICTED} 40NO_SRC_ON_FTP= ${RESTRICTED}
36 41
37WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 42WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
38 43
39HAS_CONFIGURE= yes 44HAS_CONFIGURE= yes
40USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash 45USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash
41USE_TOOLS+= autoconf automake aclocal autoreconf m4 46USE_TOOLS+= autoconf automake aclocal autoreconf m4
42USE_LIBTOOL= yes 47USE_LIBTOOL= yes
43USE_LANGUAGES= c c++ 48USE_LANGUAGES= c c++
44 49
45TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 50TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
46_TOOLS_USE_PKGSRC.msgfmt= yes 51_TOOLS_USE_PKGSRC.msgfmt= yes
47USE_BUILTIN.gettext= no 52USE_BUILTIN.gettext= no
48 53
49BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl 54BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl
50 55
51CONFIGURE_ARGS+= --prefix=${PREFIX} 56CONFIGURE_ARGS+= --prefix=${PREFIX}
52BUILD_DIRS= build 57BUILD_DIRS= build
53MAKE_FILE= GNUmakefile 58MAKE_FILE= GNUmakefile
54BUILD_TARGET= # empty 59BUILD_TARGET= # empty
55BUILD_FLAGS+= BUILDLINK_DIR=${BUILDLINK_DIR} 60BUILD_FLAGS+= BUILDLINK_DIR=${BUILDLINK_DIR}
56 61
57BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 62BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
58BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm 63BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm
@@ -60,26 +65,28 @@ BUILD_DEPENDS+= nasm>=2.05.01:../../dev @@ -60,26 +65,28 @@ BUILD_DEPENDS+= nasm>=2.05.01:../../dev
60 65
61.include "../../mk/compiler.mk" 66.include "../../mk/compiler.mk"
62 67
63.if !empty(PKGSRC_COMPILER:Mclang) 68.if !empty(PKGSRC_COMPILER:Mclang)
64CFLAGS+= -fheinous-gnu-extensions 69CFLAGS+= -fheinous-gnu-extensions
65.endif 70.endif
66 71
67post-extract: 72post-extract:
68 ${MKDIR} ${WRKSRC}/download 73 ${MKDIR} ${WRKSRC}/download
69.for distfile in ${CDISTFILES} 74.for distfile in ${CDISTFILES}
70 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ 75 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
71 ${WRKSRC}/download/ 76 ${WRKSRC}/download/
72.endfor 77.endfor
 78 cp ${DISTDIR}/${MESON_DISTFILE} ${WRKSRC}/download/
 79 (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE})
73 80
74.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 81.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
75.include "../../audio/lame/buildlink3.mk" 82.include "../../audio/lame/buildlink3.mk"
76.include "../../audio/libopus/buildlink3.mk" 83.include "../../audio/libopus/buildlink3.mk"
77.include "../../audio/libsamplerate/buildlink3.mk" 84.include "../../audio/libsamplerate/buildlink3.mk"
78.include "../../audio/speex/buildlink3.mk" 85.include "../../audio/speex/buildlink3.mk"
79.include "../../devel/gettext-lib/buildlink3.mk" 86.include "../../devel/gettext-lib/buildlink3.mk"
80.include "../../multimedia/gstreamer1/buildlink3.mk" 87.include "../../multimedia/gstreamer1/buildlink3.mk"
81.include "../../multimedia/libass/buildlink3.mk" 88.include "../../multimedia/libass/buildlink3.mk"
82.include "../../multimedia/libtheora/buildlink3.mk" 89.include "../../multimedia/libtheora/buildlink3.mk"
83.include "../../multimedia/libvpx/buildlink3.mk" 90.include "../../multimedia/libvpx/buildlink3.mk"
84.include "../../multimedia/x264-devel/buildlink3.mk" 91.include "../../multimedia/x264-devel/buildlink3.mk"
85.include "../../textproc/libxml2/buildlink3.mk" 92.include "../../textproc/libxml2/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/handbrake/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/distinfo 2020/02/13 23:12:37 1.9
+++ pkgsrc/multimedia/handbrake/distinfo 2020/06/21 09:00:48 1.10
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1$NetBSD: distinfo,v 1.9 2020/02/13 23:12:37 ryoon Exp $ 1$NetBSD: distinfo,v 1.10 2020/06/21 09:00:48 mef Exp $
2 2
3SHA1 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 213da9cebb19215d6e7ea49ac390ecc9cb6c749f 3SHA1 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 213da9cebb19215d6e7ea49ac390ecc9cb6c749f
4RMD160 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 2e586c8dae9d4a8b7c2fcb036fcdbff62f5c26d6 4RMD160 (handbrake/HandBrake-1.3.1-source.tar.bz2) = 2e586c8dae9d4a8b7c2fcb036fcdbff62f5c26d6
5SHA512 (handbrake/HandBrake-1.3.1-source.tar.bz2) = b713c70155feff765fb21e201e1c1599c970bf56581584281d883e57046409731cb663c11ee8ea2c141ba75852746be81d6db813f2d481b72429e53c89d584d2 5SHA512 (handbrake/HandBrake-1.3.1-source.tar.bz2) = b713c70155feff765fb21e201e1c1599c970bf56581584281d883e57046409731cb663c11ee8ea2c141ba75852746be81d6db813f2d481b72429e53c89d584d2
6Size (handbrake/HandBrake-1.3.1-source.tar.bz2) = 16815767 bytes 6Size (handbrake/HandBrake-1.3.1-source.tar.bz2) = 16815767 bytes
7SHA1 (handbrake/dav1d-0.5.1.tar.bz2) = 03f6b1ceeb543caf783c6bb2c17e9790802277c8 7SHA1 (handbrake/dav1d-0.5.1.tar.bz2) = 03f6b1ceeb543caf783c6bb2c17e9790802277c8
8RMD160 (handbrake/dav1d-0.5.1.tar.bz2) = 2193f5f242573b1cc52afb7b6b1558aae019211e 8RMD160 (handbrake/dav1d-0.5.1.tar.bz2) = 2193f5f242573b1cc52afb7b6b1558aae019211e
9SHA512 (handbrake/dav1d-0.5.1.tar.bz2) = 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b 9SHA512 (handbrake/dav1d-0.5.1.tar.bz2) = 2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b
10Size (handbrake/dav1d-0.5.1.tar.bz2) = 548584 bytes 10Size (handbrake/dav1d-0.5.1.tar.bz2) = 548584 bytes
11SHA1 (handbrake/ffmpeg-4.2.2.tar.bz2) = 77c9724bde4c6e3ef21ab954c0572ac45e61c3e5 11SHA1 (handbrake/ffmpeg-4.2.2.tar.bz2) = 77c9724bde4c6e3ef21ab954c0572ac45e61c3e5
12RMD160 (handbrake/ffmpeg-4.2.2.tar.bz2) = 170a0ab4f45f54e1473d906a01dac81ef113c3b8 12RMD160 (handbrake/ffmpeg-4.2.2.tar.bz2) = 170a0ab4f45f54e1473d906a01dac81ef113c3b8
13SHA512 (handbrake/ffmpeg-4.2.2.tar.bz2) = 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6 13SHA512 (handbrake/ffmpeg-4.2.2.tar.bz2) = 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6
14Size (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320 bytes 14Size (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320 bytes
15SHA1 (handbrake/libbluray-1.1.2.tar.bz2) = 3885c0d0bd0f04a3a372ceec3a01a44a7624f272 15SHA1 (handbrake/libbluray-1.1.2.tar.bz2) = 3885c0d0bd0f04a3a372ceec3a01a44a7624f272
16RMD160 (handbrake/libbluray-1.1.2.tar.bz2) = bbfea1093f9fc5ea089cf5860e55e020b916a4b0 16RMD160 (handbrake/libbluray-1.1.2.tar.bz2) = bbfea1093f9fc5ea089cf5860e55e020b916a4b0
17SHA512 (handbrake/libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 17SHA512 (handbrake/libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
18Size (handbrake/libbluray-1.1.2.tar.bz2) = 745779 bytes 18Size (handbrake/libbluray-1.1.2.tar.bz2) = 745779 bytes
19SHA1 (handbrake/libdvdnav-6.0.1.tar.bz2) = 258b82156e13803f2b0dbaec74e15475b4341d2f 19SHA1 (handbrake/libdvdnav-6.0.1.tar.bz2) = 258b82156e13803f2b0dbaec74e15475b4341d2f
20RMD160 (handbrake/libdvdnav-6.0.1.tar.bz2) = b546e77983eee3b0c842aa98f77c131d96132714 20RMD160 (handbrake/libdvdnav-6.0.1.tar.bz2) = b546e77983eee3b0c842aa98f77c131d96132714
21SHA512 (handbrake/libdvdnav-6.0.1.tar.bz2) = 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f 21SHA512 (handbrake/libdvdnav-6.0.1.tar.bz2) = 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
22Size (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491 bytes 22Size (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491 bytes
23SHA1 (handbrake/libdvdread-6.0.2.tar.bz2) = a3d4b85cbe52b11cff7587ed010fa38ce512fd95 23SHA1 (handbrake/libdvdread-6.0.2.tar.bz2) = a3d4b85cbe52b11cff7587ed010fa38ce512fd95
24RMD160 (handbrake/libdvdread-6.0.2.tar.bz2) = 811f3199acabd487edce8741060e6499b53deb68 24RMD160 (handbrake/libdvdread-6.0.2.tar.bz2) = 811f3199acabd487edce8741060e6499b53deb68
25SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c 25SHA512 (handbrake/libdvdread-6.0.2.tar.bz2) = e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
26Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes 26Size (handbrake/libdvdread-6.0.2.tar.bz2) = 405298 bytes
 27SHA1 (handbrake/meson-0.54.2.tar.gz) = 42d632ef821a01ffb46c0a84a49b4daf69a25077
 28RMD160 (handbrake/meson-0.54.2.tar.gz) = 925f77346b04d85ca34d3cf37fc2d1125b223408
 29SHA512 (handbrake/meson-0.54.2.tar.gz) = ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
 30Size (handbrake/meson-0.54.2.tar.gz) = 1691270 bytes
27SHA1 (handbrake/x265_3.2.1.tar.gz) = 0bd4889ff3ad596372ce2338f2d896947a2eec53 31SHA1 (handbrake/x265_3.2.1.tar.gz) = 0bd4889ff3ad596372ce2338f2d896947a2eec53
28RMD160 (handbrake/x265_3.2.1.tar.gz) = 7386c00a49a2fc143cd3c8cea657872235a8ba77 32RMD160 (handbrake/x265_3.2.1.tar.gz) = 7386c00a49a2fc143cd3c8cea657872235a8ba77
29SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568 33SHA512 (handbrake/x265_3.2.1.tar.gz) = 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568
30Size (handbrake/x265_3.2.1.tar.gz) = 1426255 bytes 34Size (handbrake/x265_3.2.1.tar.gz) = 1426255 bytes
31SHA1 (patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch) = 8538213d147d2bb9bec455408147bd7bd40df8c2 35SHA1 (patch-contrib_libbluray_P04-netbsd-pthread__equal-check.patch) = 8538213d147d2bb9bec455408147bd7bd40df8c2
32SHA1 (patch-libhb_fifo.c) = 46c5ec1f2c665da297830c326e703160e3e911d2 36SHA1 (patch-libhb_fifo.c) = 46c5ec1f2c665da297830c326e703160e3e911d2