Mon May 18 11:57:07 2015 UTC ()
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 function


(adam)
diff -r1.32 -r1.33 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg2/distinfo
diff -r1.7 -r1.8 pkgsrc/multimedia/ffplay2/Makefile

cvs diff -r1.32 -r1.33 pkgsrc/multimedia/ffmpeg2/Makefile.common (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/04/12 09:15:26 1.32
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/05/18 11:57:07 1.33
@@ -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
5DISTNAME= ffmpeg-2.6.2 5DISTNAME= ffmpeg-2.6.3
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PREV_PKGPATH= multimedia/ffmpeg-devel 12PREV_PKGPATH= multimedia/ffmpeg-devel
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
14 14
15USE_LANGUAGES= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake texi2html pod2man 17USE_TOOLS+= gmake texi2html pod2man
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
19CONFIGURE_ARGS+= --cc=${CC:Q} 19CONFIGURE_ARGS+= --cc=${CC:Q}
20CONFIGURE_ARGS+= --disable-debug 20CONFIGURE_ARGS+= --disable-debug
21CONFIGURE_ARGS+= --disable-optimizations 21CONFIGURE_ARGS+= --disable-optimizations
22CONFIGURE_ARGS+= --disable-stripping 22CONFIGURE_ARGS+= --disable-stripping
23CONFIGURE_ARGS+= --enable-shared 23CONFIGURE_ARGS+= --enable-shared
24CONFIGURE_ARGS+= --enable-pthreads 24CONFIGURE_ARGS+= --enable-pthreads
25CONFIGURE_ARGS+= --enable-gpl 25CONFIGURE_ARGS+= --enable-gpl
26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
27CONFIGURE_ARGS+= --prefix=${PREFIX} 27CONFIGURE_ARGS+= --prefix=${PREFIX}
28 28
29CONFIGURE_ARGS+= --progs-suffix=2 29CONFIGURE_ARGS+= --progs-suffix=2
30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2
31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2
32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2
33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2 34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2
35 35
36PLIST_VARS+= opencl 36PLIST_VARS+= opencl
37 37
38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) 38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
39CONFIGURE_ARGS+= --enable-opencl 39CONFIGURE_ARGS+= --enable-opencl
40PLIST.opencl= yes 40PLIST.opencl= yes
41.endif 41.endif
42 42
43.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
44USE_TOOLS+= bash:build 44USE_TOOLS+= bash:build
45CONFIG_SHELL= ${TOOLS_PATH.bash} 45CONFIG_SHELL= ${TOOLS_PATH.bash}
46.endif 46.endif
47 47
48CONFIGURE_ARGS+= --enable-runtime-cpudetect 48CONFIGURE_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].*-*)
52CONFIGURE_ARGS+= --enable-memalign-hack 52CONFIGURE_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
56CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp 56CONFIGURE_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*)
61SUBST_CLASSES+= sunwspro 61SUBST_CLASSES+= sunwspro
62SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 62SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
63SUBST_STAGE.sunwspro= post-configure 63SUBST_STAGE.sunwspro= post-configure
64SUBST_FILES.sunwspro= config.mak 64SUBST_FILES.sunwspro= config.mak
65SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 65SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
66SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 66SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
67SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 67SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
68SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" 68SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
69.endif 69.endif
70 70
71BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm 71BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm
72 72
73REPLACE_PERL+= doc/texi2pod.pl 73REPLACE_PERL+= doc/texi2pod.pl
74REPLACE_SH+= configure version.sh 74REPLACE_SH+= configure version.sh
75 75
76SUBST_CLASSES+= conf 76SUBST_CLASSES+= conf
77SUBST_STAGE.conf= post-patch 77SUBST_STAGE.conf= post-patch
78SUBST_FILES.conf= ffserver.c 78SUBST_FILES.conf= ffserver.c
79SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 79SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
80SUBST_MESSAGE.conf= Fixing configuration path. 80SUBST_MESSAGE.conf= Fixing configuration path.
81 81
82PLIST_SRC+= ${PKGDIR}/PLIST 82PLIST_SRC+= ${PKGDIR}/PLIST
83 83
84MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 84MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
85 85
86pre-configure: 86pre-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"

