From 4e227b1847a4cb2c734e302e466c64b385487844 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 25 May 2004 21:49:26 +0000 Subject: Update to 0.4.8, and install the header files that are customarily installed. Changes: version 0.4.8: - MPEG2 video encoding (Michael) - Id RoQ playback subsystem (Mike Melanson and Tim Ferguson) - Wing Commander III Movie (.mve) file playback subsystem (Mike Melanson and Mario Brito) - Xan DPCM audio decoder (Mario Brito) - Interplay MVE playback subsystem (Mike Melanson) - Duck DK3 and DK4 ADPCM audio decoders (Mike Melanson) version 0.4.7: - RealAudio 1.0 (14_4) and 2.0 (28_8) native decoders. Author unknown, code from a mplayerhq (originally from public domain player for Amiga at http://www.honeypot.net/audio) - Current version now also compiles with older GCC (Fabrice) - 4X multimedia playback system including 4xm file demuxer (Mike Melanson), and 4X video and audio codecs (Michael) - Creative YUV (CYUV) decoder (Mike Melanson) - FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv) (Michael) - ASV1 (Asus), H.264, Intel indeo3 codecs has been added (Various) - Tiny PNG encoder and decoder, tiny GIF decoder, PAM decoder (PPM with alpha support), JPEG YUV colorspace support. (Fabrice Bellard) - ffplay has been replaced with a newer version which uses SDL (optionally) for multi platform support (fabrice) - Sorenson Version 3 codec (SVQ3) support has been added (decoding only) - donated by anonymous - AMR format has been added (Johannes Carlsson) - 3gp support has been added (Johannes Carlsson) - VP3 codec has been added (Mike Melanson) - more MPEG-1/2 fixes - Better Multi platform support, MS Visual Studio fixes (various) - Altivec optimizations (Magnus Damn and others) - SH4 processor support has been added (BERO) - New public interfaces (avcodec_get_pix_fmt) (Roman Shaposhnick) - VOB Streaming support (Brian Foley) - Better MP3 Autodetection (Andriy Rysin) - qpel encoding (Michael) - 4mv+b frames encoding finally fixed (Michael) - chroma ME (Michael) - 5 comparission functions for ME (Michael) - b frame encoding speedup (Michael) - wmv2 codec (unfinished - Michael) - user specified diamond size for EPZS (Michael) - Playstation STR playback subsystem, still experimental (Mike and Michael) - ASV2 codec (Michael) - CLJR decoder (Alex) .. And lots more new enhances and fixes. version 0.4.6: - completely new integer only mpeg audio layer 1/2/3 decoder rewritten from scratch. - recoded dct and motion vector search with gcc (no longer depends on nasm). - fix quantization bug in AC3 encoder. - added PCM codecs and format. Corrected wav/avi/asf pcm issues. - added prototype ffplay program. - added GOB header parsing on H.263/H.263+ decoder. (Juanjo) - bug fix on MCBPC tables of H.263. (Juanjo) - bug fix on DC coefficients of H.263. (Juanjo) - added Advanced Prediction Mode on H.263/H.263+ decoder. (Juanjo) - now we can decode H.263 streams found on QuickTime files. (Juanjo) - now we can decode H.263 streams found on VIVO v1 files.(Juanjo) - preliminary RTP "friendly" mode for H.263/H.263+ coding. (Juanjo) - added GOB header for H.263/H.263+ coding on RTP mode. (Juanjo) - now H.263 picture size is returned on the first decoded frame. (Juanjo) - added first regression tests - added MPEG2 TS demux - new demux API for libav - more accurate and faster IDCT (Michael) - faster and entropy controlled motion search (Michael) - two pass video encoding (Michael) - new video rate control (Michael) - added MSMPEG4V1, MSMPEGV2 and WMV1 support (Michael) - great performance improvement of video encoders and decoders (Michael) - new and faster bit readers and vlc parsers (Michael) - high quality encoding mode : tries all macroblock/VLC types (Michael) - added DV video decoder - preliminary RTP/RTSP support in ffserver and libavformat - H.263+ AIC decoding/encoding support. (Juanjo) - VCD MPEG-PS mode. (Juanjo) - PSNR stuff. (Juanjo) - Simple stats output. (Juanjo) - 16-bit and 15-bit rgb/bgr/gbr support (Bisqwit) --- multimedia/ffmpeg/patches/patch-aa | 27 ++++---- multimedia/ffmpeg/patches/patch-ab | 39 +++--------- multimedia/ffmpeg/patches/patch-ac | 127 ++++++++++++++++++++++++++++--------- multimedia/ffmpeg/patches/patch-ad | 47 +++++++++----- multimedia/ffmpeg/patches/patch-ae | 43 ++++++------- multimedia/ffmpeg/patches/patch-af | 27 -------- 6 files changed, 173 insertions(+), 137 deletions(-) delete mode 100644 multimedia/ffmpeg/patches/patch-af (limited to 'multimedia/ffmpeg/patches') diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa index 823eee31b7c..4dc8a997c4c 100644 --- a/multimedia/ffmpeg/patches/patch-aa +++ b/multimedia/ffmpeg/patches/patch-aa @@ -1,12 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2004/05/25 21:49:26 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 +--- configure.orig 2003-09-28 17:26:39.000000000 +0200 ++++ configure +@@ -148,11 +148,10 @@ FFSLDFLAGS="" + need_inet_aton="yes" + extralibs="$extralibs -lsocket -lnsl" + ;; +-FreeBSD) ++FreeBSD|NetBSD) + v4l="no" + audio_oss="yes" + dv1394="no" +-make="gmake" + LDFLAGS="$LDFLAGS -export-dynamic" + ;; + BSD/OS) diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab index 6ff8de270ea..150006d66cd 100644 --- a/multimedia/ffmpeg/patches/patch-ab +++ b/multimedia/ffmpeg/patches/patch-ab @@ -1,45 +1,22 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/25 21:49:26 wiz Exp $ ---- ffserver.c.orig 2001-08-14 17:38:17.000000000 -0500 +--- ffserver.c.orig 2003-09-28 17:26:39.000000000 +0200 +++ ffserver.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -28,8 +29,9 @@ - #include - #include - #include -+#ifndef __FreeBSD__ - #include --#include -+#endif - #include - #include - #include -@@ -1491,7 +1493,7 @@ void help(void) +@@ -4488,7 +4488,7 @@ static void show_help(void) "\n" - "-L : print the LICENCE\n" + "-L : print the LICENSE\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) +@@ -4546,7 +4546,7 @@ int main(int argc, char **argv) - register_all(); + av_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) { + my_program_name = argv[0]; + my_program_dir = getcwd(0, 0); diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac index c553f89d0dd..d4d665cd7df 100644 --- a/multimedia/ffmpeg/patches/patch-ac +++ b/multimedia/ffmpeg/patches/patch-ac @@ -1,41 +1,108 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2004/05/25 21:49:26 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 +--- Makefile.orig 2003-09-28 17:26:39.000000000 +0200 ++++ Makefile +@@ -6,8 +6,7 @@ include config.mak + + VPATH=$(SRC_PATH) + +-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +-LDFLAGS+= -g ++CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE + ifeq ($(TARGET_GPROF),yes) CFLAGS+=-p - LDFLAGS+=-p -@@ -18,17 +18,19 @@ +@@ -42,6 +41,8 @@ ifeq ($(CONFIG_VORBIS),yes) + EXTRALIBS+=-logg -lvorbis -lvorbisenc + endif + ++EXTRALIBS+=${LIBOSSAUDIO} ++ + ifeq ($(CONFIG_FAAD),yes) + ifeq ($(CONFIG_FAADBIN),yes) + # no libs needed +@@ -64,7 +65,7 @@ endif + + OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o + SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) +-FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec ++FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la + + all: lib $(PROG) $(PROGTEST) $(VHOOK) + +@@ -72,42 +73,34 @@ lib: $(MAKE) -C libavcodec all - $(MAKE) -C libav all + $(MAKE) -C libavformat all + +-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs +- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) +- +-ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) +- cp -p $< $@ +- $(STRIP) $@ +- +-ffserver$(EXESUF): ffserver.o .libs +- $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) ++ffmpeg$(EXESUF): ffmpeg.o cmdutils.o .ffmpeglibs ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) --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 +-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs +- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) ++ffserver$(EXESUF): ffserver.o .ffmpeglibs ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) --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) +-ffplay$(EXESUF): ffplay_g$(EXESUF) +- cp -p $< $@ +- $(STRIP) $@ ++ffplay$(EXESUF): ffplay.o cmdutils.o .ffmpeglibs ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) + +-output_example$(EXESUF): output_example.o .libs +- $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) ++output_example$(EXESUF): output_example.o .ffmpeglibs ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) + + ffplay.o: ffplay.c + $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< %.o: %.c -- gcc $(CFLAGS) -c -o $@ $< -+ $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@ $< +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@ $< + +-videohook: .libs ++videohook: .ffmpeglibs + $(MAKE) -C vhook all + + .PHONY: install - 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 + install: all install-man $(INSTALLVHOOK) +- $(MAKE) -C libavcodec install +- $(MAKE) -C libavformat install ++ $(MAKE) -C libavcodec install install-headers ++ $(MAKE) -C libavformat install install-headers + install -d "$(bindir)" +- install -c -s -m 755 $(PROG) "$(bindir)" ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) "$(bindir)" - clean: + # create the window installer + wininstaller: all install +@@ -145,15 +138,15 @@ endif + .depend: $(SRCS) + $(CC) -MM $(CFLAGS) $^ 1>.depend + +-.libs: lib +- @test -f .libs || touch .libs +- @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done ++.ffmpeglibs: lib ++ @test -f .ffmpeglibs || touch .ffmpeglibs ++ @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .ffmpeglibs ; then touch .ffmpeglibs; fi ; done + + clean: $(CLEANVHOOK) $(MAKE) -C libavcodec clean + $(MAKE) -C libavformat clean + $(MAKE) -C tests clean +- rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) ++ rm -f *.o *.d *~ .ffmpeglibs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST) + + clean-vhook: + $(MAKE) -C vhook clean diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad index 2f3ce31545f..48746f87ca4 100644 --- a/multimedia/ffmpeg/patches/patch-ad +++ b/multimedia/ffmpeg/patches/patch-ad @@ -1,30 +1,45 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2004/05/25 21:49:26 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 @@ +--- libavformat/Makefile.orig 2003-09-28 17:26:40.000000000 +0200 ++++ libavformat/Makefile +@@ -69,12 +69,14 @@ endif - LIB= libav.a + SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) +install: all + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib + - all: $(LIB) + all: $(LIB) $(SLIB) - $(LIB): $(OBJS) + $(LIB): $(OBJS) $(PPOBJS) rm -f $@ -- $(AR) rcs $@ $(OBJS) -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib +- $(AR) rc $@ $(OBJS) $(PPOBJS) +- $(RANLIB) $@ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) $(PPOBJS:.o=.lo) -rpath $(prefix)/lib $(LIBOSSAUDIO) + + $(SLIB): $(OBJS) + ifeq ($(CONFIG_WIN32),yes) +@@ -84,9 +86,6 @@ else + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) + endif + +-depend: $(SRCS) +- $(CC) -MM $(CFLAGS) $^ 1>.depend +- + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +@@ -112,11 +111,11 @@ install-headers: + "$(prefix)/include/ffmpeg" %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings + %.o: %.cpp +- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< ++ $(LIBTOOL) --mode=compile $(CXX) $(subst -Wall,,$(CFLAGS)) -c -o $@ $< + clean: - rm -f *.o *~ *.a + rm -f *.o *.d .depend *~ *.a $(LIB) diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae index aa2a5188640..c88a6529b9f 100644 --- a/multimedia/ffmpeg/patches/patch-ae +++ b/multimedia/ffmpeg/patches/patch-ae @@ -1,30 +1,30 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ +$NetBSD: patch-ae,v 1.2 2004/05/25 21:49:26 wiz Exp $ ---- libavcodec/Makefile.orig Mon Aug 13 06:52:36 2001 +--- libavcodec/Makefile.orig 2003-09-28 17:26:39.000000000 +0200 +++ 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 +@@ -145,6 +145,9 @@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF) + endif + TESTS= imgresample-test dct-test motion-test fft-test +install: all + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib + - all: $(LIB) - tests: apiexample cpuid_test $(TESTS) + all: $(LIB) $(SLIB) + + amrlibs: +@@ -154,8 +157,8 @@ tests: apiexample cpuid_test $(TESTS) - $(LIB): $(OBJS) $(ASM_OBJS) + $(LIB): $(OBJS) $(AMRLIBS) rm -f $@ -- $(AR) rcs $@ $(OBJS) $(ASM_OBJS) +- $(AR) rc $@ $(OBJS) $(AMREXTRALIBS) +- $(RANLIB) $@ + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib ++ - dsputil.o: dsputil.c dsputil.h + $(SLIB): $(OBJS) + ifeq ($(CONFIG_WIN32),yes) +@@ -171,13 +174,10 @@ libpostproc/libpostproc.a: + $(MAKE) -C libpostproc %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< @@ -32,11 +32,10 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:41:10 wiz Exp $ %.o: %.S - $(CC) $(CFLAGS) -c -o $@ $< +- +-depend: $(SRCS) +- $(CC) -MM $(CFLAGS) $^ 1>.depend + $(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 deleted file mode 100644 index 326c4263e84..00000000000 --- a/multimedia/ffmpeg/patches/patch-af +++ /dev/null @@ -1,27 +0,0 @@ -$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 - #include - #include -+#include - #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; -- cgit v1.2.3