Reimport graphics/ffmpeg as multimedia/ffmpeg.

10 files changed, 314 insertions, 0 deletions

diff --git a/multimedia/ffmpeg/DESCR b/multimedia/ffmpeg/DESCR
new file mode 100644
index 00000000000..e30ce647cc7
--- /dev/null
+++ b/multimedia/ffmpeg/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/Makefile b/multimedia/ffmpeg/Makefile
new file mode 100644
index 00000000000..5e5f606d8bc
--- /dev/null
+++ b/multimedia/ffmpeg/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+DISTNAME=	ffmpeg-0.4.5
+PKGREVISION=	2
+CATEGORIES=	multimedia net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
+
+MAINTAINER=	tron@NetBSD.org
+HOMEPAGE=	http://ffmpeg.sourceforge.net/
+COMMENT=	MPEG decoding, encoding and streaming software
+
+BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
+
+WRKSRC=		${WRKDIR}/ffmpeg
+HAS_CONFIGURE=	YES
+USE_BUILDLINK3=	YES
+USE_GNU_TOOLS+=	make
+USE_LIBTOOL=	YES
+MAKE_ENV+=	EXTRA_LIBS="${LIBGETOPT}" \
+		FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
+		LOCALBASE="${LOCALBASE}"
+
+CONFIGURE_ARGS=	--cc=${CC} --disable-grab --disable-mmx --prefix=${PREFIX}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/include/libav
+	${INSTALL_DATA_DIR} ${PREFIX}/include/libavcodec
+	${INSTALL_DATA_DIR} ${PREFIX}/include/libavcodec/i386
+	${INSTALL_DATA_DIR} ${PREFIX}/include/libavcodec/libac3
+	${INSTALL_DATA} ${WRKSRC}/libav/*.h ${PREFIX}/include/libav
+	${INSTALL_DATA} ${WRKSRC}/libavcodec/*.h ${PREFIX}/include/libavcodec
+	${INSTALL_DATA} ${WRKSRC}/libavcodec/i386/*.h \
+		${PREFIX}/include/libavcodec/i386
+	${INSTALL_DATA} ${WRKSRC}/libavcodec/libac3/*.h \
+		${PREFIX}/include/libavcodec/libac3
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffmpeg \
+		${PREFIX}/share/examples/ffmpeg
+	${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
+		${PREFIX}/share/doc/ffmpeg
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/* \
+		${PREFIX}/share/doc/ffmpeg
+	${MV} ${PREFIX}/share/doc/ffmpeg/ffserver.conf \
+		${PREFIX}/share/examples/ffmpeg
+
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
new file mode 100644
index 00000000000..a5b8fef7222
--- /dev/null
+++ b/multimedia/ffmpeg/PLIST
@@ -0,0 +1,51 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+bin/ffmpeg
+bin/ffserver
+include/libav/avformat.h
+include/libav/avi.h
+include/libav/avio.h
+include/libavcodec/ac3enc.h
+include/libavcodec/ac3tab.h
+include/libavcodec/avcodec.h
+include/libavcodec/common.h
+include/libavcodec/dsputil.h
+include/libavcodec/fastmemcpy.h
+include/libavcodec/h263data.h
+include/libavcodec/i386/dsputil_mmx_avg.h
+include/libavcodec/i386/mmx.h
+include/libavcodec/libac3/ac3.h
+include/libavcodec/libac3/ac3_internal.h
+include/libavcodec/libac3/bitstream.h
+include/libavcodec/libac3/tables.h
+include/libavcodec/mpeg12data.h
+include/libavcodec/mpeg4data.h
+include/libavcodec/mpegaudio.h
+include/libavcodec/mpegaudiotab.h
+include/libavcodec/mpegvideo.h
+include/libavcodec/msmpeg4data.h
+lib/libav.a
+lib/libav.la
+lib/libav.so
+lib/libav.so.0
+lib/libav.so.0.0
+lib/libavcodec.a
+lib/libavcodec.la
+lib/libavcodec.so
+lib/libavcodec.so.0
+lib/libavcodec.so.0.0
+share/doc/ffmpeg/FAQ
+share/doc/ffmpeg/README
+share/doc/ffmpeg/README.dev
+share/doc/ffmpeg/README.tech
+share/doc/ffmpeg/TODO
+share/doc/ffmpeg/apiexample.c
+share/doc/ffmpeg/bench.txt
+share/doc/ffmpeg/ffmpeg.txt
+share/doc/ffmpeg/ffserver.txt
+share/examples/ffmpeg/ffserver.conf
+@dirrm share/examples/ffmpeg
+@dirrm share/doc/ffmpeg
+@dirrm include/libavcodec/libac3
+@dirrm include/libavcodec/i386
+@dirrm include/libavcodec
+@dirrm include/libav
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
new file mode 100644
index 00000000000..1c28072a294
--- /dev/null
+++ b/multimedia/ffmpeg/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+SHA1 (ffmpeg-0.4.5.tar.gz) = 7d99250eb20c45b77a08e00ecad1f73d11f57cb8
+Size (ffmpeg-0.4.5.tar.gz) = 280506 bytes
+SHA1 (patch-aa) = e2e7ca0465ea69514a6b36e93451ea7eaca0513c
+SHA1 (patch-ab) = e5035ac9a90054fbf11dc7aad52f37a1d6d866f5
+SHA1 (patch-ac) = 1b009f7878ec4b85c0204db210ce26b337422820
+SHA1 (patch-ad) = db06e7ab8d60f523e02051339c5a0b66f8ac497f
+SHA1 (patch-ae) = d0f681ed5878c5e49c3daa956a7e0f28bdaf2b05
+SHA1 (patch-af) = baaaf9349633d7e210d2841b80608100650432e2
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
new file mode 100644
index 00000000000..823eee31b7c
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+--- configure.orig	Tue Mar 19 13:11:44 2002
++++ configure	Tue Mar 19 13:09:04 2002
+@@ -77,7 +77,6 @@
+ fi
+ 
+ echo "prefix=$prefix" >> config.mak
+-echo "MAKE=make" >> config.mak
+ echo "CC=$cc" >> config.mak
+ echo "AR=$ar" >> config.mak
+ echo "OPTFLAGS=$CFLAGS" >> config.mak
diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab
new file mode 100644
index 00000000000..6ff8de270ea
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ab
@@ -0,0 +1,45 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+--- ffserver.c.orig	2001-08-14 17:38:17.000000000 -0500
++++ ffserver.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -28,8 +29,9 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ #include <time.h>
++#ifndef __FreeBSD__
+ #include <getopt.h>
+-#include <sys/types.h>
++#endif
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+@@ -1491,7 +1493,7 @@ void help(void)
+            "\n"
+            "-L            : print the LICENCE\n"
+            "-h            : this help\n"
+-           "-f configfile : use configfile instead of /etc/ffserver.conf\n"
++           "-f configfile : use configfile instead of " FFSERVER_CONF "\n"
+            );
+ }
+ 
+@@ -1523,10 +1525,10 @@ int main(int argc, char **argv)
+ 
+     register_all();
+ 
+-    config_filename = "/etc/ffserver.conf";
++    config_filename = FFSERVER_CONF;
+ 
+     for(;;) {
+-        c = getopt_long_only(argc, argv, "Lh?f:", NULL, NULL);
++        c = getopt(argc, argv, "Lh?f:");
+         if (c == -1)
+             break;
+         switch(c) {
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
new file mode 100644
index 00000000000..c553f89d0dd
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -0,0 +1,41 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+--- Makefile.orig	Wed Aug 15 15:12:07 2001
++++ Makefile	Fri Mar 22 12:43:45 2002
+@@ -3,8 +3,8 @@
+ #
+ include config.mak
+ 
+-CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav 
+-LDFLAGS= -g 
++CFLAGS= $(OPTFLAGS) -Wall -I./libavcodec -I./libav -I$(LOCALBASE)/include 
++LDFLAGS= -L$(LOCALBASE)/lib
+ ifeq ($(TARGET_GPROF),yes)
+ CFLAGS+=-p
+ LDFLAGS+=-p
+@@ -18,17 +18,19 @@
+ 	$(MAKE) -C libavcodec all
+ 	$(MAKE) -C libav all
+ 
+-ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a
+-	gcc $(LDFLAGS) -o $@ $^ -lm
++ffmpeg: ffmpeg.o libav/libav.la libavcodec/libavcodec.la
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
+ 
+-ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a
+-	gcc $(LDFLAGS) -o $@ $^ -lm
++ffserver: ffserver.o libav/libav.la libavcodec/libavcodec.la
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm $(EXTRA_LIBS)
+ 
+ %.o: %.c
+-	gcc $(CFLAGS) -c -o $@ $< 
++	$(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@ $< 
+ 
+ install: all
+-	install -s -m 755 $(PROG) $(prefix)/bin
++	$(MAKE) -C libavcodec install
++	$(MAKE) -C libav install
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) $(prefix)/bin
+ 
+ clean: 
+ 	$(MAKE) -C libavcodec clean
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
new file mode 100644
index 00000000000..2f3ce31545f
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+--- libav/Makefile.orig Wed Aug 15 06:32:50 2001
++++ libav/Makefile
+@@ -1,3 +1,4 @@
+ include ../config.mak
+-CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
++
++CFLAGS= $(OPTFLAGS) -Wall -I../libavcodec -I$(LOCALBASE)/include -DHAVE_AV_CONFIG_H
+ 
+@@ -12,14 +13,17 @@
+ 
+ LIB= libav.a
+ 
++install: all
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
++
+ all: $(LIB)
+ 
+ $(LIB): $(OBJS)
+ 	rm -f $@
+-	$(AR) rcs $@ $(OBJS)
++	$(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $< 
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 
+ 
+ clean: 
+ 	rm -f *.o *~ *.a 
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
new file mode 100644
index 00000000000..aa2a5188640
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -0,0 +1,42 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $
+
+--- libavcodec/Makefile.orig    Mon Aug 13 06:52:36 2001
++++ libavcodec/Makefile
+@@ -1,5 +1,4 @@
+ include ../config.mak
+ 
+-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H
+-LDFLAGS= -g
++CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H
+ 
+@@ -42,23 +41,26 @@
+ LIB= libavcodec.a
+ TESTS= imgresample-test dct-test
+ 
++install: all
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
++
+ all: $(LIB)
+ tests: apiexample cpuid_test $(TESTS)
+ 
+ $(LIB): $(OBJS) $(ASM_OBJS)
+ 	rm -f $@
+-	$(AR) rcs $@ $(OBJS) $(ASM_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib
+ 
+ dsputil.o: dsputil.c dsputil.h
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $< 
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 
+ 
+ %.o: %.S
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
+ 
+ %.o: %.s
+-	nasm -f elf -o $@ $<
++	nasm -f $(FILEFORMAT) -o $@ $<
+ 
+ # depend only used by mplayer now
+ dep:	depend
diff --git a/multimedia/ffmpeg/patches/patch-af b/multimedia/ffmpeg/patches/patch-af
new file mode 100644
index 00000000000..326c4263e84
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-af
@@ -0,0 +1,27 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/05/10 13:41:11 wiz Exp $
+
+--- ffmpeg.c.orig	2001-08-13 16:24:19.000000000 -0500
++++ ffmpeg.c
+@@ -31,11 +31,22 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <ctype.h>
++#include <limits.h>
+ #endif
+ 
+ #include "avformat.h"
+ 
++#ifdef INT64_MAX
++#define MAXINT64 INT64_MAX
++#else
++#ifdef INT64_C
+ #define MAXINT64 INT64_C(0x7fffffffffffffff)
++#else
++#ifdef QUAD_MAX
++#define MAXINT64 QUAD_MAX
++#endif
++#endif
++#endif
+ 
+ typedef struct {
+     const char *name;