Changes 2.6.3: - avcodec/libtheoraenc: Check for av_malloc failure - ffmpeg_opt: Fix -timestamp parsing - hevc: make avcodec_decode_video2() fail if get_format() fails - avcodec/cavsdec: Use ff_set_dimensions() - swr: fix alignment issue caused by 8ch sse functions - avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt() - avcodec/jpeg2000dec: fix boolean operator - avcodec/hevc_ps: Explicitly check num_tile_* for negative values - avformat/matroskadec: Cleanup error handling for bz2 & zlib - avformat/nutdec: Fix use of uinitialized value - tools/graph2dot: use larger data types than int for array/string sizes - avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv() - avcodec/mpeg12dec: use the correct dimensions for checking SAR - xcbgrab: Validate the capture area - xcbgrab: Do not assume the non shm image data is always available - avfilter/lavfutils: disable frame threads when decoding a single image - avformat/mov: Do not read ACLR into extradata for H.264 - ffmpeg: remove incorrect network deinit - OpenCL: Avoid potential buffer overflow in cmdutils_opencl.c - libvpxenc: only set noise reduction w/vp8 - vp9: remove another optimization branch in iadst16 which causes overflows. - lavf: Reset global flag on deinit - network: Do not leave context locked on error - vp9: remove one optimization branch in iadst16 which causes overflows. - fate: Include branch information in the payload header - avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use - avformat/img2dec: do not rewind custom io buffers - avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data - avcodec/atrac3plusdsp: fix on stack alignment - swresample/swresample-test: Randomly wipe out channel counts - swresample: Check channel layouts and channels against each other and print human readable error messages - swresample: Allow reinitialization without ever setting channel layouts (cherry picked from commit 80a28c7509a11114e1aea5b208d56c6646d69c07) - swresample: Allow reinitialization without ever setting channel counts - dashenc: replace attribute id with contentType for the AdaptationSet element - avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts - avformat/mux: Add avoid_negative_ts_use_pts - tests/fate-run: do not attempt to parse tiny_psnrs output if it failed - cafdec: free extradata before allocating it - imgutils: initialize palette padding bytes in av_image_alloc - aacdec: don't return frames without data - id3v2: catch avio_read errors in check_tag - avi: Validate sample_size - aacsbr: break infinite loop in sbr_hf_calc_npatches - diracdec: avoid overflow of bytes*8 in decode_lowdelay - diracdec: prevent overflow in data_unit_size check - avformat/matroskadec: Use tracks[k]->stream instead of s->streams[k] - matroskadec: use uint64_t instead of int for index_scale - pngdec: don't use AV_PIX_FMT_MONOBLACK for apng - pngdec: return correct error code from decode_frame_common - nutdec: fix illegal count check in decode_main_header - nutdec: fix memleaks on error in nut_read_header - apedec: prevent out of array writes in decode_array_0000 - apedec: set s->samples only when init_frame_decoder succeeded - swscale/ppc/swscale_altivec.c: POWER LE support in yuv2planeX_8() delete macro GET_VF() it was wrong - alac: reject rice_limit 0 if compression is used - alsdec: only adapt order for positive max_order - bink: check vst->index_entries before using it - mpeg4videodec: only allow a positive length - aacpsy: correct calculation of minath in psy_3gpp_init - alsdec: validate time diff index - alsdec: ensure channel reordering is reversible - ac3: validate end in ff_ac3_bit_alloc_calc_mask - aacpsy: avoid psy_band->threshold becoming NaN - aasc: return correct buffer size from aasc_decode_frame - matroskadec: export cover art correctly - mxfenc: don't try to write footer without header - mxfenc: fix memleaks in mxf_write_footer - rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded - rtpenc_mpegts: Free the right ->pb in the error path in the init functiondiff -r1.32 -r1.33 pkgsrc/multimedia/ffmpeg2/Makefile.common
(adam)
@@ -1,93 +1,93 @@ | @@ -1,93 +1,93 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.32 2015/04/12 09:15:26 adam Exp $ | 1 | # $NetBSD: Makefile.common,v 1.33 2015/05/18 11:57:07 adam Exp $ | |
2 | # used by multimedia/ffmpeg2/Makefile | 2 | # used by multimedia/ffmpeg2/Makefile | |
3 | # used by multimedia/ffplay2/Makefile | 3 | # used by multimedia/ffplay2/Makefile | |
4 | 4 | |||
5 | DISTNAME= ffmpeg-2.6.2 | 5 | DISTNAME= ffmpeg-2.6.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.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 | 10 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 | |
11 | 11 | |||
12 | PREV_PKGPATH= multimedia/ffmpeg-devel | 12 | PREV_PKGPATH= multimedia/ffmpeg-devel | |
13 | PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches | 13 | PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches | |
14 | 14 | |||
15 | USE_LANGUAGES= c99 | 15 | USE_LANGUAGES= c99 | |
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= gmake texi2html pod2man | 17 | USE_TOOLS+= gmake texi2html pod2man | |
18 | HAS_CONFIGURE= yes | 18 | HAS_CONFIGURE= yes | |
19 | CONFIGURE_ARGS+= --cc=${CC:Q} | 19 | CONFIGURE_ARGS+= --cc=${CC:Q} | |
20 | CONFIGURE_ARGS+= --disable-debug | 20 | CONFIGURE_ARGS+= --disable-debug | |
21 | CONFIGURE_ARGS+= --disable-optimizations | 21 | CONFIGURE_ARGS+= --disable-optimizations | |
22 | CONFIGURE_ARGS+= --disable-stripping | 22 | CONFIGURE_ARGS+= --disable-stripping | |
23 | CONFIGURE_ARGS+= --enable-shared | 23 | CONFIGURE_ARGS+= --enable-shared | |
24 | CONFIGURE_ARGS+= --enable-pthreads | 24 | CONFIGURE_ARGS+= --enable-pthreads | |
25 | CONFIGURE_ARGS+= --enable-gpl | 25 | CONFIGURE_ARGS+= --enable-gpl | |
26 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | 26 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | |
27 | CONFIGURE_ARGS+= --prefix=${PREFIX} | 27 | CONFIGURE_ARGS+= --prefix=${PREFIX} | |
28 | 28 | |||
29 | CONFIGURE_ARGS+= --progs-suffix=2 | 29 | CONFIGURE_ARGS+= --progs-suffix=2 | |
30 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 | 30 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 | |
31 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 | 31 | CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 | |
32 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 | 32 | CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 | |
33 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 | 33 | CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 | |
34 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2 | 34 | LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2 | |
35 | 35 | |||
36 | PLIST_VARS+= opencl | 36 | PLIST_VARS+= opencl | |
37 | 37 | |||
38 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) | 38 | .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) | |
39 | CONFIGURE_ARGS+= --enable-opencl | 39 | CONFIGURE_ARGS+= --enable-opencl | |
40 | PLIST.opencl= yes | 40 | PLIST.opencl= yes | |
41 | .endif | 41 | .endif | |
42 | 42 | |||
43 | .if ${OPSYS} == "SunOS" | 43 | .if ${OPSYS} == "SunOS" | |
44 | USE_TOOLS+= bash:build | 44 | USE_TOOLS+= bash:build | |
45 | CONFIG_SHELL= ${TOOLS_PATH.bash} | 45 | CONFIG_SHELL= ${TOOLS_PATH.bash} | |
46 | .endif | 46 | .endif | |
47 | 47 | |||
48 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | 48 | CONFIGURE_ARGS+= --enable-runtime-cpudetect | |
49 | 49 | |||
50 | # No posix_memalign() in NetBSD 4.0 and earlier | 50 | # No posix_memalign() in NetBSD 4.0 and earlier | |
51 | .if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) | 51 | .if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) | |
52 | CONFIGURE_ARGS+= --enable-memalign-hack | 52 | CONFIGURE_ARGS+= --enable-memalign-hack | |
53 | .endif | 53 | .endif | |
54 | 54 | |||
55 | # Let's not put garbage into /tmp | 55 | # Let's not put garbage into /tmp | |
56 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | 56 | CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp | |
57 | 57 | |||
58 | .include "../../mk/compiler.mk" | 58 | .include "../../mk/compiler.mk" | |
59 | 59 | |||
60 | .if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*) | 60 | .if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*) | |
61 | SUBST_CLASSES+= sunwspro | 61 | SUBST_CLASSES+= sunwspro | |
62 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | 62 | SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. | |
63 | SUBST_STAGE.sunwspro= post-configure | 63 | SUBST_STAGE.sunwspro= post-configure | |
64 | SUBST_FILES.sunwspro= config.mak | 64 | SUBST_FILES.sunwspro= config.mak | |
65 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | 65 | SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" | |
66 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | 66 | SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" | |
67 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | 67 | SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" | |
68 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | 68 | SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" | |
69 | .endif | 69 | .endif | |
70 | 70 | |||
71 | BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm | 71 | BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm | |
72 | 72 | |||
73 | REPLACE_PERL+= doc/texi2pod.pl | 73 | REPLACE_PERL+= doc/texi2pod.pl | |
74 | REPLACE_SH+= configure version.sh | 74 | REPLACE_SH+= configure version.sh | |
75 | 75 | |||
76 | SUBST_CLASSES+= conf | 76 | SUBST_CLASSES+= conf | |
77 | SUBST_STAGE.conf= post-patch | 77 | SUBST_STAGE.conf= post-patch | |
78 | SUBST_FILES.conf= ffserver.c | 78 | SUBST_FILES.conf= ffserver.c | |
79 | SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' | 79 | SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' | |
80 | SUBST_MESSAGE.conf= Fixing configuration path. | 80 | SUBST_MESSAGE.conf= Fixing configuration path. | |
81 | 81 | |||
82 | PLIST_SRC+= ${PKGDIR}/PLIST | 82 | PLIST_SRC+= ${PKGDIR}/PLIST | |
83 | 83 | |||
84 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | 84 | MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} | |
85 | 85 | |||
86 | pre-configure: | 86 | pre-configure: | |
87 | mkdir ${WRKSRC}/tmp | 87 | mkdir ${WRKSRC}/tmp | |
88 | 88 | |||
89 | .include "../../archivers/bzip2/buildlink3.mk" | 89 | .include "../../archivers/bzip2/buildlink3.mk" | |
90 | .include "../../devel/libgetopt/buildlink3.mk" | 90 | .include "../../devel/libgetopt/buildlink3.mk" | |
91 | .include "../../devel/zlib/buildlink3.mk" | 91 | .include "../../devel/zlib/buildlink3.mk" | |
92 | .include "../../mk/pthread.buildlink3.mk" | 92 | .include "../../mk/pthread.buildlink3.mk" | |
93 | .include "../../mk/bsd.pkg.mk" | 93 | .include "../../mk/bsd.pkg.mk" |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.31 2015/04/12 09:15:26 adam Exp $ | 1 | $NetBSD: distinfo,v 1.32 2015/05/18 11:57:07 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (ffmpeg-2.6.2.tar.bz2) = 65470c9b967485f72f81758a7bad44cf7a1763db | 3 | SHA1 (ffmpeg-2.6.3.tar.bz2) = a3307d20f97e8b75a113712e0258ab11d548d280 | |
4 | RMD160 (ffmpeg-2.6.2.tar.bz2) = 597cebd3192da7cae0efebf38fb32dd7dc44b758 | 4 | RMD160 (ffmpeg-2.6.3.tar.bz2) = 1bf56d9362f2060892124ec709258b85930921b8 | |
5 | Size (ffmpeg-2.6.2.tar.bz2) = 7803179 bytes | 5 | Size (ffmpeg-2.6.3.tar.bz2) = 7803314 bytes | |
6 | SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 | 6 | SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 | |
7 | SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 | 7 | SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 | |
8 | SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f | 8 | SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f | |
9 | SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e | 9 | SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e | |
10 | SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea | 10 | SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea | |
11 | SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 | 11 | SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 | |
12 | SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f | 12 | SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f |
@@ -1,36 +1,35 @@ | @@ -1,36 +1,35 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2015/04/25 14:23:38 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2015/05/18 11:57:07 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffplay2/} | 3 | PKGNAME= ${DISTNAME:S/ffmpeg/ffplay2/} | |
4 | PKGREVISION= 1 | |||
5 | MAINTAINER= pkgsrc-users@NetBSD.org | 4 | MAINTAINER= pkgsrc-users@NetBSD.org | |
6 | HOMEPAGE= http://ffmpeg.mplayerhq.hu/ | 5 | HOMEPAGE= http://ffmpeg.mplayerhq.hu/ | |
7 | COMMENT= Simple SDL frontend for FFmpeg | 6 | COMMENT= Simple SDL frontend for FFmpeg | |
8 | 7 | |||
9 | DISTINFO_FILE= ${.CURDIR}/../ffmpeg2/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../ffmpeg2/distinfo | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= --disable-ffmpeg | 10 | CONFIGURE_ARGS+= --disable-ffmpeg | |
12 | CONFIGURE_ARGS+= --disable-ffprobe | 11 | CONFIGURE_ARGS+= --disable-ffprobe | |
13 | CONFIGURE_ARGS+= --disable-ffserver | 12 | CONFIGURE_ARGS+= --disable-ffserver | |
14 | CONFIGURE_ARGS+= --disable-encoders | 13 | CONFIGURE_ARGS+= --disable-encoders | |
15 | CONFIGURE_ARGS+= --disable-decoders | 14 | CONFIGURE_ARGS+= --disable-decoders | |
16 | CONFIGURE_ARGS+= --disable-hwaccels | 15 | CONFIGURE_ARGS+= --disable-hwaccels | |
17 | CONFIGURE_ARGS+= --disable-muxers | 16 | CONFIGURE_ARGS+= --disable-muxers | |
18 | CONFIGURE_ARGS+= --disable-demuxers | 17 | CONFIGURE_ARGS+= --disable-demuxers | |
19 | CONFIGURE_ARGS+= --disable-parsers | 18 | CONFIGURE_ARGS+= --disable-parsers | |
20 | CONFIGURE_ARGS+= --disable-bsfs | 19 | CONFIGURE_ARGS+= --disable-bsfs | |
21 | CONFIGURE_ARGS+= --disable-protocols | 20 | CONFIGURE_ARGS+= --disable-protocols | |
22 | CONFIGURE_ARGS+= --disable-devices | 21 | CONFIGURE_ARGS+= --disable-devices | |
23 | CONFIGURE_ARGS+= --disable-filters | 22 | CONFIGURE_ARGS+= --disable-filters | |
24 | CONFIGURE_ARGS+= --enable-ffplay | 23 | CONFIGURE_ARGS+= --enable-ffplay | |
25 | CONFIGURE_ARGS+= --enable-dct | 24 | CONFIGURE_ARGS+= --enable-dct | |
26 | CONFIGURE_ARGS+= --enable-mdct | 25 | CONFIGURE_ARGS+= --enable-mdct | |
27 | CONFIGURE_ARGS+= --enable-rdft | 26 | CONFIGURE_ARGS+= --enable-rdft | |
28 | 27 | |||
29 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | 28 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | |
30 | 29 | |||
31 | do-install: | 30 | do-install: | |
32 | ${INSTALL_PROGRAM} ${WRKSRC}/ffplay2 ${DESTDIR}${PREFIX}/bin | 31 | ${INSTALL_PROGRAM} ${WRKSRC}/ffplay2 ${DESTDIR}${PREFIX}/bin | |
33 | 32 | |||
34 | .include "../../devel/SDL/buildlink3.mk" | 33 | .include "../../devel/SDL/buildlink3.mk" | |
35 | .include "../../multimedia/ffmpeg2/buildlink3.mk" | 34 | .include "../../multimedia/ffmpeg2/buildlink3.mk" | |
36 | .include "../../multimedia/ffmpeg2/Makefile.common" | 35 | .include "../../multimedia/ffmpeg2/Makefile.common" |