Tue Dec 30 13:47:58 2014 UTC ()
Update to 1.2.11:

1.2.11 was released on 2014-12-19. It is the latest stable FFmpeg
release from the 1.2 release branch, which was cut from master on
2013-03-07. Amongst lots of other changes, it includes all changes
from ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07.


(wiz)
diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg1/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg1/Makefile.common
diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg1/distinfo
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg1/Attic/Makefile (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2014/12/03 16:44:14 1.3
+++ pkgsrc/multimedia/ffmpeg1/Attic/Makefile 2014/12/30 13:47:58 1.4
@@ -1,56 +1,55 @@ @@ -1,56 +1,55 @@
1# $NetBSD: Makefile,v 1.3 2014/12/03 16:44:14 bouyer Exp $ 1# $NetBSD: Makefile,v 1.4 2014/12/30 13:47:58 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/}
4PKGREVISION= 1 
5MAINTAINER= pkgsrc-users@NetBSD.org 4MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 5HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software (v1.x) 6COMMENT= Decoding, encoding and streaming software (v1.x)
8 7
9CONFIGURE_ARGS+= --enable-avfilter 8CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 9#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 10CONFIGURE_ARGS+= --enable-postproc
12 11
13INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1 12INSTALLATION_DIRS= lib share/examples/ffmpeg1 share/doc/ffmpeg1
14 13
15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \ 14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg1/ffserver.conf \
16 ${PKG_SYSCONFDIR}/ffserver.conf 15 ${PKG_SYSCONFDIR}/ffserver.conf
17 16
18# Needs to come before bsd.prefs.mk or compiler.mk, USE_LIBTOOL is set too late. 17# Needs to come before bsd.prefs.mk or compiler.mk, USE_LIBTOOL is set too late.
19USE_GCC_RUNTIME= yes 18USE_GCC_RUNTIME= yes
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22 21
23.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 22.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
24CONFIGURE_ARGS+= --enable-cross-compile 23CONFIGURE_ARGS+= --enable-cross-compile
25CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} 24CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS}
26CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} 25CONFIGURE_ARGS+= --arch=${MACHINE_ARCH}
27CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} 26CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q}
28CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} 27CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
29.endif 28.endif
30 29
31TEST_TARGET= check 30TEST_TARGET= check
32 31
33post-install: 32post-install:
34 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \ 33 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
35 ${DESTDIR}${PREFIX}/share/doc/ffmpeg1 34 ${DESTDIR}${PREFIX}/share/doc/ffmpeg1
36 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ 35 ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
37 ${DESTDIR}${PREFIX}/share/examples/ffmpeg1 36 ${DESTDIR}${PREFIX}/share/examples/ffmpeg1
38 37
39.include "options.mk" 38.include "options.mk"
40 39
41.include "../../mk/compiler.mk" 40.include "../../mk/compiler.mk"
42 41
43# disable asm on i386 for non-gcc and gcc < 4.2 42# disable asm on i386 for non-gcc and gcc < 4.2
44.if ${MACHINE_ARCH} == "i386" 43.if ${MACHINE_ARCH} == "i386"
45. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ 44. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
46 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \ 45 || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
47 || !empty(CC_VERSION:Mgcc-[123]*) \ 46 || !empty(CC_VERSION:Mgcc-[123]*) \
48 || !empty(CC_VERSION:Mgcc-4.[01].*) \ 47 || !empty(CC_VERSION:Mgcc-4.[01].*) \
49 || empty(CC_VERSION:Mgcc*) 48 || empty(CC_VERSION:Mgcc*)
50CONFIGURE_ARGS+= --disable-asm 49CONFIGURE_ARGS+= --disable-asm
51. elif !empty(CC_VERSION:Mgcc-4.*) 50. elif !empty(CC_VERSION:Mgcc-4.*)
52CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 51CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4
53. endif 52. endif
54.endif 53.endif
55 54
56.include "../../multimedia/ffmpeg1/Makefile.common" 55.include "../../multimedia/ffmpeg1/Makefile.common"
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common 2014/11/10 15:38:22 1.4
+++ pkgsrc/multimedia/ffmpeg1/Attic/Makefile.common 2014/12/30 13:47:58 1.5
@@ -1,86 +1,86 @@ @@ -1,86 +1,86 @@
1# $NetBSD: Makefile.common,v 1.4 2014/11/10 15:38:22 adam Exp $ 1# $NetBSD: Makefile.common,v 1.5 2014/12/30 13:47:58 wiz Exp $
2# used by multimedia/ffplay1/Makefile 2# used by multimedia/ffplay1/Makefile
3# used by multimedia/ffmpeg1/Makefile 3# used by multimedia/ffmpeg1/Makefile
4 4
5DISTNAME= ffmpeg-1.2.10 5DISTNAME= ffmpeg-1.2.11
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 12PREV_PKGPATH= multimedia/ffmpeg
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg1/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg1/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+= --mandir=${PREFIX}/${PKGMANDIR} 19CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
20CONFIGURE_ARGS+= --cc=${CC:Q} 20CONFIGURE_ARGS+= --cc=${CC:Q}
21CONFIGURE_ARGS+= --prefix=${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX}
22CONFIGURE_ARGS+= --disable-debug 22CONFIGURE_ARGS+= --disable-debug
23CONFIGURE_ARGS+= --disable-optimizations 23CONFIGURE_ARGS+= --disable-optimizations
24CONFIGURE_ARGS+= --disable-stripping 24CONFIGURE_ARGS+= --disable-stripping
25CONFIGURE_ARGS+= --enable-shared 25CONFIGURE_ARGS+= --enable-shared
26CONFIGURE_ARGS+= --enable-pthreads 26CONFIGURE_ARGS+= --enable-pthreads
27CONFIGURE_ARGS+= --enable-gpl 27CONFIGURE_ARGS+= --enable-gpl
28 28
29CONFIGURE_ARGS+= --progs-suffix=1 29CONFIGURE_ARGS+= --progs-suffix=1
30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg1 30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg1
31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg1 31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg1
32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg1 32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg1
33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg1 33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg1
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg1 34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg1
35 35
36.if ${OPSYS} == "SunOS" 36.if ${OPSYS} == "SunOS"
37CONFIGURE_ARGS+= --disable-asm 37CONFIGURE_ARGS+= --disable-asm
38.else 38.else
39CONFIGURE_ARGS+= --enable-runtime-cpudetect 39CONFIGURE_ARGS+= --enable-runtime-cpudetect
40.endif 40.endif
41 41
42# No posix_memalign() in NetBSD 4.0 and earlier 42# No posix_memalign() in NetBSD 4.0 and earlier
43.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) 43.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
44CONFIGURE_ARGS+= --enable-memalign-hack 44CONFIGURE_ARGS+= --enable-memalign-hack
45.endif 45.endif
46 46
47# Let's not put garbage into /tmp 47# Let's not put garbage into /tmp
48CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp 48CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
49 49
50.include "../../mk/compiler.mk" 50.include "../../mk/compiler.mk"
51 51
52.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*) 52.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
53SUBST_CLASSES+= sunwspro 53SUBST_CLASSES+= sunwspro
54SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 54SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
55SUBST_STAGE.sunwspro= post-configure 55SUBST_STAGE.sunwspro= post-configure
56SUBST_FILES.sunwspro= config.mak 56SUBST_FILES.sunwspro= config.mak
57SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 57SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
58SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 58SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
59SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 59SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
60SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" 60SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
61.endif 61.endif
62 62
63BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm 63BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm
64 64
65REPLACE_PERL+= doc/texi2pod.pl 65REPLACE_PERL+= doc/texi2pod.pl
66REPLACE_SH+= configure version.sh 66REPLACE_SH+= configure version.sh
67 67
68SUBST_CLASSES+= conf 68SUBST_CLASSES+= conf
69SUBST_STAGE.conf= post-patch 69SUBST_STAGE.conf= post-patch
70SUBST_FILES.conf= ffserver.c 70SUBST_FILES.conf= ffserver.c
71SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 71SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
72SUBST_MESSAGE.conf= Fixing configuration path. 72SUBST_MESSAGE.conf= Fixing configuration path.
73 73
74PLIST_SRC+= ${PKGDIR}/PLIST 74PLIST_SRC+= ${PKGDIR}/PLIST
75 75
76MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 76MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
77# LOCALBASE=${LOCALBASE:Q} 77# LOCALBASE=${LOCALBASE:Q}
78 78
79pre-configure: 79pre-configure:
80 mkdir ${WRKSRC}/tmp 80 mkdir ${WRKSRC}/tmp
81 81
82.include "../../mk/pthread.buildlink3.mk" 82.include "../../mk/pthread.buildlink3.mk"
83.include "../../archivers/bzip2/buildlink3.mk" 83.include "../../archivers/bzip2/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 "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg1/Attic/distinfo (switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2014/12/03 16:44:14 1.5
+++ pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2014/12/30 13:47:58 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2014/12/03 16:44:14 bouyer Exp $ 1$NetBSD: distinfo,v 1.6 2014/12/30 13:47:58 wiz Exp $
2 2
3SHA1 (ffmpeg-1.2.10.tar.bz2) = 8e6d59b87b3390facef624ba3e531726de3ef11b 3SHA1 (ffmpeg-1.2.11.tar.bz2) = a4564ee2218565c1b9370cef73e3c90f701c4470
4RMD160 (ffmpeg-1.2.10.tar.bz2) = 56b8f285748c52da8ef9c27cad1ace1aa55ef19e 4RMD160 (ffmpeg-1.2.11.tar.bz2) = e091ff0d7d056e22f727da2950d96aa28fbba028
5Size (ffmpeg-1.2.10.tar.bz2) = 5972429 bytes 5Size (ffmpeg-1.2.11.tar.bz2) = 5971961 bytes
6SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d 6SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
7SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 7SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
8SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 8SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
9SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14 9SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14
10SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a 10SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a