Import a recent snapshot of ffmpeg (2007-10-04) based on a snapshot

made by folks at FreeBSD/ports and packaged by Adam Hoka via pkgsrc-wip.

This will provide a newer ffmpeg for packages that need it.

7 files changed, 279 insertions, 1 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index ce28e121014..ba72d4ac3a2 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2008/01/30 19:23:53 bjs Exp $
+# $NetBSD: Makefile,v 1.114 2008/02/20 10:12:04 xtraeme Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -18,6 +18,7 @@ SUBDIR+=	dvdrip
 SUBDIR+=	dvdstyler
 SUBDIR+=	dvdview
 SUBDIR+=	ffmpeg
+SUBDIR+=	ffmpeg-devel
 SUBDIR+=	flashplayer
 SUBDIR+=	fxtv
 SUBDIR+=	ggrab
diff --git a/multimedia/ffmpeg-devel/DESCR b/multimedia/ffmpeg-devel/DESCR
new file mode 100644
index 00000000000..e30ce647cc7
--- /dev/null
+++ b/multimedia/ffmpeg-devel/DESCR
@@ -0,0 +1,10 @@
+FFmpeg is the first complete and free Internet Live Audio and Video
+Broadcasting solution. FFMpeg aims at being the command line tool to
+handle audio and video. It is a "three-in-one" solution.
+
+FFmpeg includes a soft VCR capable of encoding in many different
+formats simultaneously, a streaming server for Netcasting multimedia
+and is available under the GNU General Public License.
+
+FFmpeg generates streaming files, in many popular formats
+simultaneously, faster than any other solution.
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
new file mode 100644
index 00000000000..a82b64d3f8f
--- /dev/null
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -0,0 +1,65 @@
+# $NetBSD: Makefile,v 1.4 2008/02/20 10:12:04 xtraeme Exp $
+
+DISTNAME=	ffmpeg-${DISTVERSION}
+PKGNAME=	ffmpeg-devel-${DISTVERSION:S/-//g}
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_FREEBSD}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
+COMMENT=	MPEG decoding, encoding and streaming software
+
+DISTVERSION=	2007-10-04
+#PKG_DESTDIR_SUPPORT=	user-destdir
+
+HAS_CONFIGURE=	YES
+USE_LIBTOOL=	YES
+USE_TOOLS+=	gmake texi2html pod2man
+
+CONFLICTS+=	ffmpeg-devel-[0-9]*
+
+REPLACE_PERL+=	doc/texi2pod.pl
+
+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.
+
+PLIST_SRC+=	${PKGDIR}/PLIST
+
+CONF_FILES+=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
+		${PKG_SYSCONFDIR}/ffserver.conf
+
+MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q} \
+		LOCALBASE=${LOCALBASE:Q}
+
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR} \
+			--cc=${CC:Q} \
+			--prefix=${PREFIX:Q} \
+			--disable-vhook \
+			--disable-debug \
+			--enable-pp \
+			--enable-gpl \
+			--enable-memalign-hack \
+			--enable-pthreads \
+			--enable-shared
+
+
+INSTALLATION_DIRS=	lib share/examples/ffmpeg share/doc/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 "../../mk/pthread.buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg-devel/PLIST b/multimedia/ffmpeg-devel/PLIST
new file mode 100644
index 00000000000..8903d8c20a1
--- /dev/null
+++ b/multimedia/ffmpeg-devel/PLIST
@@ -0,0 +1,65 @@
+@comment $NetBSD: PLIST,v 1.3 2008/02/20 10:12:04 xtraeme Exp $
+bin/ffmpeg
+bin/ffserver
+include/ffmpeg/adler32.h
+include/ffmpeg/avcodec.h
+include/ffmpeg/avformat.h
+include/ffmpeg/avio.h
+include/ffmpeg/avstring.h
+include/ffmpeg/avutil.h
+include/ffmpeg/base64.h
+include/ffmpeg/common.h
+include/ffmpeg/fifo.h
+include/ffmpeg/integer.h
+include/ffmpeg/intfloat_readwrite.h
+include/ffmpeg/log.h
+include/ffmpeg/lzo.h
+include/ffmpeg/mathematics.h
+include/ffmpeg/md5.h
+include/ffmpeg/mem.h
+include/ffmpeg/opt.h
+include/ffmpeg/random.h
+include/ffmpeg/rational.h
+include/ffmpeg/rgb2rgb.h
+include/ffmpeg/rtp.h
+include/ffmpeg/rtsp.h
+include/ffmpeg/rtspcodes.h
+include/ffmpeg/swscale.h
+include/postproc/postprocess.h
+lib/libavcodec.a
+lib/libavcodec.so
+lib/libavcodec.so.51
+lib/libavcodec.so.51.44.0
+lib/libavformat.a
+lib/libavformat.so
+lib/libavformat.so.51
+lib/libavformat.so.51.14.0
+lib/libavutil.a
+lib/libavutil.so
+lib/libavutil.so.49
+lib/libavutil.so.49.5.0
+lib/libpostproc.a
+lib/libpostproc.so
+lib/libpostproc.so.51
+lib/libpostproc.so.51.1.0
+lib/pkgconfig/libavcodec.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/doc/ffmpeg
+@dirrm include/postproc
+@dirrm include/ffmpeg
diff --git a/multimedia/ffmpeg-devel/buildlink3.mk b/multimedia/ffmpeg-devel/buildlink3.mk
new file mode 100644
index 00000000000..8c7f4bddd1b
--- /dev/null
+++ b/multimedia/ffmpeg-devel/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.4 2008/02/20 10:12:04 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+FFMPEG_DEVEL_BUILDLINK3_MK:=	${FFMPEG_DEVEL_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	ffmpeg-devel
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffmpeg-devel}
+BUILDLINK_PACKAGES+=	ffmpeg-devel
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg-devel
+
+.if ${FFMPEG_DEVEL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.ffmpeg-devel+=	ffmpeg-devel>=20071004
+BUILDLINK_PKGSRCDIR.ffmpeg-devel?=	../../multimedia/ffmpeg-devel
+.endif	# FFMPEG_DEVEL_BUILDLINK3_MK
+
+.include "../../devel/libgetopt/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
new file mode 100644
index 00000000000..b2115eb82f2
--- /dev/null
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.4 2008/02/20 10:12:04 xtraeme Exp $
+
+SHA1 (ffmpeg-2007-10-04.tar.bz2) = c85026c204fbfb49b8ef6953fd896a55843f14ff
+RMD160 (ffmpeg-2007-10-04.tar.bz2) = 6273cf84a96ff3918876005ba2f6d12296087460
+Size (ffmpeg-2007-10-04.tar.bz2) = 2326718 bytes
diff --git a/multimedia/ffmpeg-devel/options.mk b/multimedia/ffmpeg-devel/options.mk
new file mode 100644
index 00000000000..09ef494a1e2
--- /dev/null
+++ b/multimedia/ffmpeg-devel/options.mk
@@ -0,0 +1,111 @@
+# $NetBSD: options.mk,v 1.3 2008/02/20 10:12:04 xtraeme Exp $
+
+# Global and legacy options
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS=	lame mmx vorbis sdl x264 theora xvid faad faac
+PKG_SUGGESTED_OPTIONS=	lame vorbis faac sdl x264 theora
+#PKG_OPTIONS_OPTIONAL_GROUPS=	aac-decoder
+#PKG_OPTIONS_GROUP.aac-decoder=	faad faac
+
+
+.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
+
+###
+### using lame option
+###
+
+.if !empty(PKG_OPTIONS:Mlame)
+CONFIGURE_ARGS+= --enable-libmp3lame
+.include "../../audio/lame/buildlink3.mk"
+.endif
+
+###
+### using vorbis option
+###
+
+.if !empty(PKG_OPTIONS:Mvorbis)
+CONFIGURE_ARGS+= --enable-libvorbis
+CONFIGURE_ARGS+= --enable-libogg
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.endif
+
+###
+### faad option
+###
+
+.if !empty(PKG_OPTIONS:Mfaad)
+CONFIGURE_ARGS+=  --enable-libfaad
+.include "../../audio/faad2/buildlink3.mk"
+.endif
+
+
+###
+### faac option
+###
+
+.if !empty(PKG_OPTIONS:Mfaac)
+CONFIGURE_ARGS+=  --enable-libfaac
+.include "../../audio/faac/buildlink3.mk"
+.endif
+
+###
+### SDL support
+###
+### You can build the frontend with SDL support enabled
+###
+
+.if !empty(PKG_OPTIONS:Msdl)
+
+CONFIGURE_ARGS+=	--enable-ffplay
+PLIST_SRC+=		${PKGDIR}/PLIST.sdl
+
+.include "../../devel/SDL/buildlink3.mk"
+.endif
+
+###
+### OGG Theora support
+###
+
+.if !empty(PKG_OPTIONS:Mtheora)
+CONFIGURE_ARGS+=  --enable-libtheora
+.include "../../multimedia/libtheora/buildlink3.mk"
+.endif
+
+###
+### XviD support
+###
+
+.if !empty(PKG_OPTIONS:Mxvid)
+CONFIGURE_ARGS+=  --enable-libxvid
+.include "../../multimedia/xvidcore/buildlink3.mk"
+.endif
+
+###
+### x264 support
+###
+
+.if !empty(PKG_OPTIONS:Mx264)
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20071218
+CONFIGURE_ARGS+=  --enable-libx264
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.endif