head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.4 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.2 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.9.0.14 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.12 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.10 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.8 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.6 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.4 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.2 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.8.0.8 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.6 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.4 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.2 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.7.0.8 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.6 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.4 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.2 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.6 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.12 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.10 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.8 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.10 date 2012.10.10.13.33.44; author drochner; state dead; branches; next 1.9; 1.9 date 2011.01.17.16.51.05; author drochner; state Exp; branches; next 1.8; 1.8 date 2010.03.14.21.44.49; author tron; state Exp; branches; next 1.7; 1.7 date 2008.09.07.23.39.38; author ahoka; state dead; branches; next 1.6; 1.6 date 2007.12.22.00.05.25; author joerg; state Exp; branches; next 1.5; 1.5 date 2007.08.02.21.48.34; author dbj; state Exp; branches; next 1.4; 1.4 date 2006.02.16.10.26.30; author abs; state Exp; branches; next 1.3; 1.3 date 2004.08.29.22.43.50; author wiz; state Exp; branches; next 1.2; 1.2 date 2004.05.25.21.49.26; author wiz; state Exp; branches; next 1.1; 1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches; next ; desc @@ 1.10 log @copy ffmpeg10 to ffmpeg, making it the default version @ text @$NetBSD: patch-ad,v 1.9 2011/01/17 16:51:05 drochner Exp $ --- subdir.mak.orig 2010-03-17 23:43:05.000000000 +0900 +++ subdir.mak 2011-01-05 17:06:02.000000000 +0900 @@@@ -59,7 +59,7 @@@@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) $(Q)mkdir -p "$(SHLIBDIR)" - $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" + $$(INSTALL) -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $(Q)cd "$(SHLIBDIR)" && \ $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) @@@@ -69,16 +69,16 @@@@ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) $(Q)mkdir -p "$(LIBDIR)" - $$(INSTALL) -m 644 $$< "$(LIBDIR)" + $$(INSTALL) -c -m 644 $$< "$(LIBDIR)" $(LIB_INSTALL_EXTRA_CMD) install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS)) $(Q)mkdir -p "$(INCINSTDIR)" - $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" + $$(INSTALL) -c -m 644 $$^ "$(INCINSTDIR)" install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc $(Q)mkdir -p "$(LIBDIR)/pkgconfig" - $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" + $$(INSTALL) -c -m 644 $$^ "$(LIBDIR)/pkgconfig" uninstall-libs:: -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ @ 1.9 log @update to 20101018.0.6.1, from Makoto Fujiwara per pkgsrc-wip, with two changes by me: -disabled symbol versioning - this didn't work correctly for me -changed PKGVERSION to start with the release date, so that it sorts correctly against the snapshots we had before vlc-1.0.6 does still build, but can be updated now @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Fix installation on platforms where the "install-sh" package is used. @ text @d3 3 a5 5 Fix installation using the "install-sh" the package. --- subdir.mak.orig Wed May 20 20:37:34 2009 +++ subdir.mak Sun Mar 14 22:37:07 2010 @@@@ -64,7 +64,7 @@@@ d8 5 a12 5 install -d "$(SHLIBDIR)" - install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" + install -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" cd "$(SHLIBDIR)" && \ d14 1 a14 1 @@@@ -74,14 +74,14 @@@@ d17 3 a19 3 install -d "$(LIBDIR)" - install -m 644 $$< "$(LIBDIR)" + install -c -m 644 $$< "$(LIBDIR)" d22 9 a30 7 install-headers:: install -d "$(INCINSTDIR)" install -d "$(LIBDIR)/pkgconfig" - install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" - install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" + install -c -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" + install -c -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" d33 1 a33 1 -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ @ 1.7 log @Track FreeBSD's SVN snapshots of ffmpeg as there are no more stable releases produced by the ffmpeg team. Add v4l2 support for NetBSD. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2007/12/22 00:05:25 joerg Exp $ d3 28 a30 70 --- libavformat/Makefile.orig 2004-04-24 17:16:23.000000000 +0200 +++ libavformat/Makefile @@@@ -6,7 +6,7 @@@@ include ../config.mak VPATH=$(SRC_PATH)/libavformat -CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +CFLAGS=$(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE OBJS= utils.o cutils.o os_support.o allformats.o PPOBJS= @@@@ -68,6 +68,11 @@@@ endif ifeq ($(CONFIG_VORBIS),yes) OBJS+= ogg.o +EXTRALIBS+= -lvorbis -lvorbisenc +endif + +ifeq ($(CONFIG_MP3LAME),yes) +EXTRALIBS += -lmp3lame endif ifeq ($(TARGET_ARCH_SPARC64),yes) @@@@ -81,12 +86,14 @@@@ endif SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) +install: all + $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB:.a=.la) ${DESTDIR}$(prefix)/lib + all: $(LIB) $(SLIB) $(LIB): $(OBJS) $(PPOBJS) rm -f $@@ - $(AR) rc $@@ $(OBJS) $(PPOBJS) - $(RANLIB) $@@ + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) $(PPOBJS:.o=.lo) -rpath $(prefix)/lib $(LIBOSSAUDIO) $(EXTRALIBS) $(SLIB): $(OBJS) ifeq ($(CONFIG_WIN32),yes) @@@@ -96,9 +103,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) @@@@ -117,18 +121,18 @@@@ installlib: all install-headers install -m 644 $(LIB) $(prefix)/lib install-headers: - mkdir -p "$(prefix)/include/ffmpeg" + mkdir -p "${DESTDIR}$(prefix)/include/ffmpeg" install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \ $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \ $(SRC_PATH)/libavformat/rtspcodes.h \ - "$(prefix)/include/ffmpeg" + "${DESTDIR}$(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 $@@ $< d32 2 a33 2 distclean clean: rm -f *.o *.d .depend *~ *.a $(LIB) @ 1.6 log @Linux needs -ldl in all cases (from PR 37587). Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @fixes to compile on darwin @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2006/02/16 10:26:30 abs Exp $ d3 2 a4 2 --- libavformat/Makefile.orig 2004-04-24 08:16:23.000000000 -0700 +++ libavformat/Makefile 2007-08-02 10:47:18.000000000 -0700 d31 1 a31 1 + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib d53 11 a63 2 @@@@ -124,11 +128,11 @@@@ install-headers: "$(prefix)/include/ffmpeg" @ 1.4 log @Update ffmpeg to 0.4.9pre1, and add patch for libavcodec buffer overflow http://secunia.com/advisories/17892/ version 0.4.9-pre1: - DV encoder, DV muxer - Microsoft RLE video decoder - Microsoft Video-1 decoder - Apple Animation (RLE) decoder - Apple Graphics (SMC) decoder - Apple Video (RPZA) decoder - Cinepak decoder - Sega FILM (CPK) file demuxer - Westwood multimedia support (VQA & AUD files) - Id Quake II CIN playback support - 8BPS video decoder - FLIC playback support - RealVideo 2.0 (RV20) decoder - Duck TrueMotion v1 (DUCK) video decoder - Sierra VMD demuxer and video decoder - MSZH and ZLIB decoder support - SVQ1 video encoder - AMR-WB support - PPC optimisations - rate distortion optimal cbp support - rate distorted optimal ac prediction for mpeg4 - rate distorted optimal lambda->qp support - AAC encoding with libfaac - Sunplus JPEG codec (SP5X) support - use lagrange multipler instead of qp for ratecontrol - theora/VP3 decoding support - XA and ADX ADPCM codecs - export mpeg2 active display area / pan scan - Add support for configuring with IBM XLC - floating point AAN DCT - initial support for zygovideo (not complete) - rgb ffv1 support - new audio/video parser API - av_log() system - av_read_frame() and av_seek_frame() support - missing last frame fixes - seek by mouse in ffplay - noise reduction of dct coefficients - h263 OBMC & 4MV support - h263 alternative inter vlc support - h263 loop filter - h263 slice structured mode - interlaced DCT support for MPEG2 encoding - stuffing to stay above min_bitrate - mb type & qp vissualization - frame stepping for ffplay - interlaced motion estimation - alternate scantable support - SVCD scan offset support - closed gop support - SSE2 fdct - quantizer noise shaping - G.726 ADPCM audio codec - MS ADPCM encoding - multithreaded/SMP motion estimation - multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263 - multithreaded/SMP decoding for MPEG2 - FLAC decoder - Metrowerks CodeWarrior suppport - h263+ custom pcf support - nicer output for 'ffmpeg -formats' - matroska demuxer - SGI image format, encoding and decoding - h264 loop filter support - h264 CABAC support - nicer looking arrows for the motion vector vissualization - improved VCD support - audio timestamp drift compensation - mpeg2 YUV 422/444 support - polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample - better image scaling - h261 support - correctly interleave packets during encoding - VIS optimized motion compensation - intra_dc_precission>0 encoding support - support reuse of motion vectors/mb types/field select values of the source video - more accurate deblock filter - padding support - many optimizations and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ d3 11 a13 2 --- libavformat/Makefile.orig 2004-04-24 17:16:23.000000000 +0200 +++ libavformat/Makefile @ 1.3 log @Convert to bsd.options.mk, and add three new options: bktr lame vorbis. The latter two add support for reading/writing mp3 and ogg files, while the first adds support for grabbing from bktr(4), based on a file from FreeBSD ports with some additional changes by me. Additionally, document how to use it in the man page. Also, add a patch (by me) to use the NetBSD native audio interface instead of libossaudio (on NetBSD). Based on PR 24691 and additional mails by Ove Soerensen (thanks!). Also addresses PR 20281. Bump PKGREVISION for the audio interface change. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- libavformat/Makefile.orig 2003-09-28 17:26:40.000000000 +0200 +++ libavformat/Makefile 2004-08-14 14:50:54.000000000 +0200 @@@@ -60,6 +60,11 @@@@ d16 2 a17 2 LIB= $(LIBPREF)avformat$(LIBSUF) @@@@ -69,12 +74,14 @@@@ d34 1 a34 1 @@@@ -84,9 +91,6 @@@@ d44 1 a44 1 @@@@ -112,11 +116,11 @@@@ d49 1 a49 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@@ $< d54 1 a54 1 + $(LIBTOOL) --mode=compile $(CXX) $(subst -Wall,,$(CFLAGS)) -c -o $@@ $< d56 1 a56 1 clean: @ 1.2 log @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) @ text @d4 14 a17 2 +++ libavformat/Makefile @@@@ -69,12 +69,14 @@@@ endif d30 1 a30 1 + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) $(PPOBJS:.o=.lo) -rpath $(prefix)/lib $(LIBOSSAUDIO) d34 1 a34 1 @@@@ -84,9 +86,6 @@@@ else d44 1 a44 1 @@@@ -112,11 +111,11 @@@@ install-headers: @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2002/03/22 11:59:19 tron Exp $ d3 3 a5 9 --- 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 @@@@ d7 1 a7 1 LIB= libav.a d12 1 a12 1 all: $(LIB) d14 1 a14 1 $(LIB): $(OBJS) d16 18 a33 2 - $(AR) rcs $@@ $(OBJS) + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib d39 5 d45 1 a45 1 rm -f *.o *~ *.a @ 1.1.1.1 log @Reimport graphics/ffmpeg as multimedia/ffmpeg. @ text @@