Sun Nov 2 08:10:30 2014 UTC ()
Changes 2.4.3:
* avcodec/h264_slice: Clear table pointers to avoid stale pointers
* avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c
* avcodec/h264: simplify find_start_code()
* Move get_avc_nalsize() and find_start_code() to h264.h
* mpeg4vdpau: Fix priv data size.
* avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps
* avformat/options_table: add FF_COMPLIANCE_UNOFFICIAL
* Stop demuxing wtv on eof.


(adam)
diff -r1.23 -r1.24 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg2/distinfo
cvs diff -r1.23 -r1.24 pkgsrc/multimedia/ffmpeg2/Makefile.common (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2014/10/05 14:47:10 1.23
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2014/11/02 08:10:29 1.24
@@ -1,93 +1,93 @@ @@ -1,93 +1,93 @@
1# $NetBSD: Makefile.common,v 1.23 2014/10/05 14:47:10 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.24 2014/11/02 08:10:29 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.4.2 5DISTNAME= ffmpeg-2.4.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[23456789].*-*) 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.21 -r1.22 pkgsrc/multimedia/ffmpeg2/distinfo (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/distinfo 2014/10/05 14:47:10 1.21
+++ pkgsrc/multimedia/ffmpeg2/distinfo 2014/11/02 08:10:29 1.22
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.21 2014/10/05 14:47:10 wiz Exp $ 1$NetBSD: distinfo,v 1.22 2014/11/02 08:10:29 adam Exp $
2 2
3SHA1 (ffmpeg-2.4.2.tar.bz2) = 8fedc6f235d8510f716bca1784faa8cbe5d9cf78 3SHA1 (ffmpeg-2.4.3.tar.bz2) = a2f05df7ea3e65ede2898e055b0c6615accfb1b3
4RMD160 (ffmpeg-2.4.2.tar.bz2) = 5cc0a5a36f3b4ab833d082f88bb2dba38f6550aa 4RMD160 (ffmpeg-2.4.3.tar.bz2) = 12fd8144d70f29f0ac43a2153b9b9056bfcd9cce
5Size (ffmpeg-2.4.2.tar.bz2) = 7367100 bytes 5Size (ffmpeg-2.4.3.tar.bz2) = 7369986 bytes
6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
7SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c 7SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c
8SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 8SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
9SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 9SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
10SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f 10SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f