ffmpeg5: update to 5.1.3. version 5.1.3: - avcodec/tests/snowenc: Fix 2nd test - avcodec/tests/snowenc: return a failure if DWT/IDWT mismatches - avcodec/snowenc: Fix visual weight calculation - avcodec/tests/snowenc: unbreak DWT tests - update for 5.1.3 - avcodec/mpeg12dec: Check input size - avcodec/escape124: Fix some return codes - avcodec/escape124: fix signdness of end of input check - Use https for repository links - avcodec/rpzaenc: stop accessing out of bounds frame - avcodec/smcenc: stop accessing out of bounds frame - avcodec/motionpixels: Mask pixels to valid values - avcodec/xpmdec: Check size before allocation to avoid truncation - avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane() - avcodec/bink: Fix off by 1 error in ref end - avcodec/utils: Ensure linesize for SVQ3 - avcodec/utils: allocate a line more for VC1 and WMV3 - avcodec/videodsp_template: Adjust pointers to avoid undefined pointer things - avcodec/pngdec: dont skip/read chunk twice - avcodec/pngdec: Check deloco index more exactly - avcodec/ffv1dec: Check that num h/v slices is supported - avformat/mov: Check samplesize and offset to avoid integer overflow - lavu/vulkan: fix handle type for 32-bit targets - vulkan: Fix win/i386 calling convention - avcodec/pictordec: Remove mid exit branch - avcodec/eac3dec: avoid float noise in fixed mode addition to overflow - avcodec/utils: use 32pixel alignment for bink - avcodec/scpr3: Check bx - avcodec/012v: Order operations for odd size handling - avcodec/eatgq: : Check index increments in tgq_decode_block() - avcodec/h274: fix include - avcodec/scpr: Test bx before use - avformat/mxfdec: Use 64bit in remainder - avcodec/sunrast: Fix maplength check - avcodec/wavpack: Avoid undefined shift in get_tail() - avcodec/wavpack: Check for end of input in wv_unpack_dsd_high() - avformat/id3v2: Check taglen in read_uslt() - avcodec/tiff: Ignore tile_count - avcodec/ffv1dec: restructure slice coordinate reading a bit - avcodec/mlpdec: Check max matrix instead of max channel in noise check - avutil/tx: Use unsigned in ff_tx_fft_sr_combine() to avoid undefined behavior - swscale/input: Use more unsigned intermediates - avcodec/alsdec: Check bits left before block decoding in non multi channel coding loop - avcodec/alsdec: The minimal block is at least 7 bits - avformat/replaygain: avoid undefined / negative abs - swscale/output: Bias 16bps output calculations to improve non overflowing range for GBRP16/GBRPF32 - swscale/output: Bias 16bps output calculations to improve non overflowing range - avcodec/speedhq: Check buf_size to be big enough for DC - avcodec/ffv1dec: Fail earlier if prior context is corrupted - avcodec/speexdec: Check channels > 2 - avformat/vividas: Check packet size - hwcontext_vulkan: remove optional encode/decode extensions from the list - avcodec/libjxldec: fix gamma22 and gamma28 recognition - avcodec/mpeg12dec: use init_get_bits8 and check the return value - avcodec/nvenc: fix vbv buffer size in cq mode - avcodec/mjpegenc: take into account component count when writing the SOF header size - swscale: aarch64: Fix yuv2rgb with negative strides - avcodec/atrac3plus: reorder channels to match the output layout - avcodec/aacdec: fix parsing streams with channel configuration 11 - libswscale: force a minimum size of the slide for bayer sources - lavf/async: Fix ring_write return value - avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately when encode error - avcodec/libjxlenc: avoid hard failure with unspecified primariesdiff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg5/Makefile
(wiz)
@@ -1,45 +1,44 @@ | @@ -1,45 +1,44 @@ | |||
1 | # $NetBSD: Makefile,v 1.16 2023/01/29 21:14:52 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.17 2023/04/09 06:55:44 wiz Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg5/} | 3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg5/} | |
4 | PKGREVISION= 4 | |||
5 | MAINTAINER= pkgsrc-users@NetBSD.org | 4 | MAINTAINER= pkgsrc-users@NetBSD.org | |
6 | HOMEPAGE= https://ffmpeg.org/ | 5 | HOMEPAGE= https://ffmpeg.org/ | |
7 | COMMENT= Decoding, encoding and streaming software (v5.x) | 6 | COMMENT= Decoding, encoding and streaming software (v5.x) | |
8 | 7 | |||
9 | CONFIGURE_ARGS+= --enable-avfilter | 8 | CONFIGURE_ARGS+= --enable-avfilter | |
10 | CONFIGURE_ARGS+= --enable-postproc | 9 | CONFIGURE_ARGS+= --enable-postproc | |
11 | CONFIGURE_ARGS+= --enable-rpath | 10 | CONFIGURE_ARGS+= --enable-rpath | |
12 | CONFIGURE_ARGS+= --disable-ffplay | 11 | CONFIGURE_ARGS+= --disable-ffplay | |
13 | 12 | |||
14 | INSTALLATION_DIRS= lib/ffmpeg5 share/doc/ffmpeg5 share/examples/ffmpeg5 | 13 | INSTALLATION_DIRS= lib/ffmpeg5 share/doc/ffmpeg5 share/examples/ffmpeg5 | |
15 | 14 | |||
16 | .include "../../mk/bsd.prefs.mk" | 15 | .include "../../mk/bsd.prefs.mk" | |
17 | 16 | |||
18 | .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) | 17 | .if ${USE_CROSS_COMPILE:U:tl} == yes | |
19 | CONFIGURE_ARGS+= --enable-cross-compile | 18 | CONFIGURE_ARGS+= --enable-cross-compile | |
20 | CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} | 19 | CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} | |
21 | CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} | 20 | CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} | |
22 | CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} | 21 | CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} | |
23 | .endif | 22 | .endif | |
24 | 23 | |||
25 | PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 } | 24 | PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 } | |
26 | 25 | |||
27 | TEST_TARGET= check | 26 | TEST_TARGET= check | |
28 | 27 | |||
29 | post-install: | 28 | post-install: | |
30 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ | 29 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ | |
31 | ${DESTDIR}${PREFIX}/share/doc/ffmpeg5 | 30 | ${DESTDIR}${PREFIX}/share/doc/ffmpeg5 | |
32 | 31 | |||
33 | .include "options.mk" | 32 | .include "options.mk" | |
34 | 33 | |||
35 | # disable asm on i386 to avoid text relocations | 34 | # disable asm on i386 to avoid text relocations | |
36 | .if ${MACHINE_ARCH} == "i386" | 35 | .if ${MACHINE_ARCH} == "i386" | |
37 | CONFIGURE_ARGS+= --disable-asm | 36 | CONFIGURE_ARGS+= --disable-asm | |
38 | .endif | 37 | .endif | |
39 | 38 | |||
40 | # configure script uses uname -m to detect arch, as opposed to uname -p in | 39 | # configure script uses uname -m to detect arch, as opposed to uname -p in | |
41 | # GNU/configure. Unable to detect NetBSD/macppc hosts correctly. | 40 | # GNU/configure. Unable to detect NetBSD/macppc hosts correctly. | |
42 | CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} | 41 | CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} | |
43 | 42 | |||
44 | .include "../../multimedia/ffmpeg5/Makefile.common" | 43 | .include "../../multimedia/ffmpeg5/Makefile.common" | |
45 | .include "../../mk/bsd.pkg.mk" | 44 | .include "../../mk/bsd.pkg.mk" |
@@ -1,84 +1,84 @@ | @@ -1,84 +1,84 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.5 2022/09/26 12:38:36 adam Exp $ | 1 | # $NetBSD: Makefile.common,v 1.6 2023/04/09 06:55:44 wiz Exp $ | |
2 | # used by multimedia/ffmpeg5/Makefile | 2 | # used by multimedia/ffmpeg5/Makefile | |
3 | # used by multimedia/ffplay5/Makefile | 3 | # used by multimedia/ffplay5/Makefile | |
4 | 4 | |||
5 | DISTNAME= ffmpeg-5.1.2 | 5 | DISTNAME= ffmpeg-5.1.3 | |
6 | CATEGORIES= multimedia | 6 | CATEGORIES= multimedia | |
7 | MASTER_SITES= http://www.ffmpeg.org/releases/ | 7 | MASTER_SITES= http://www.ffmpeg.org/releases/ | |
8 | EXTRACT_SUFX= .tar.xz | 8 | EXTRACT_SUFX= .tar.xz | |
9 | 9 | |||
10 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE} | 10 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE} | |
11 | 11 | |||
12 | PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg5/patches | 12 | PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg5/patches | |
13 | 13 | |||
14 | USE_LIBTOOL= yes | 14 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= gmake pod2man perl pkg-config | 15 | USE_TOOLS+= gmake pod2man perl pkg-config | |
16 | HAS_CONFIGURE= yes | 16 | HAS_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --cc=${CC:Q} | 17 | CONFIGURE_ARGS+= --cc=${CC:Q} | |
18 | CONFIGURE_ARGS+= --disable-debug | 18 | CONFIGURE_ARGS+= --disable-debug | |
19 | CONFIGURE_ARGS+= --disable-optimizations | 19 | CONFIGURE_ARGS+= --disable-optimizations | |
20 | CONFIGURE_ARGS+= --disable-stripping | 20 | CONFIGURE_ARGS+= --disable-stripping | |
21 | CONFIGURE_ARGS+= --enable-gpl | 21 | CONFIGURE_ARGS+= --enable-gpl | |
22 | CONFIGURE_ARGS+= --enable-libxml2 | 22 | CONFIGURE_ARGS+= --enable-libxml2 | |
23 | CONFIGURE_ARGS+= --enable-pthreads | 23 | CONFIGURE_ARGS+= --enable-pthreads | |
24 | CONFIGURE_ARGS+= --enable-shared | 24 | CONFIGURE_ARGS+= --enable-shared | |
25 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | 25 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | |
26 | CONFIGURE_ARGS+= --prefix=${PREFIX} | 26 | CONFIGURE_ARGS+= --prefix=${PREFIX} | |
27 | CONFIGURE_ARGS+= --progs-suffix=5 | 27 | CONFIGURE_ARGS+= --progs-suffix=5 | |
28 | 28 | |||
29 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | 29 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | |
30 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg5 | 30 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg5 | |
31 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg5 | 31 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg5 | |
32 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg5 | 32 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg5 | |
33 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg5 | 33 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg5 | |
34 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg5 | 34 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg5 | |
35 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg5 | 35 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg5 | |
36 | 36 | |||
37 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*) | 37 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*) | |
38 | CONFIGURE_ARGS+= --enable-opencl | 38 | CONFIGURE_ARGS+= --enable-opencl | |
39 | .endif | 39 | .endif | |
40 | 40 | |||
41 | .if ${OPSYS} == "SunOS" | 41 | .if ${OPSYS} == "SunOS" | |
42 | USE_TOOLS+= bash:build | 42 | USE_TOOLS+= bash:build | |
43 | CONFIG_SHELL= ${TOOLS_PATH.bash} | 43 | CONFIG_SHELL= ${TOOLS_PATH.bash} | |
44 | .endif | 44 | .endif | |
45 | 45 | |||
46 | # Let's not put garbage into /tmp | 46 | # Let's not put garbage into /tmp | |
47 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | 47 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | |
48 | 48 | |||
49 | .include "../../mk/compiler.mk" | 49 | .include "../../mk/compiler.mk" | |
50 | 50 | |||
51 | .if !empty(PKGSRC_COMPILER:Msunpro) | 51 | .if !empty(PKGSRC_COMPILER:Msunpro) | |
52 | SUBST_CLASSES+= sunwspro | 52 | SUBST_CLASSES+= sunwspro | |
53 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | 53 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | |
54 | SUBST_STAGE.sunwspro= post-configure | 54 | SUBST_STAGE.sunwspro= post-configure | |
55 | SUBST_FILES.sunwspro= config.mak | 55 | SUBST_FILES.sunwspro= config.mak | |
56 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | 56 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | |
57 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | 57 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | |
58 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | 58 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | |
59 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | 59 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | |
60 | .endif | 60 | .endif | |
61 | 61 | |||
62 | .if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386 | 62 | .if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386 | |
63 | BUILD_DEPENDS+= nasm>=2.13:../../devel/nasm | 63 | BUILD_DEPENDS+= nasm>=2.13:../../devel/nasm | |
64 | .endif | 64 | .endif | |
65 | 65 | |||
66 | REPLACE_PERL+= doc/texi2pod.pl | 66 | REPLACE_PERL+= doc/texi2pod.pl | |
67 | REPLACE_SH+= configure | 67 | REPLACE_SH+= configure | |
68 | REPLACE_SH+= ffbuild/pkgconfig_generate.sh | 68 | REPLACE_SH+= ffbuild/pkgconfig_generate.sh | |
69 | REPLACE_SH+= ffbuild/version.sh | 69 | REPLACE_SH+= ffbuild/version.sh | |
70 | 70 | |||
71 | PLIST_SRC+= ${PKGDIR}/PLIST | 71 | PLIST_SRC+= ${PKGDIR}/PLIST | |
72 | 72 | |||
73 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | 73 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | |
74 | 74 | |||
75 | pre-configure: | 75 | pre-configure: | |
76 | ${MKDIR} ${WRKSRC}/tmp | 76 | ${MKDIR} ${WRKSRC}/tmp | |
77 | 77 | |||
78 | .include "../../archivers/bzip2/buildlink3.mk" | 78 | .include "../../archivers/bzip2/buildlink3.mk" | |
79 | .include "../../archivers/xz/buildlink3.mk" | 79 | .include "../../archivers/xz/buildlink3.mk" | |
80 | .include "../../devel/libgetopt/buildlink3.mk" | 80 | .include "../../devel/libgetopt/buildlink3.mk" | |
81 | .include "../../devel/zlib/buildlink3.mk" | 81 | .include "../../devel/zlib/buildlink3.mk" | |
82 | .include "../../textproc/libxml2/buildlink3.mk" | 82 | .include "../../textproc/libxml2/buildlink3.mk" | |
83 | .include "../../mk/atomic64.mk" | 83 | .include "../../mk/atomic64.mk" | |
84 | .include "../../mk/pthread.buildlink3.mk" | 84 | .include "../../mk/pthread.buildlink3.mk" |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2022/09/26 12:38:36 adam Exp $ | 1 | $NetBSD: distinfo,v 1.6 2023/04/09 06:55:44 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (ffmpeg-5.1.2.tar.xz) = 08bd1a9c02d5c168c2644fc9fcbf0db7dcdb6874a71ac1057ae4bd830733e1b6 | 3 | BLAKE2s (ffmpeg-5.1.3.tar.xz) = 68bec61d58ecbb84d9292add3bd8e608b9d416a4dd7f32203205aa5ee29508be | |
4 | SHA512 (ffmpeg-5.1.2.tar.xz) = 04d9ae2a0e9238c469941d2bb9929d59b58f4be3830846cf91b02a440da17803a04b147a4e0168c9ffd6f62ca82187508bc7b53255de9787a97168278e903b9b | 4 | SHA512 (ffmpeg-5.1.3.tar.xz) = 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a | |
5 | Size (ffmpeg-5.1.2.tar.xz) = 10004956 bytes | 5 | Size (ffmpeg-5.1.3.tar.xz) = 10007756 bytes | |
6 | SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 | 6 | SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 | |
7 | SHA1 (patch-configure) = b4dea315f65ab019eb78cee7f58d938382024ae0 | 7 | SHA1 (patch-configure) = b4dea315f65ab019eb78cee7f58d938382024ae0 | |
8 | SHA1 (patch-doc_Makefile) = d45fc311f47e6cd8a8432659d7bd77e50b858e43 | 8 | SHA1 (patch-doc_Makefile) = d45fc311f47e6cd8a8432659d7bd77e50b858e43 | |
9 | SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724 | 9 | SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724 | |
10 | SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7 | 10 | SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7 | |
11 | SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2 | 11 | SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2 | |
12 | SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054 | 12 | SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054 | |
13 | SHA1 (patch-libavdevice_alldevices.c) = 1d12f5b12d37a73512cd8e0f05272e9a64588e49 | 13 | SHA1 (patch-libavdevice_alldevices.c) = 1d12f5b12d37a73512cd8e0f05272e9a64588e49 | |
14 | SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a | 14 | SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a | |
15 | SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6 | 15 | SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6 | |
16 | SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc | 16 | SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc | |
17 | SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be | 17 | SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be | |
18 | SHA1 (patch-libavutil_macros.h) = 7d9770f018a2207d2dcb1fe057564e30be51fd42 | 18 | SHA1 (patch-libavutil_macros.h) = 7d9770f018a2207d2dcb1fe057564e30be51fd42 | |
19 | SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 | 19 | SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 | |
20 | SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 | 20 | SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 |