cvs diff -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg2/distinfo (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/distinfo 2015/04/12 09:15:26 1.31
+++ pkgsrc/multimedia/ffmpeg2/distinfo 2015/05/18 11:57:07 1.32
@@ -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
3SHA1 (ffmpeg-2.6.2.tar.bz2) = 65470c9b967485f72f81758a7bad44cf7a1763db 3SHA1 (ffmpeg-2.6.3.tar.bz2) = a3307d20f97e8b75a113712e0258ab11d548d280
4RMD160 (ffmpeg-2.6.2.tar.bz2) = 597cebd3192da7cae0efebf38fb32dd7dc44b758 4RMD160 (ffmpeg-2.6.3.tar.bz2) = 1bf56d9362f2060892124ec709258b85930921b8
5Size (ffmpeg-2.6.2.tar.bz2) = 7803179 bytes 5Size (ffmpeg-2.6.3.tar.bz2) = 7803314 bytes
6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f 8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
10SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea 10SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
11SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 11SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
12SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f 12SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f

cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffplay2/Makefile (switch to unified diff)

--- pkgsrc/multimedia/ffplay2/Makefile 2015/04/25 14:23:38 1.7
+++ pkgsrc/multimedia/ffplay2/Makefile 2015/05/18 11:57:07 1.8
@@ -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
3PKGNAME= ${DISTNAME:S/ffmpeg/ffplay2/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffplay2/}
4PKGREVISION= 1 
5MAINTAINER= pkgsrc-users@NetBSD.org 4MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 5HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Simple SDL frontend for FFmpeg 6COMMENT= Simple SDL frontend for FFmpeg
8 7
9DISTINFO_FILE= ${.CURDIR}/../ffmpeg2/distinfo 8DISTINFO_FILE= ${.CURDIR}/../ffmpeg2/distinfo
10 9
11CONFIGURE_ARGS+= --disable-ffmpeg 10CONFIGURE_ARGS+= --disable-ffmpeg
12CONFIGURE_ARGS+= --disable-ffprobe 11CONFIGURE_ARGS+= --disable-ffprobe
13CONFIGURE_ARGS+= --disable-ffserver 12CONFIGURE_ARGS+= --disable-ffserver
14CONFIGURE_ARGS+= --disable-encoders 13CONFIGURE_ARGS+= --disable-encoders
15CONFIGURE_ARGS+= --disable-decoders 14CONFIGURE_ARGS+= --disable-decoders
16CONFIGURE_ARGS+= --disable-hwaccels 15CONFIGURE_ARGS+= --disable-hwaccels
17CONFIGURE_ARGS+= --disable-muxers 16CONFIGURE_ARGS+= --disable-muxers
18CONFIGURE_ARGS+= --disable-demuxers 17CONFIGURE_ARGS+= --disable-demuxers
19CONFIGURE_ARGS+= --disable-parsers 18CONFIGURE_ARGS+= --disable-parsers
20CONFIGURE_ARGS+= --disable-bsfs 19CONFIGURE_ARGS+= --disable-bsfs
21CONFIGURE_ARGS+= --disable-protocols 20CONFIGURE_ARGS+= --disable-protocols
22CONFIGURE_ARGS+= --disable-devices 21CONFIGURE_ARGS+= --disable-devices
23CONFIGURE_ARGS+= --disable-filters 22CONFIGURE_ARGS+= --disable-filters
24CONFIGURE_ARGS+= --enable-ffplay 23CONFIGURE_ARGS+= --enable-ffplay
25CONFIGURE_ARGS+= --enable-dct 24CONFIGURE_ARGS+= --enable-dct
26CONFIGURE_ARGS+= --enable-mdct 25CONFIGURE_ARGS+= --enable-mdct
27CONFIGURE_ARGS+= --enable-rdft 26CONFIGURE_ARGS+= --enable-rdft
28 27
29INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 28INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
30 29
31do-install: 30do-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"