ffmpeg4 ffplay4: updated to 4.4.3 version 4.4.3: - avformat/vividas: Check packet size - configure: link to libatomic when it's present - avcodec/dstdec: Check for overflow in build_filter() - avformat/spdifdec: Use 64bit to compute bit rate - avformat/rpl: Use 64bit for duration computation - avformat/xwma: Use av_rescale() for duration computation - avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation - avformat/sbgdec: Check ts_int in genrate_intervals - avformat/rmdec: check tag_size - avformat/nutdec: Check fields - avformat/flvdec: Use 64bit for sum_flv_tag_size - avformat/jacosubdec: Fix overflow in get_shift() - avformat/dxa: avoid bpc overflows - avformat/cafdec: Check that nb_frasmes fits within 64bit - avformat/asfdec_o: Limit packet offset - avformat/ape: Check frames size - avformat/icodec: Check nb_pal - avformat/aiffdec: Use 64bit for block_duration use - avformat/aiffdec: Check block_duration - avformat/mxfdec: only probe max run in - avformat/mxfdec: Check run_in is within 65536 - avcodec/mjpegdec: Check for unsupported bayer case - avcodec/apedec: Fix integer overflow in filter_3800() - avcodec/tta: Check 24bit scaling for overflow - avcodec/mobiclip: Check quantizer for overflow - avcodec/exr: Check preview psize - avcodec/tiff: Fix loop detection - libavformat/hls: Free keys - avcodec/fmvc: Move frame allocation to a later stage - avfilter/vf_showinfo: remove backspaces - avcodec/speedhq: Check width - avcodec/bink: disallow odd positioned scaled blocks - avformat/asfdec_o: limit recursion depth in asf_read_unknown() - doc/git-howto.texi: Document commit signing - libavcodec/8bps: Check that line lengths fit within the buffer - avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer() - libavformat/iff: Check for overflow in body_end calculation - avformat/avidec: Prevent entity expansion attacks - avcodec/h263dec: Sanity check against minimal I/P frame size - avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel - avcodec/mpegaudiodec_template: use unsigned shift in handle_crc() - avformat/subviewerdec: Make read_ts() more flexible - avcodec/mjpegdec: bayer and rct are incompatible - MAINTAINERS: Add ED25519 key for signing my commits in the future - avcodec/hevc_filter: copy_CTB() only within width&height - avcodec/tiff: Check tile_length and tile_width - avcodec/mss4: Check image size with av_image_check_size2() - avformat/flvdec: Check for EOF in index reading - avformat/nutdec: Check get_packetheader() in mainheader - avformat/asfdec_f: Use 64bit for packet start time - avcodec/exr: Check x/ysize - tools/target_dec_fuzzer: Adjust threshold for MMVIDEO - avcodec/lagarith: Check dst/src in zero run code - avcodec/h264dec: Skip late SEI - avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c() - avfilter/vf_signature: Fix integer overflow in filter_frame() - avformat/rtsp: break on unknown protocols - avcodec/hevcdsp_template: stay within tables in sao_band_filter() - avcodec/tiff: Check pixel format types for dng - avcodec/qpeldsp: copy less for the mc0x cases - avformat/aaxdec: Check for empty segments - avcodec/ffv1dec: Limit golomb rice coded slices to width 8M - avformat/iff: simplify duration calculation - avcodec/wnv1: Check for width =1 - avcodec/ffv1dec_template: fix indention - avformat/sctp: close socket on errors - avcodec/aasc: Fix indention - avcodec/qdrw: adjust max colors to array size - avcodec/alacdsp: Make intermediates unsigned - avformat/aiffdec: cleanup size handling for extreem cases - avformat/matroskadec: avoid integer overflows in SAR computation - avcodec/jpeglsdec: fix end check for xfrm - avcodec/cdgraphics: limit scrolling to the line - avformat/hls: Limit start_seq_no to one bit less - avformat/aiffdec: avoid integer overflow in get_meta() - avformat/ape: more bits in size for less overflows - avformat/aviobuf: Check buf_size in ffio_ensure_seekback() - avformat/bfi: Check offsets better - avformat/asfdec_f: Check packet_frag_timestamp - avcodec/texturedspenc: Fix indexing in color distribution determination - avformat/act: Check ff_get_wav_header() for failure - avcodec/libxavs2: Improve r redundancy in occured - avformat/libzmq: Improve r redundancy in occured - avfilter/vsrc_mandelbrot: Check for malloc failure - avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements - avfilter/video: Add ff_default_get_video_buffer2() to set specific alignment - avformat/genh: Check sample rate - configure: bump year - lavc/videotoolbox: do not pass AVCodecContext to decoder output callback - lavc/pthread_frame: always transfer stashed hwaccel state - avcodec/arm/sbcenc: avoid callee preserved vfp registers - avfilter/vf_scale: overwrite the width and height expressions with the original values - lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads - configure: extend SDL check to accept all 2.x versions - lavf/tls_mbedtls: add support for mbedtls version 3diff -r1.69 -r1.70 pkgsrc/multimedia/ffmpeg4/Makefile
(adam)
@@ -1,46 +1,45 @@ | @@ -1,46 +1,45 @@ | |||
1 | # $NetBSD: Makefile,v 1.69 2022/09/27 20:57:54 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.70 2022/10/10 17:14:02 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} | 3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} | |
4 | PKGREVISION= 5 | |||
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 (v4.x) | 6 | COMMENT= Decoding, encoding and streaming software (v4.x) | |
8 | 7 | |||
9 | CONFIGURE_ARGS+= --enable-avfilter | 8 | CONFIGURE_ARGS+= --enable-avfilter | |
10 | CONFIGURE_ARGS+= --enable-avresample | 9 | CONFIGURE_ARGS+= --enable-avresample | |
11 | CONFIGURE_ARGS+= --enable-postproc | 10 | CONFIGURE_ARGS+= --enable-postproc | |
12 | CONFIGURE_ARGS+= --enable-rpath | 11 | CONFIGURE_ARGS+= --enable-rpath | |
13 | CONFIGURE_ARGS+= --disable-ffplay | 12 | CONFIGURE_ARGS+= --disable-ffplay | |
14 | 13 | |||
15 | INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4 | 14 | INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4 | |
16 | 15 | |||
17 | .include "../../mk/bsd.prefs.mk" | 16 | .include "../../mk/bsd.prefs.mk" | |
18 | 17 | |||
19 | .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) | 18 | .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) | |
20 | CONFIGURE_ARGS+= --enable-cross-compile | 19 | CONFIGURE_ARGS+= --enable-cross-compile | |
21 | CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} | 20 | CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} | |
22 | CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} | 21 | CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} | |
23 | CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} | 22 | CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} | |
24 | .endif | 23 | .endif | |
25 | 24 | |||
26 | PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 } | 25 | PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 } | |
27 | PRINT_PLIST_AWK+= /opencl/ { $$0 = "$${PLIST.opencl}" $$0 } | 26 | PRINT_PLIST_AWK+= /opencl/ { $$0 = "$${PLIST.opencl}" $$0 } | |
28 | 27 | |||
29 | TEST_TARGET= check | 28 | TEST_TARGET= check | |
30 | 29 | |||
31 | post-install: | 30 | post-install: | |
32 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ | 31 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ | |
33 | ${DESTDIR}${PREFIX}/share/doc/ffmpeg4 | 32 | ${DESTDIR}${PREFIX}/share/doc/ffmpeg4 | |
34 | 33 | |||
35 | .include "options.mk" | 34 | .include "options.mk" | |
36 | 35 | |||
37 | # disable asm on i386 to avoid text relocations | 36 | # disable asm on i386 to avoid text relocations | |
38 | .if ${MACHINE_ARCH} == "i386" | 37 | .if ${MACHINE_ARCH} == "i386" | |
39 | CONFIGURE_ARGS+= --disable-asm | 38 | CONFIGURE_ARGS+= --disable-asm | |
40 | .endif | 39 | .endif | |
41 | 40 | |||
42 | # configure script uses uname -m to detect arch, as opposed to uname -p in | 41 | # configure script uses uname -m to detect arch, as opposed to uname -p in | |
43 | # GNU/configure. Unable to detect NetBSD/macppc hosts correctly. | 42 | # GNU/configure. Unable to detect NetBSD/macppc hosts correctly. | |
44 | CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} | 43 | CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} | |
45 | 44 | |||
46 | .include "../../multimedia/ffmpeg4/Makefile.common" | 45 | .include "../../multimedia/ffmpeg4/Makefile.common" |
@@ -1,89 +1,89 @@ | @@ -1,89 +1,89 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.29 2022/05/24 09:50:46 nia Exp $ | 1 | # $NetBSD: Makefile.common,v 1.30 2022/10/10 17:14:02 adam Exp $ | |
2 | # used by multimedia/ffmpeg4/Makefile | 2 | # used by multimedia/ffmpeg4/Makefile | |
3 | # used by multimedia/ffplay4/Makefile | 3 | # used by multimedia/ffplay4/Makefile | |
4 | 4 | |||
5 | DISTNAME= ffmpeg-4.4.2 | 5 | DISTNAME= ffmpeg-4.4.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/ffmpeg4/patches | 12 | PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/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 | 27 | |||
28 | CONFIGURE_ARGS+= --progs-suffix=4 | 28 | CONFIGURE_ARGS+= --progs-suffix=4 | |
29 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg4 | 29 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg4 | |
30 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg4 | 30 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg4 | |
31 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg4 | 31 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg4 | |
32 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg4 | 32 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg4 | |
33 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg4 | 33 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg4 | |
34 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg4 | 34 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg4 | |
35 | # Misuse LDFLAGS because the package doesn't (at least right now) honor LIBS. | 35 | # Misuse LDFLAGS because the package doesn't (at least right now) honor LIBS. | |
36 | LDFLAGS.SunOS+= -lrt | 36 | LDFLAGS.SunOS+= -lrt | |
37 | 37 | |||
38 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*) | 38 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*) | |
39 | CONFIGURE_ARGS+= --enable-opencl | 39 | CONFIGURE_ARGS+= --enable-opencl | |
40 | .endif | 40 | .endif | |
41 | 41 | |||
42 | .if ${OPSYS} == "SunOS" | 42 | .if ${OPSYS} == "SunOS" | |
43 | USE_TOOLS+= bash:build | 43 | USE_TOOLS+= bash:build | |
44 | CONFIG_SHELL= ${TOOLS_PATH.bash} | 44 | CONFIG_SHELL= ${TOOLS_PATH.bash} | |
45 | .endif | 45 | .endif | |
46 | 46 | |||
47 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | 47 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | |
48 | 48 | |||
49 | # Let's not put garbage into /tmp | 49 | # Let's not put garbage into /tmp | |
50 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | 50 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | |
51 | 51 | |||
52 | .include "../../mk/compiler.mk" | 52 | .include "../../mk/compiler.mk" | |
53 | 53 | |||
54 | .if !empty(PKGSRC_COMPILER:Msunpro) | 54 | .if !empty(PKGSRC_COMPILER:Msunpro) | |
55 | SUBST_CLASSES+= sunwspro | 55 | SUBST_CLASSES+= sunwspro | |
56 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | 56 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | |
57 | SUBST_STAGE.sunwspro= post-configure | 57 | SUBST_STAGE.sunwspro= post-configure | |
58 | SUBST_FILES.sunwspro= config.mak | 58 | SUBST_FILES.sunwspro= config.mak | |
59 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | 59 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | |
60 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | 60 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | |
61 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | 61 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | |
62 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | 62 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | |
63 | .endif | 63 | .endif | |
64 | 64 | |||
65 | .if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386 | 65 | .if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386 | |
66 | BUILD_DEPENDS+= nasm>=2.13:../../devel/nasm | 66 | BUILD_DEPENDS+= nasm>=2.13:../../devel/nasm | |
67 | .endif | 67 | .endif | |
68 | 68 | |||
69 | REPLACE_PERL+= doc/texi2pod.pl | 69 | REPLACE_PERL+= doc/texi2pod.pl | |
70 | REPLACE_SH+= configure | 70 | REPLACE_SH+= configure | |
71 | REPLACE_SH+= ffbuild/pkgconfig_generate.sh | 71 | REPLACE_SH+= ffbuild/pkgconfig_generate.sh | |
72 | REPLACE_SH+= ffbuild/version.sh | 72 | REPLACE_SH+= ffbuild/version.sh | |
73 | REPLACE_SH+= ffbuild/libversion.sh | 73 | REPLACE_SH+= ffbuild/libversion.sh | |
74 | 74 | |||
75 | PLIST_SRC+= ${PKGDIR}/PLIST | 75 | PLIST_SRC+= ${PKGDIR}/PLIST | |
76 | 76 | |||
77 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | 77 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | |
78 | 78 | |||
79 | pre-configure: | 79 | pre-configure: | |
80 | mkdir ${WRKSRC}/tmp | 80 | mkdir ${WRKSRC}/tmp | |
81 | 81 | |||
82 | .include "../../archivers/bzip2/buildlink3.mk" | 82 | .include "../../archivers/bzip2/buildlink3.mk" | |
83 | .include "../../archivers/xz/buildlink3.mk" | 83 | .include "../../archivers/xz/buildlink3.mk" | |
84 | .include "../../devel/libgetopt/buildlink3.mk" | 84 | .include "../../devel/libgetopt/buildlink3.mk" | |
85 | .include "../../devel/zlib/buildlink3.mk" | 85 | .include "../../devel/zlib/buildlink3.mk" | |
86 | .include "../../textproc/libxml2/buildlink3.mk" | 86 | .include "../../textproc/libxml2/buildlink3.mk" | |
87 | .include "../../mk/atomic64.mk" | 87 | .include "../../mk/atomic64.mk" | |
88 | .include "../../mk/pthread.buildlink3.mk" | 88 | .include "../../mk/pthread.buildlink3.mk" | |
89 | .include "../../mk/bsd.pkg.mk" | 89 | .include "../../mk/bsd.pkg.mk" |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | $NetBSD: distinfo,v 1.28 2022/08/23 10:04:39 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.29 2022/10/10 17:14:02 adam Exp $ | |
2 | 2 | |||
3 | BLAKE2s (ffmpeg-4.4.2.tar.xz) = b28c91e749bebf8a0b2911723c60281ff4deea5d6ba613939a27b0ae702c8c0d | 3 | BLAKE2s (ffmpeg-4.4.3.tar.xz) = 731f4c67a288e69e3930d8e35b69defada5c61cd07fc9430fb54c4054d0e4ad9 | |
4 | SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a | 4 | SHA512 (ffmpeg-4.4.3.tar.xz) = 0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915 | |
5 | Size (ffmpeg-4.4.2.tar.xz) = 9562968 bytes | 5 | Size (ffmpeg-4.4.3.tar.xz) = 9566020 bytes | |
6 | SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 | 6 | SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 | |
7 | SHA1 (patch-configure) = ffa962bb7adb4a64f6c78d84accaa83da6835c0a | 7 | SHA1 (patch-configure) = a79b9e2a8fe60d2848239305461a183dda6f3c12 | |
8 | SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc | 8 | SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc | |
9 | SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724 | 9 | SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724 | |
10 | SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c | 10 | SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c | |
11 | SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1 | 11 | SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1 | |
12 | SHA1 (patch-ffbuild_libversion.sh) = 7671eced5a8135a900c2f1d30343fc072ebb84ec | 12 | SHA1 (patch-ffbuild_libversion.sh) = 7671eced5a8135a900c2f1d30343fc072ebb84ec | |
13 | SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054 | 13 | SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054 | |
14 | SHA1 (patch-libavdevice_alldevices.c) = 8f835f8ec7b057ddcd6303bc2178cdb6f4541e2a | 14 | SHA1 (patch-libavdevice_alldevices.c) = 8f835f8ec7b057ddcd6303bc2178cdb6f4541e2a | |
15 | SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a | 15 | SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a | |
16 | SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6 | 16 | SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6 | |
17 | SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc | 17 | SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc | |
18 | SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be | 18 | SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be | |
19 | SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 | 19 | SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 | |
20 | SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 | 20 | SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 | |
21 | SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 | 21 | SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 |
@@ -1,89 +1,78 @@ | @@ -1,89 +1,78 @@ | |||
1 | $NetBSD: patch-configure,v 1.8 2022/08/23 10:04:39 wiz Exp $ | 1 | $NetBSD: patch-configure,v 1.9 2022/10/10 17:14:02 adam Exp $ | |
2 | 2 | |||
3 | Sun audio support. | 3 | Sun audio support. | |
4 | 4 | |||
5 | Enable PIC and section_data_rel_ro on NetBSD, even on i386, | 5 | Enable PIC and section_data_rel_ro on NetBSD, even on i386, | |
6 | to avoid text relocations. | 6 | to avoid text relocations. | |
7 | 7 | |||
8 | Do not use 'rsync'. | 8 | Do not use 'rsync'. | |
9 | 9 | |||
10 | Allow current SDL2 versions. | 10 | --- configure.orig 2022-10-09 19:04:43.000000000 +0000 | |
11 | ||||
12 | --- configure.orig 2022-04-14 20:13:38.000000000 +0000 | |||
13 | +++ configure | 11 | +++ configure | |
14 | @@ -2139,6 +2139,7 @@ HEADERS_LIST=" | 12 | @@ -2139,6 +2139,7 @@ HEADERS_LIST=" | |
15 | sys_resource_h | 13 | sys_resource_h | |
16 | sys_select_h | 14 | sys_select_h | |
17 | sys_soundcard_h | 15 | sys_soundcard_h | |
18 | + sys_audioio_h | 16 | + sys_audioio_h | |
19 | sys_time_h | 17 | sys_time_h | |
20 | sys_un_h | 18 | sys_un_h | |
21 | sys_videoio_h | 19 | sys_videoio_h | |
22 | @@ -2280,7 +2281,6 @@ TOOLCHAIN_FEATURES=" | 20 | @@ -2280,7 +2281,6 @@ TOOLCHAIN_FEATURES=" | |
23 | inline_asm_labels | 21 | inline_asm_labels | |
24 | inline_asm_nonlocal_labels | 22 | inline_asm_nonlocal_labels | |
25 | pragma_deprecated | 23 | pragma_deprecated | |
26 | - rsync_contimeout | 24 | - rsync_contimeout | |
27 | symver_asm_label | 25 | symver_asm_label | |
28 | symver_gnu_asm | 26 | symver_gnu_asm | |
29 | vfp_args | 27 | vfp_args | |
30 | @@ -3431,6 +3431,8 @@ opengl_outdev_deps="opengl" | 28 | @@ -3431,6 +3431,8 @@ opengl_outdev_deps="opengl" | |
31 | opengl_outdev_suggest="sdl2" | 29 | opengl_outdev_suggest="sdl2" | |
32 | oss_indev_deps_any="sys_soundcard_h" | 30 | oss_indev_deps_any="sys_soundcard_h" | |
33 | oss_outdev_deps_any="sys_soundcard_h" | 31 | oss_outdev_deps_any="sys_soundcard_h" | |
34 | +sunau_indev_deps_any="sys_audioio_h" | 32 | +sunau_indev_deps_any="sys_audioio_h" | |
35 | +sunau_outdev_deps_any="sys_audioio_h" | 33 | +sunau_outdev_deps_any="sys_audioio_h" | |
36 | pulse_indev_deps="libpulse" | 34 | pulse_indev_deps="libpulse" | |
37 | pulse_outdev_deps="libpulse" | 35 | pulse_outdev_deps="libpulse" | |
38 | sdl2_outdev_deps="sdl2" | 36 | sdl2_outdev_deps="sdl2" | |
39 | @@ -5369,6 +5371,8 @@ case $target_os in | 37 | @@ -5369,6 +5371,8 @@ case $target_os in | |
40 | ;; | 38 | ;; | |
41 | netbsd) | 39 | netbsd) | |
42 | disable symver | 40 | disable symver | |
43 | + enable section_data_rel_ro | 41 | + enable section_data_rel_ro | |
44 | + enable pic | 42 | + enable pic | |
45 | oss_indev_extralibs="-lossaudio" | 43 | oss_indev_extralibs="-lossaudio" | |
46 | oss_outdev_extralibs="-lossaudio" | 44 | oss_outdev_extralibs="-lossaudio" | |
47 | enabled gcc || check_ldflags -Wl,-zmuldefs | 45 | enabled gcc || check_ldflags -Wl,-zmuldefs | |
48 | @@ -5767,10 +5771,13 @@ done | 46 | @@ -5767,10 +5771,13 @@ done | |
49 | check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")' | 47 | check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")' | |
50 | 48 | |||
51 | # The global variable ensures the bits appear unchanged in the object file. | 49 | # The global variable ensures the bits appear unchanged in the object file. | |
52 | -test_cc <<EOF || die "endian test failed" | 50 | -test_cc <<EOF || die "endian test failed" | |
53 | -unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; | 51 | -unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; | |
54 | +test_exec <<EOF || enable bigendian | 52 | +test_exec <<EOF || enable bigendian | |
55 | +int main() | 53 | +int main() | |
56 | +{ | 54 | +{ | |
57 | + long one = 1; | 55 | + long one = 1; | |
58 | + return !(*((char *)(&one))); | 56 | + return !(*((char *)(&one))); | |
59 | +} | 57 | +} | |
60 | EOF | 58 | EOF | |
61 | -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian | 59 | -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian | |
62 | 60 | |||
63 | check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }" | 61 | check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }" | |
64 | 62 | |||
65 | @@ -6170,6 +6177,7 @@ check_headers malloc.h | 63 | @@ -6170,6 +6177,7 @@ check_headers malloc.h | |
66 | check_headers mftransform.h | 64 | check_headers mftransform.h | |
67 | check_headers net/udplite.h | 65 | check_headers net/udplite.h | |
68 | check_headers poll.h | 66 | check_headers poll.h | |
69 | +check_headers sys/audioio.h | 67 | +check_headers sys/audioio.h | |
70 | check_headers sys/param.h | 68 | check_headers sys/param.h | |
71 | check_headers sys/resource.h | 69 | check_headers sys/resource.h | |
72 | check_headers sys/select.h | 70 | check_headers sys/select.h | |
73 | @@ -6555,7 +6563,7 @@ fi | 71 | @@ -6606,7 +6614,6 @@ enabled makeinfo \ | |
74 | ||||
75 | if enabled sdl2; then | |||
76 | SDL2_CONFIG="${cross_prefix}sdl2-config" | |||
77 | - test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent | |||
78 | + test_pkg_config sdl2 "sdl2 >= 2.0.1" SDL_events.h SDL_PollEvent | |||
79 | if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then | |||
80 | sdl2_cflags=$("${SDL2_CONFIG}" --cflags) | |||
81 | sdl2_extralibs=$("${SDL2_CONFIG}" --libs) | |||
82 | @@ -6599,7 +6607,6 @@ enabled makeinfo \ | |||
83 | disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html | 72 | disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html | |
84 | perl -v > /dev/null 2>&1 && enable perl || disable perl | 73 | perl -v > /dev/null 2>&1 && enable perl || disable perl | |
85 | pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man | 74 | pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man | |
86 | -rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout | 75 | -rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout | |
87 | 76 | |||
88 | # check V4L2 codecs available in the API | 77 | # check V4L2 codecs available in the API | |
89 | if enabled v4l2_m2m; then | 78 | if enabled v4l2_m2m; then |
@@ -1,41 +1,40 @@ | @@ -1,41 +1,40 @@ | |||
1 | # $NetBSD: Makefile,v 1.26 2022/09/27 20:58:25 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.27 2022/10/10 17:14:02 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffplay4/} | 3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffplay4/} | |
4 | PKGREVISION= 3 | |||
5 | MAINTAINER= pkgsrc-users@NetBSD.org | 4 | MAINTAINER= pkgsrc-users@NetBSD.org | |
6 | HOMEPAGE= https://ffmpeg.org/ | 5 | HOMEPAGE= https://ffmpeg.org/ | |
7 | COMMENT= Simple SDL frontend for FFmpeg | 6 | COMMENT= Simple SDL frontend for FFmpeg | |
8 | 7 | |||
9 | DISTINFO_FILE= ${.CURDIR}/../ffmpeg4/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../ffmpeg4/distinfo | |
10 | 9 | |||
11 | USE_LANGUAGES= c99 | 10 | USE_LANGUAGES= c99 | |
12 | 11 | |||
13 | CONFIGURE_ARGS+= --disable-ffmpeg | 12 | CONFIGURE_ARGS+= --disable-ffmpeg | |
14 | CONFIGURE_ARGS+= --disable-ffprobe | 13 | CONFIGURE_ARGS+= --disable-ffprobe | |
15 | CONFIGURE_ARGS+= --disable-encoders | 14 | CONFIGURE_ARGS+= --disable-encoders | |
16 | CONFIGURE_ARGS+= --disable-decoders | 15 | CONFIGURE_ARGS+= --disable-decoders | |
17 | CONFIGURE_ARGS+= --disable-hwaccels | 16 | CONFIGURE_ARGS+= --disable-hwaccels | |
18 | CONFIGURE_ARGS+= --disable-muxers | 17 | CONFIGURE_ARGS+= --disable-muxers | |
19 | CONFIGURE_ARGS+= --disable-demuxers | 18 | CONFIGURE_ARGS+= --disable-demuxers | |
20 | CONFIGURE_ARGS+= --disable-parsers | 19 | CONFIGURE_ARGS+= --disable-parsers | |
21 | CONFIGURE_ARGS+= --disable-bsfs | 20 | CONFIGURE_ARGS+= --disable-bsfs | |
22 | CONFIGURE_ARGS+= --disable-protocols | 21 | CONFIGURE_ARGS+= --disable-protocols | |
23 | CONFIGURE_ARGS+= --disable-devices | 22 | CONFIGURE_ARGS+= --disable-devices | |
24 | CONFIGURE_ARGS+= --disable-filters | 23 | CONFIGURE_ARGS+= --disable-filters | |
25 | CONFIGURE_ARGS+= --disable-htmlpages | 24 | CONFIGURE_ARGS+= --disable-htmlpages | |
26 | CONFIGURE_ARGS+= --disable-podpages | 25 | CONFIGURE_ARGS+= --disable-podpages | |
27 | CONFIGURE_ARGS+= --disable-txtpages | 26 | CONFIGURE_ARGS+= --disable-txtpages | |
28 | CONFIGURE_ARGS+= --enable-ffplay | 27 | CONFIGURE_ARGS+= --enable-ffplay | |
29 | CONFIGURE_ARGS+= --enable-dct | 28 | CONFIGURE_ARGS+= --enable-dct | |
30 | CONFIGURE_ARGS+= --enable-mdct | 29 | CONFIGURE_ARGS+= --enable-mdct | |
31 | CONFIGURE_ARGS+= --enable-rdft | 30 | CONFIGURE_ARGS+= --enable-rdft | |
32 | 31 | |||
33 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | 32 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | |
34 | 33 | |||
35 | do-install: | 34 | do-install: | |
36 | ${INSTALL_PROGRAM} ${WRKSRC}/ffplay4 ${DESTDIR}${PREFIX}/bin | 35 | ${INSTALL_PROGRAM} ${WRKSRC}/ffplay4 ${DESTDIR}${PREFIX}/bin | |
37 | ${INSTALL_MAN} ${WRKSRC}/doc/ffplay4.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 36 | ${INSTALL_MAN} ${WRKSRC}/doc/ffplay4.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
38 | 37 | |||
39 | .include "../../devel/SDL2/buildlink3.mk" | 38 | .include "../../devel/SDL2/buildlink3.mk" | |
40 | .include "../../multimedia/ffmpeg4/buildlink3.mk" | 39 | .include "../../multimedia/ffmpeg4/buildlink3.mk" | |
41 | .include "../../multimedia/ffmpeg4/Makefile.common" | 40 | .include "../../multimedia/ffmpeg4/Makefile.common" |