pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Update ffmpeg to 0.4.9pre1, and add ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5d343480d531
branches: trunk
changeset: 508192:5d343480d531
user: abs <abs%pkgsrc.org@localhost>
date: Thu Feb 16 10:26:30 2006 +0000
description:
Update ffmpeg to 0.4.9pre1, and add patch for libavcodec buffer overflow
http://secunia.com/advisories/17892/
version 0.4.9-pre1:
- DV encoder, DV muxer
- Microsoft RLE video decoder
- Microsoft Video-1 decoder
- Apple Animation (RLE) decoder
- Apple Graphics (SMC) decoder
- Apple Video (RPZA) decoder
- Cinepak decoder
- Sega FILM (CPK) file demuxer
- Westwood multimedia support (VQA & AUD files)
- Id Quake II CIN playback support
- 8BPS video decoder
- FLIC playback support
- RealVideo 2.0 (RV20) decoder
- Duck TrueMotion v1 (DUCK) video decoder
- Sierra VMD demuxer and video decoder
- MSZH and ZLIB decoder support
- SVQ1 video encoder
- AMR-WB support
- PPC optimisations
- rate distortion optimal cbp support
- rate distorted optimal ac prediction for mpeg4
- rate distorted optimal lambda->qp support
- AAC encoding with libfaac
- Sunplus JPEG codec (SP5X) support
- use lagrange multipler instead of qp for ratecontrol
- theora/VP3 decoding support
- XA and ADX ADPCM codecs
- export mpeg2 active display area / pan scan
- Add support for configuring with IBM XLC
- floating point AAN DCT
- initial support for zygovideo (not complete)
- rgb ffv1 support
- new audio/video parser API
- av_log() system
- av_read_frame() and av_seek_frame() support
- missing last frame fixes
- seek by mouse in ffplay
- noise reduction of dct coefficients
- h263 OBMC & 4MV support
- h263 alternative inter vlc support
- h263 loop filter
- h263 slice structured mode
- interlaced DCT support for MPEG2 encoding
- stuffing to stay above min_bitrate
- mb type & qp vissualization
- frame stepping for ffplay
- interlaced motion estimation
- alternate scantable support
- SVCD scan offset support
- closed gop support
- SSE2 fdct
- quantizer noise shaping
- G.726 ADPCM audio codec
- MS ADPCM encoding
- multithreaded/SMP motion estimation
- multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263
- multithreaded/SMP decoding for MPEG2
- FLAC decoder
- Metrowerks CodeWarrior suppport
- h263+ custom pcf support
- nicer output for 'ffmpeg -formats'
- matroska demuxer
- SGI image format, encoding and decoding
- h264 loop filter support
- h264 CABAC support
- nicer looking arrows for the motion vector vissualization
- improved VCD support
- audio timestamp drift compensation
- mpeg2 YUV 422/444 support
- polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample
- better image scaling
- h261 support
- correctly interleave packets during encoding
- VIS optimized motion compensation
- intra_dc_precission>0 encoding support
- support reuse of motion vectors/mb types/field select values of the source video
- more accurate deblock filter
- padding support
- many optimizations and bugfixes
diffstat:
multimedia/ffmpeg/Makefile | 78 ++++++--------------------
multimedia/ffmpeg/PLIST | 10 +--
multimedia/ffmpeg/buildlink3.mk | 6 +-
multimedia/ffmpeg/distinfo | 18 +++---
multimedia/ffmpeg/options.mk | 96 +++++++++++++++++++++++++++++++++
multimedia/ffmpeg/patches/patch-aa | 20 +-----
multimedia/ffmpeg/patches/patch-ab | 2 +-
multimedia/ffmpeg/patches/patch-ac | 39 +++++++-----
multimedia/ffmpeg/patches/patch-ad | 22 +++---
multimedia/ffmpeg/patches/patch-ae | 2 +-
multimedia/ffmpeg/patches/patch-af | 106 +++++++++++++++++++++++++++---------
multimedia/ffmpeg/patches/patch-ag | 10 +-
12 files changed, 254 insertions(+), 155 deletions(-)
diffs (truncated from 647 to 300 lines):
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile Thu Feb 16 08:24:11 2006 +0000
+++ b/multimedia/ffmpeg/Makefile Thu Feb 16 10:26:30 2006 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/02/16 10:26:30 abs Exp $
-DISTNAME= ffmpeg-0.4.8
-PKGREVISION= 4
-CATEGORIES= multimedia net
+DISTNAME= ffmpeg-0.4.9-pre1
+PKGNAME= ffmpeg-0.4.9pre1
+CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
-MAINTAINER= tech-pkg%NetBSD.org@localhost
+MAINTAINER= zul%NetBSD-fr.org@localhost
HOMEPAGE= http://ffmpeg.sourceforge.net/
COMMENT= MPEG decoding, encoding and streaming software
@@ -13,46 +13,23 @@
USE_TOOLS+= gmake
USE_LIBTOOL= YES
+CONFLICTS+= ffmpeg-devel-[0-9]*
+
+REPLACE_PERL= doc/texi2pod.pl
+
CONF_FILES= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
${PKG_SYSCONFDIR}/ffserver.conf
-MAKE_ENV+= EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \
- FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \
+MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \
+ FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
LOCALBASE=${LOCALBASE:Q}
-CONFIGURE_ARGS+= --cc=${CC:Q}
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --enable-pp
-CONFIGURE_ARGS+= --disable-vhook
-CONFIGURE_ARGS+= --disable-debug
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis
-
-.include "../../mk/bsd.options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../mk/compiler.mk"
+CONFIGURE_ARGS= --cc=${CC:Q} --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --enable-pp --disable-vhook --disable-debug
+CONFIGURE_ARGS+= --enable-gpl
+CONFIGURE_ARGS+= --enable-ffplay
-.if !empty(MACHINE_ARCH:Mi386)
-. if !empty(PKG_OPTIONS:Mmmx) && !empty(CC_VERSION:Mgcc*)
-CFLAGS+= -fomit-frame-pointer
-. else
-CONFIGURE_ARGS+= --disable-mmx
-. endif
-.else
-CONFIGURE_ARGS+= --disable-mmx
-.endif
-
-.if !empty(PKG_OPTIONS:Mbktr)
-post-extract:
- ${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat
-
-post-patch:
- ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
- ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/ffmpeg.1.diff
-.endif
+.include "options.mk"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ffmpeg \
@@ -62,30 +39,15 @@
${PREFIX}/share/doc/ffmpeg
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
${PREFIX}/share/doc/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt \
- ${PREFIX}/share/doc/ffmpeg
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/ffmpeg
${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
${PREFIX}/share/examples/ffmpeg
# ffplay not installed
- ${RM} ${PREFIX}/man/man1/ffplay.1
+ if [ -f ${PREFIX}/man/man1/ffplay.1 ]; then \
+ ${RM} ${PREFIX}/man/man1/ffplay.1 ; \
+ fi
${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
${PREFIX}/include/ffmpeg/libpostproc
.include "../../devel/libgetopt/buildlink3.mk"
-
-.if !empty(PKG_OPTIONS:Mlame)
-CONFIGURE_ARGS+= --enable-mp3lame
-.include "../../audio/lame/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-mp3lame
-.endif
-
-.if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+= --enable-vorbis
-.include "../../audio/libvorbis/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-vorbis
-.endif
-
-.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST Thu Feb 16 08:24:11 2006 +0000
+++ b/multimedia/ffmpeg/PLIST Thu Feb 16 10:26:30 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/02/16 10:26:30 abs Exp $
bin/ffmpeg
bin/ffserver
include/ffmpeg/avcodec.h
@@ -6,22 +6,16 @@
include/ffmpeg/avio.h
include/ffmpeg/common.h
include/ffmpeg/libpostproc/postprocess.h
+include/ffmpeg/rational.h
include/ffmpeg/rtp.h
include/ffmpeg/rtsp.h
include/ffmpeg/rtspcodes.h
lib/libavcodec.la
lib/libavformat.la
-man/man1/ffmpeg.1
-man/man1/ffserver.1
share/doc/ffmpeg/README
share/doc/ffmpeg/TODO
share/doc/ffmpeg/apiexample.c
-share/doc/ffmpeg/faq.html
-share/doc/ffmpeg/ffmpeg-doc.html
share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
-share/doc/ffmpeg/ffplay-doc.html
-share/doc/ffmpeg/ffserver-doc.html
-share/doc/ffmpeg/hooks.html
share/doc/ffmpeg/optimization.txt
share/examples/ffmpeg/ffserver.conf
@dirrm share/examples/ffmpeg
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/buildlink3.mk
--- a/multimedia/ffmpeg/buildlink3.mk Thu Feb 16 08:24:11 2006 +0000
+++ b/multimedia/ffmpeg/buildlink3.mk Thu Feb 16 10:26:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/16 10:26:30 abs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFMPEG_BUILDLINK3_MK:= ${FFMPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@
BUILDLINK_PACKAGES+= ffmpeg
.if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg+= ffmpeg>=0.4.8
-BUILDLINK_RECOMMENDED.ffmpeg+= ffmpeg>=0.4.8nb4
+BUILDLINK_DEPENDS.ffmpeg+= ffmpeg>=0.4.9pre1
+BUILDLINK_RECOMMENDED.ffmpeg?= ffmpeg>=0.4.9pre1nb1
BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
.endif # FFMPEG_BUILDLINK3_MK
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo Thu Feb 16 08:24:11 2006 +0000
+++ b/multimedia/ffmpeg/distinfo Thu Feb 16 10:26:30 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2005/12/28 16:20:05 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/02/16 10:26:30 abs Exp $
-SHA1 (ffmpeg-0.4.8.tar.gz) = 629a0f8f4daa3da1dedd8ba58bfdec4c47581bb4
-RMD160 (ffmpeg-0.4.8.tar.gz) = 8196b92b16506ddd848410c20407a7416011447e
-Size (ffmpeg-0.4.8.tar.gz) = 1352874 bytes
-SHA1 (patch-aa) = 2da10440ebe9c6280235d67bb4a3ba4cf2c95e45
+SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
+RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
+Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes
+SHA1 (patch-aa) = acc31f2c428411f912750e05703f5cad506c12bc
SHA1 (patch-ab) = f596db3c555ab772eae2da5b8144c23fb4f2eaa0
-SHA1 (patch-ac) = 6f137ca14131e00c2db89cbe44657f32f3513e98
-SHA1 (patch-ad) = e058ddcb0ad4211c16d2f4c5fe0859723316b3a8
+SHA1 (patch-ac) = 2e7aa9021ddfe46cda35a9399e59f63848610d83
+SHA1 (patch-ad) = 95eea8ef74a270a0c60243eff740aa3346efaaaf
SHA1 (patch-ae) = 7223978301c95de96d19610afb332f10764c4de0
-SHA1 (patch-af) = 6e245cee0c49bc9a829bc9caf5fad5f887da8e3c
-SHA1 (patch-ag) = 975f7dac2488f367083cf4375b862fe8e3f4daf6
+SHA1 (patch-af) = 82f7e656ab01320235c85e98ec4c57277956ceb8
+SHA1 (patch-ag) = 69656d16d44d3321bdf9b790e6263db1529d2c99
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg/options.mk Thu Feb 16 10:26:30 2006 +0000
@@ -0,0 +1,96 @@
+# $NetBSD options.mk $
+
+# Global and legacy options
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52
+
+.include "../../mk/bsd.options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+###
+### MMX support
+###
+
+.include "../../mk/compiler.mk"
+
+.if !empty(MACHINE_ARCH:Mi386)
+. if !empty(PKG_OPTIONS:Mmmx) && !empty(CC_VERSION:Mgcc*)
+CFLAGS+= -fomit-frame-pointer
+. else
+CONFIGURE_ARGS+= --disable-mmx
+. endif
+.else
+CONFIGURE_ARGS+= --disable-mmx
+.endif
+
+###
+### bktr options
+###
+
+.if !empty(PKG_OPTIONS:Mbktr)
+post-extract:
+ ${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat
+
+post-patch:
+ ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
+#TODO
+#Update the documentation
+# ${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/ffmpeg.1.diff
+.endif
+
+###
+### using lame option
+###
+
+.if !empty(PKG_OPTIONS:Mlame)
+CONFIGURE_ARGS+= --enable-mp3lame
+.include "../../audio/lame/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-mp3lame
+.endif
+
+###
+### using vorbis option
+###
+
+.if !empty(PKG_OPTIONS:Mvorbis)
+CONFIGURE_ARGS+= --enable-vorbis
+.include "../../audio/libvorbis/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-vorbis
+.endif
+
+###
+### faad option
+###
+
+.if !empty(PKG_OPTIONS:Mfaad)
+CONFIGURE_ARGS+= --enable-faad
+.include "../../audio/faad2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-faad
+.endif
+
+###
+### faac option
+###
+
+.if !empty(PKG_OPTIONS:Mfaac)
+CONFIGURE_ARGS+= --enable-faac
+.include "../../audio/faac/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-faac
+.endif
+
+###
+### a52 option
+###
+
+.if !empty(PKG_OPTIONS:Ma52)
+CONFIGURE_ARGS+= --enable-a52
+.include "../../audio/liba52/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-a52
+.endif
diff -r 32717552dec1 -r 5d343480d531 multimedia/ffmpeg/patches/patch-aa
--- a/multimedia/ffmpeg/patches/patch-aa Thu Feb 16 08:24:11 2006 +0000
+++ b/multimedia/ffmpeg/patches/patch-aa Thu Feb 16 10:26:30 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/12/28 16:20:05 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2006/02/16 10:26:30 abs Exp $
---- configure.orig 2003-09-28 15:26:39.000000000 +0000
+--- configure.orig 2004-11-28 16:56:25.000000000 +0100
Home |
Main Index |
Thread Index |
Old Index