pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Update to nightly the snapshot as of...
details: https://anonhg.NetBSD.org/pkgsrc/rev/14b8c440448a
branches: trunk
changeset: 560425:14b8c440448a
user: ahoka <ahoka%pkgsrc.org@localhost>
date: Fri Jun 12 16:25:34 2009 +0000
description:
Update to nightly the snapshot as of 2009-06-11.
Also modularize a bit, so we can have a separate ffplay package.
Too many changes to list them.
diffstat:
multimedia/ffmpeg/Makefile | 84 ++++----------------
multimedia/ffmpeg/PLIST | 51 ++++++++----
multimedia/ffmpeg/distinfo | 19 +---
multimedia/ffmpeg/options.mk | 12 +-
multimedia/ffmpeg/patches/patch-4xm | 22 -----
multimedia/ffmpeg/patches/patch-bktr | 25 +++--
multimedia/ffmpeg/patches/patch-configure | 64 ----------------
multimedia/ffmpeg/patches/patch-imgconvert.c | 18 ----
multimedia/ffmpeg/patches/patch-libavcodec_Makefile | 12 ---
multimedia/ffmpeg/patches/patch-mem.c | 42 ----------
multimedia/ffmpeg/patches/patch-oldx246 | 46 -----------
multimedia/ffmpeg/patches/patch-r14477 | 16 ----
multimedia/ffmpeg/patches/patch-v4l2 | 20 -----
13 files changed, 77 insertions(+), 354 deletions(-)
diffs (truncated from 582 to 300 lines):
diff -r 3b2830452459 -r 14b8c440448a multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile Fri Jun 12 16:18:46 2009 +0000
+++ b/multimedia/ffmpeg/Makefile Fri Jun 12 16:25:34 2009 +0000
@@ -1,82 +1,34 @@
-# $NetBSD: Makefile,v 1.49 2009/05/02 16:21:44 reed Exp $
-
-DISTNAME= ffmpeg-${DISTVERSION}
-PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
-PKGREVISION= 8
-CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_FREEBSD}
-EXTRACT_SUFX= .tar.bz2
+# $NetBSD: Makefile,v 1.50 2009/06/12 16:25:34 ahoka Exp $
MAINTAINER= ahoka%NetBSD.org@localhost
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
-COMMENT= MPEG decoding, encoding and streaming software
+COMMENT= Decoding, encoding and streaming software
-DISTVERSION= 2008-07-27
PKG_DESTDIR_SUPPORT= user-destdir
-PREV_PKGPATH= multimedia/ffmpeg-devel
-
-HAS_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake texi2html pod2man
-REPLACE_PERL+= doc/texi2pod.pl
+CONFIGURE_ARGS+= --enable-avfilter \
+ --enable-avfilter-lavf \
+ --enable-postproc \
+ --enable-libvorbis \
+ --enable-libmp3lame
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= post-patch
-SUBST_FILES.conf= ffserver.c
-SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
-SUBST_MESSAGE.conf= Fixing configuration path.
-
-CONFLICTS+= ffmpeg-devel-[0-9]*
-
-PLIST_SRC+= ${PKGDIR}/PLIST
+INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
${PKG_SYSCONFDIR}/ffserver.conf
-MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
-# LOCALBASE=${LOCALBASE:Q}
-
-# Let's not put garbage into /tmp
-CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
-
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \
- --cc=${CC:Q} \
- --prefix=${PREFIX:Q} \
- --disable-debug \
- --disable-vhook \
- --enable-avfilter \
- --enable-gpl \
- --enable-postproc \
- --enable-pthreads \
- --enable-shared \
- --enable-swscale \
- --enable-libvorbis \
- --enable-libmp3lame \
- --disable-stripping
-
-# causes complaining about being miscompiled
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CONFIGURE_ARGS+= --disable-mmx \
- --disable-mmx2 \
- --disable-ssse3
-.endif
-
-INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/libavcodec/api-example.c \
+ ${DESTDIR}${PREFIX}/share/doc/ffmpeg
+ ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
+ ${DESTDIR}${PREFIX}/share/doc/ffmpeg
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
+ ${DESTDIR}${PREFIX}/share/doc/ffmpeg
+ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
+ ${DESTDIR}${PREFIX}/share/examples/ffmpeg
.include "options.mk"
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
- ${DESTDIR}${PREFIX}/share/doc/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
- ${DESTDIR}${PREFIX}/share/doc/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
- ${DESTDIR}${PREFIX}/share/examples/ffmpeg
-
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../multimedia/ffmpeg/Makefile.common"
diff -r 3b2830452459 -r 14b8c440448a multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST Fri Jun 12 16:18:46 2009 +0000
+++ b/multimedia/ffmpeg/PLIST Fri Jun 12 16:25:34 2009 +0000
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.11 2009/04/07 19:29:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/12 16:25:34 ahoka Exp $
bin/ffmpeg
bin/ffserver
-${PLIST.sdl}bin/ffplay
-${PLIST.sdl}man/man1/ffplay.1
include/libavcodec/avcodec.h
include/libavcodec/opt.h
+include/libavcodec/vdpau.h
+include/libavcodec/xvmc.h
include/libavdevice/avdevice.h
include/libavfilter/avfilter.h
include/libavformat/avformat.h
include/libavformat/avio.h
-include/libavformat/rtsp.h
-include/libavformat/rtspcodes.h
include/libavutil/adler32.h
include/libavutil/avstring.h
include/libavutil/avutil.h
@@ -24,40 +22,39 @@
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
-include/libavutil/random.h
+include/libavutil/pixfmt.h
include/libavutil/rational.h
include/libavutil/sha1.h
include/libpostproc/postprocess.h
-include/libswscale/rgb2rgb.h
include/libswscale/swscale.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.51
-lib/libavcodec.so.51.61.0
+lib/libavcodec.so.52
+lib/libavcodec.so.52.30.2
lib/libavdevice.a
lib/libavdevice.so
lib/libavdevice.so.52
-lib/libavdevice.so.52.0.0
+lib/libavdevice.so.52.2.0
lib/libavfilter.a
lib/libavfilter.so
lib/libavfilter.so.0
-lib/libavfilter.so.0.0.0
+lib/libavfilter.so.0.5.0
lib/libavformat.a
lib/libavformat.so
lib/libavformat.so.52
-lib/libavformat.so.52.18.0
+lib/libavformat.so.52.34.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.49
-lib/libavutil.so.49.7.0
+lib/libavutil.so.50
+lib/libavutil.so.50.3.0
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.51
-lib/libpostproc.so.51.1.0
+lib/libpostproc.so.51.2.0
lib/libswscale.a
lib/libswscale.so
lib/libswscale.so.0
-lib/libswscale.so.0.5.1
+lib/libswscale.so.0.7.1
lib/pkgconfig/libavcodec.pc
lib/pkgconfig/libavdevice.pc
lib/pkgconfig/libavfilter.pc
@@ -69,14 +66,34 @@
man/man1/ffserver.1
share/doc/ffmpeg/README
share/doc/ffmpeg/TODO
-share/doc/ffmpeg/apiexample.c
+share/doc/ffmpeg/api-example.c
share/doc/ffmpeg/avutil.txt
share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
share/doc/ffmpeg/issue_tracker.txt
share/doc/ffmpeg/optimization.txt
+share/doc/ffmpeg/rate_distortion.txt
share/doc/ffmpeg/snow.txt
share/doc/ffmpeg/soc.txt
+share/doc/ffmpeg/swscale.txt
+share/doc/ffmpeg/viterbi.txt
share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/libx264-baseline.ffpreset
+share/ffmpeg/libx264-default.ffpreset
+share/ffmpeg/libx264-fastfirstpass.ffpreset
+share/ffmpeg/libx264-hq.ffpreset
+share/ffmpeg/libx264-ipod320.ffpreset
+share/ffmpeg/libx264-ipod640.ffpreset
+share/ffmpeg/libx264-lossless_fast.ffpreset
+share/ffmpeg/libx264-lossless_max.ffpreset
+share/ffmpeg/libx264-lossless_medium.ffpreset
+share/ffmpeg/libx264-lossless_slow.ffpreset
+share/ffmpeg/libx264-lossless_slower.ffpreset
+share/ffmpeg/libx264-lossless_ultrafast.ffpreset
+share/ffmpeg/libx264-main.ffpreset
+share/ffmpeg/libx264-max.ffpreset
+share/ffmpeg/libx264-normal.ffpreset
+share/ffmpeg/libx264-slowfirstpass.ffpreset
+@dirrm share/ffmpeg
@dirrm share/examples/ffmpeg
@dirrm share/doc/ffmpeg
@dirrm include/libswscale
diff -r 3b2830452459 -r 14b8c440448a multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo Fri Jun 12 16:18:46 2009 +0000
+++ b/multimedia/ffmpeg/distinfo Fri Jun 12 16:25:34 2009 +0000
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.22 2009/01/29 15:02:13 tron Exp $
+$NetBSD: distinfo,v 1.23 2009/06/12 16:25:34 ahoka Exp $
-SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479
-RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977
-Size (ffmpeg-2008-07-27.tar.bz2) = 2581976 bytes
-SHA1 (patch-4xm) = 179f817eae8bb2ac122a2f451e13ddb22e4c23c5
-SHA1 (patch-bktr) = dddf7149810d227f531e5a198445fc0d1893bece
-SHA1 (patch-configure) = 747593b082f428ac1f79c6d9cad8773326351a83
-SHA1 (patch-imgconvert.c) = 3c0a9f98ddb767db6f46a02fc64451c0a79b1cbc
-SHA1 (patch-libavcodec_Makefile) = 14a31e2ea9080aa1cc3999e3fbb745018ac5e4de
-SHA1 (patch-mem.c) = b31dd3c0a53da58be34e5f6c0cbf36454649a85f
-SHA1 (patch-oldx246) = 730c503422727fe4b38353f5896ce62ee6f12ebe
-SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999
-SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6
+SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
+RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
+Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
+SHA1 (patch-aa) = dadd96835ffbf3a95a5de75647a72edb53171b6f
+SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
diff -r 3b2830452459 -r 14b8c440448a multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk Fri Jun 12 16:18:46 2009 +0000
+++ b/multimedia/ffmpeg/options.mk Fri Jun 12 16:25:34 2009 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: options.mk,v 1.11 2008/09/15 21:24:00 sborrill Exp $
+# $NetBSD: options.mk,v 1.12 2009/06/12 16:25:34 ahoka Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac x264
-PKG_SUGGESTED_OPTIONS= faac theora xvid x264
+PKG_SUPPORTED_OPTIONS= theora xvid faad faac x264
+PKG_SUGGESTED_OPTIONS= theora xvid x264
#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
#PKG_OPTIONS_GROUP.aac-decoder= faad faac
.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+= sdl swscale
-
###
### faad option
###
@@ -22,13 +20,13 @@
.include "../../audio/faad2/buildlink3.mk"
.endif
-
###
### faac option
###
.if !empty(PKG_OPTIONS:Mfaac)
-CONFIGURE_ARGS+= --enable-libfaac
+CONFIGURE_ARGS+= --enable-libfaac \
+ --enable-nonfree
.include "../../audio/faac/buildlink3.mk"
.endif
diff -r 3b2830452459 -r 14b8c440448a multimedia/ffmpeg/patches/patch-4xm
--- a/multimedia/ffmpeg/patches/patch-4xm Fri Jun 12 16:18:46 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-4xm,v 1.1 2009/01/29 15:02:13 tron Exp $
-
-Patch for buffer overflow based on this change:
-http://svn.ffmpeg.org/ffmpeg/trunk/libavformat/4xm.c?r1=16838&r2=16846
-
---- libavformat/4xm.c.orig 2009-01-29 14:33:19.000000000 +0000
-+++ libavformat/4xm.c 2009-01-29 14:37:44.000000000 +0000
-@@ -163,10 +163,12 @@
- return AVERROR_INVALIDDATA;
- }
- current_track = AV_RL32(&header[i + 8]);
-+ if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
-+ av_log(s, AV_LOG_ERROR, "current_track too large\n");
-+ return -1;
-+ }
- if (current_track + 1 > fourxm->track_count) {
- fourxm->track_count = current_track + 1;
Home |
Main Index |
Thread Index |
Old Index