pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Track FreeBSD's SVN snapshots of ffm...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dc3e6ab83c0b
branches: trunk
changeset: 546791:dc3e6ab83c0b
user: ahoka <ahoka%pkgsrc.org@localhost>
date: Sun Sep 07 23:39:37 2008 +0000
description:
Track FreeBSD's SVN snapshots of ffmpeg as there are no more stable
releases produced by the ffmpeg team.
Add v4l2 support for NetBSD.
diffstat:
multimedia/ffmpeg/Makefile | 71 ++++--
multimedia/ffmpeg/PLIST | 85 ++++++-
multimedia/ffmpeg/PLIST.sdl | 2 +
multimedia/ffmpeg/buildlink3.mk | 45 +++-
multimedia/ffmpeg/distinfo | 26 +-
multimedia/ffmpeg/files/bktr.diff | 23 --
multimedia/ffmpeg/files/ffmpeg.1.diff | 61 -----
multimedia/ffmpeg/files/grab_bsdbktr.c | 340 ------------------------------
multimedia/ffmpeg/options.mk | 114 +++------
multimedia/ffmpeg/patches/patch-aa | 35 ---
multimedia/ffmpeg/patches/patch-ab | 22 -
multimedia/ffmpeg/patches/patch-ac | 125 -----------
multimedia/ffmpeg/patches/patch-ad | 75 ------
multimedia/ffmpeg/patches/patch-ae | 77 ------
multimedia/ffmpeg/patches/patch-af | 80 -------
multimedia/ffmpeg/patches/patch-ag | 194 -----------------
multimedia/ffmpeg/patches/patch-ah | 18 -
multimedia/ffmpeg/patches/patch-ai | 19 -
multimedia/ffmpeg/patches/patch-aj | 60 -----
multimedia/ffmpeg/patches/patch-ak | 17 -
multimedia/ffmpeg/patches/patch-al | 52 ----
multimedia/ffmpeg/patches/patch-an | 21 -
multimedia/ffmpeg/patches/patch-ao | 13 -
multimedia/ffmpeg/patches/patch-bktr | 13 +
multimedia/ffmpeg/patches/patch-configure | 21 +
multimedia/ffmpeg/patches/patch-r14477 | 16 +
multimedia/ffmpeg/patches/patch-v4l2 | 20 +
27 files changed, 278 insertions(+), 1367 deletions(-)
diffs (truncated from 1832 to 300 lines):
diff -r 1ec683b0fdde -r dc3e6ab83c0b multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile Sun Sep 07 23:32:38 2008 +0000
+++ b/multimedia/ffmpeg/Makefile Sun Sep 07 23:39:37 2008 +0000
@@ -1,43 +1,63 @@
-# $NetBSD: Makefile,v 1.36 2008/09/01 00:00:10 tonnerre Exp $
+# $NetBSD: Makefile,v 1.37 2008/09/07 23:39:37 ahoka Exp $
-DISTNAME= ffmpeg-0.4.9-pre1
-PKGNAME= ffmpeg-0.4.9pre1
-PKGREVISION= 4
+DISTNAME= ffmpeg-${DISTVERSION}
+PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
+MASTER_SITES= ${MASTER_SITE_FREEBSD}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= zul%NetBSD-fr.org@localhost
+MAINTAINER= ahoka%NetBSD.org@localhost
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= MPEG decoding, encoding and streaming software
-# The `sparc' code in libavcode/sparc is only suitable for sparc64
-NOT_FOR_PLATFORM= *-*-sparc
-
+DISTVERSION= 2008-07-27
PKG_DESTDIR_SUPPORT= user-destdir
HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
+USE_LIBTOOL= YES
USE_TOOLS+= gmake texi2html pod2man
-USE_LIBTOOL= YES
-
-CONFLICTS+= ffmpeg-devel-[0-9]*
REPLACE_PERL+= doc/texi2pod.pl
-CONF_FILES= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
+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
+
+CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
${PKG_SYSCONFDIR}/ffserver.conf
-MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \
- FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
- LOCALBASE=${LOCALBASE:Q}
+MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
+# LOCALBASE=${LOCALBASE:Q}
+
+# Let's not put garbage into /tmp
+CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
-CONFIGURE_ARGS+= --cc=${CC:Q} --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --enable-pp --disable-vhook --disable-debug
-CONFIGURE_ARGS+= --enable-gpl
-CONFIGURE_ARGS+= --enable-ffplay
+CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \
+ --cc=${CC:Q} \
+ --prefix=${PREFIX:Q} \
+ --disable-debug \
+ --disable-vhook \
+ --enable-avfilter \
+ --enable-swscale \
+ --enable-gpl \
+ --enable-postproc \
+ --enable-pthreads \
+ --enable-shared \
+ --enable-libvorbis \
+ --enable-libmp3lame
-INSTALLATION_DIRS= include/ffmpeg/libpostproc lib \
- share/examples/ffmpeg share/doc/ffmpeg
+# Doesn't work without memalign and memalign looks buggy.
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+= --disable-mmx
+.endif
+
+INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
.include "options.mk"
@@ -49,8 +69,9 @@
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg
${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
${DESTDIR}${PREFIX}/share/examples/ffmpeg
- ${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
- ${DESTDIR}${PREFIX}/include/ffmpeg/libpostproc
+.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"
diff -r 1ec683b0fdde -r dc3e6ab83c0b multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST Sun Sep 07 23:32:38 2008 +0000
+++ b/multimedia/ffmpeg/PLIST Sun Sep 07 23:39:37 2008 +0000
@@ -1,26 +1,79 @@
-@comment $NetBSD: PLIST,v 1.6 2006/08/09 14:14:40 ben Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/09/07 23:39:37 ahoka Exp $
bin/ffmpeg
+bin/ffplay
bin/ffserver
-include/ffmpeg/avcodec.h
-include/ffmpeg/avformat.h
-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
+include/libavcodec/avcodec.h
+include/libavcodec/opt.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
+include/libavutil/base64.h
+include/libavutil/common.h
+include/libavutil/crc.h
+include/libavutil/fifo.h
+include/libavutil/intfloat_readwrite.h
+include/libavutil/log.h
+include/libavutil/lzo.h
+include/libavutil/mathematics.h
+include/libavutil/md5.h
+include/libavutil/mem.h
+include/libavutil/random.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/libavdevice.a
+lib/libavdevice.so
+lib/libavdevice.so.52
+lib/libavdevice.so.52.0.0
+lib/libavfilter.a
+lib/libavfilter.so
+lib/libavfilter.so.0
+lib/libavfilter.so.0.0.0
+lib/libavformat.a
+lib/libavformat.so
+lib/libavformat.so.52
+lib/libavformat.so.52.18.0
+lib/libavutil.a
+lib/libavutil.so
+lib/libavutil.so.49
+lib/libavutil.so.49.7.0
+lib/libpostproc.a
+lib/libpostproc.so
+lib/libpostproc.so.51
+lib/libpostproc.so.51.1.0
+lib/libswscale.a
+lib/libswscale.so
+lib/libswscale.so.0
+lib/libswscale.so.0.5.1
+lib/pkgconfig/libavcodec.pc
+lib/pkgconfig/libavdevice.pc
+lib/pkgconfig/libavfilter.pc
+lib/pkgconfig/libavformat.pc
+lib/pkgconfig/libavutil.pc
+lib/pkgconfig/libpostproc.pc
+lib/pkgconfig/libswscale.pc
man/man1/ffmpeg.1
+man/man1/ffplay.1
man/man1/ffserver.1
share/doc/ffmpeg/README
share/doc/ffmpeg/TODO
share/doc/ffmpeg/apiexample.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/snow.txt
+share/doc/ffmpeg/soc.txt
share/examples/ffmpeg/ffserver.conf
-@dirrm share/examples/ffmpeg
-@dirrm share/doc/ffmpeg
-@dirrm include/ffmpeg/libpostproc
-@dirrm include/ffmpeg
diff -r 1ec683b0fdde -r dc3e6ab83c0b multimedia/ffmpeg/PLIST.sdl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg/PLIST.sdl Sun Sep 07 23:39:37 2008 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.sdl,v 1.1 2008/09/07 23:39:37 ahoka Exp $
+bin/ffplay
diff -r 1ec683b0fdde -r dc3e6ab83c0b multimedia/ffmpeg/buildlink3.mk
--- a/multimedia/ffmpeg/buildlink3.mk Sun Sep 07 23:32:38 2008 +0000
+++ b/multimedia/ffmpeg/buildlink3.mk Sun Sep 07 23:39:37 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2008/09/07 23:39:37 ahoka Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFMPEG_BUILDLINK3_MK:= ${FFMPEG_BUILDLINK3_MK}+
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= ffmpeg
.endif
@@ -11,10 +11,41 @@
BUILDLINK_PACKAGES+= ffmpeg
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg
-.if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.9pre1
-BUILDLINK_ABI_DEPENDS.ffmpeg?= ffmpeg>=0.4.9pre1
+.if ${FFMPEG_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20080727
BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
+
+pkgbase := ffmpeg
+. include "../../mk/pkg-build-options.mk"
+
.endif # FFMPEG_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Msdl)
+. include "../../devel/SDL/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora)
+. include "../../multimedia/libtheora/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid)
+. include "../../multimedia/xvidcore/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mx264)
+. include "../../multimedia/x264-devel/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaad)
+. include "../../audio/faad2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaac)
+. include "../../audio/faac/buildlink3.mk"
+.endif
+
+.include "../../devel/libgetopt/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 1ec683b0fdde -r dc3e6ab83c0b multimedia/ffmpeg/distinfo
--- a/multimedia/ffmpeg/distinfo Sun Sep 07 23:32:38 2008 +0000
+++ b/multimedia/ffmpeg/distinfo Sun Sep 07 23:39:37 2008 +0000
@@ -1,19 +1,9 @@
-$NetBSD: distinfo,v 1.15 2008/09/01 00:00:10 tonnerre Exp $
+$NetBSD: distinfo,v 1.16 2008/09/07 23:39:37 ahoka Exp $
-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) = 9211ce3acfccf8c543ffea4a99e10413742aaaea
-SHA1 (patch-ab) = 15c7def153b0854169f36ebc7c1e8ae49a0268ea
-SHA1 (patch-ac) = cae476460362637186a1ba31fbec4434b18e8dc8
-SHA1 (patch-ad) = c822a8141842c5bceeb4aaadfcb69b2dd200311a
-SHA1 (patch-ae) = 3a7b0422684f2e7174b52a08a4932aa937574af3
-SHA1 (patch-af) = 82f7e656ab01320235c85e98ec4c57277956ceb8
-SHA1 (patch-ag) = 69656d16d44d3321bdf9b790e6263db1529d2c99
-SHA1 (patch-ah) = 3b600dd8d5bc0d4363139cea0ba8338691d8fa75
-SHA1 (patch-ai) = fe1bbecd05f2eef812650efa83223a3b6417ed6a
-SHA1 (patch-aj) = b998fdc2b3cc5f6efd2fb4f12fbb630d5832004b
-SHA1 (patch-ak) = 564d7d55372281909f70c63c6a72eb7d97afd99d
-SHA1 (patch-al) = d418bf4af796f1e3b829ceab19ddde94a0ca8ec4
-SHA1 (patch-an) = 3e2327f2a30571daf82edd67128c63845819224e
-SHA1 (patch-ao) = f1e8f504a951ab02d70aae083862414b32d8b55a
+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-bktr) = dddf7149810d227f531e5a198445fc0d1893bece
+SHA1 (patch-configure) = c61628c17bfb31021ee56782177c7df5a91ca5aa
+SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999
+SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6
Home |
Main Index |
Thread Index |
Old Index