head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.6 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.4 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.2 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.12.0.4 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.2 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.11.0.6 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.4 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.2 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.10.0.2 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.9.0.8 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.6 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.4 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.2 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.8.0.8 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.6 pkgsrc-2008Q1:1.8.0.4 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.2 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.7.0.2 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.6.0.6 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.4 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.2 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.5.0.4 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 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.13 date 2011.07.19.19.53.18; author drochner; state dead; branches; next 1.12; 1.12 date 2011.01.17.16.51.05; author drochner; state Exp; branches; next 1.11; 1.11 date 2010.05.24.22.10.02; author tron; state Exp; branches; next 1.10; 1.10 date 2010.03.14.23.07.30; author tron; state Exp; branches; next 1.9; 1.9 date 2008.09.07.23.39.38; author ahoka; state dead; branches; next 1.8; 1.8 date 2007.12.22.00.05.25; author joerg; state Exp; branches; next 1.7; 1.7 date 2007.08.02.21.48.34; author dbj; state Exp; branches; next 1.6; 1.6 date 2006.12.23.20.53.42; author jdc; state Exp; branches; next 1.5; 1.5 date 2006.06.26.19.39.54; author wiz; 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.06.11.01.54; author drochner; 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.13 log @update to 0.7.1 changes: many new features and bugfixes (those of the 0.8 branch), but API/ABI compatible with 0.6 @ text @$NetBSD: patch-ae,v 1.12 2011/01/17 16:51:05 drochner Exp $ --- libswscale/rgb2rgb.c.orig 2010-06-04 05:16:42.000000000 +0900 +++ libswscale/rgb2rgb.c 2011-01-05 17:09:12.000000000 +0900 @@@@ -98,7 +98,7 @@@@ long lumStride, long chromStride, long srcStride); -#if ARCH_X86 +#if ARCH_X86 && !defined(sun) DECLARE_ASM_CONST(8, uint64_t, mmx_null) = 0x0000000000000000ULL; DECLARE_ASM_CONST(8, uint64_t, mmx_one) = 0xFFFFFFFFFFFFFFFFULL; DECLARE_ASM_CONST(8, uint64_t, mask32b) = 0x000000FF000000FFULL; @@@@ -159,7 +159,7 @@@@ #define RENAME(a) a ## _C #include "rgb2rgb_template.c" -#if ARCH_X86 +#if ARCH_X86 && !defined(sun) && !defined(__APPLE__) //MMX versions #undef RENAME @ 1.12 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.11 log @Disable assembler optimizations (e.g. MMX support) to make this build under Mac OS X Intel. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.10 2010/03/14 23:07:30 tron Exp $ d3 4 a6 7 Really turn AMD 3DNow (and MMX, etc.) because the shared library will otherwise not build (Mac OS X) or work (Solaris) on Intel CPUs. --- libswscale/rgb2rgb.c.orig Thu Mar 19 04:45:29 2009 +++ libswscale/rgb2rgb.c Sun Mar 14 23:55:39 2010 @@@@ -101,7 +101,7 @@@@ long lumStride, long chromStride, long srcStride); d9 2 a10 2 -#if ARCH_X86 && CONFIG_GPL +#if ARCH_X86 && CONFIG_GPL && !defined(sun) d14 1 a14 1 @@@@ -162,7 +162,7 @@@@ d18 2 a19 2 -#if ARCH_X86 && CONFIG_GPL +#if ARCH_X86 && CONFIG_GPL && !defined(sun) && !defined(__APPLE__) @ 1.10 log @Make this build and work under Solaris 10 x86: 1.) Work around lack of support for Sun Studio C Compiler and bugs in this compiler (it crashes with "-O3", "-xO2" works fine). 2.) Use a hammer to disable MMX, AMD 3DNow and SSE support as Solaris refuses to load libraries which contain unsupported instructions. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 will otherwise not work on Intel CPUs. d22 1 a22 1 +#if ARCH_X86 && CONFIG_GPL && !defined(sun) @ 1.9 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-ae,v 1.8 2007/12/22 00:05:25 joerg Exp $ d3 17 a19 63 --- libavcodec/Makefile.orig 2004-06-18 15:11:15.000000000 +0200 +++ libavcodec/Makefile @@@@ -7,7 +7,7 @@@@ include ../config.mak VPATH=$(SRC_PATH)/libavcodec # NOTE: -I.. is needed to include config.h -CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE +CFLAGS=$(SHCFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE OBJS= common.o utils.o mem.o allcodecs.o \ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ @@@@ -165,7 +165,7 @@@@ endif ifeq ($(TARGET_ARCH_SPARC),yes) OBJS+=sparc/dsputil_vis.o sparc/%.o: sparc/%.c - $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@@ $< + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@@ $< endif ifeq ($(TARGET_ARCH_SPARC64),yes) CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc @@@@ -180,6 +180,9 @@@@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF) endif TESTS= imgresample-test dct-test motion-test fft-test +install: all + $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB:.a=.la) ${DESTDIR}$(prefix)/lib + all: $(LIB) $(SLIB) amrlibs: @@@@ -189,8 +192,8 @@@@ tests: apiexample cpuid_test $(TESTS) $(LIB): $(OBJS) $(AMRLIBS) rm -f $@@ - $(AR) rc $@@ $(OBJS) $(AMREXTRALIBS) - $(RANLIB) $@@ + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib $(EXTRALIBS) $(AMREXTRALIBS) + $(SLIB): $(OBJS) ifeq ($(CONFIG_WIN32),yes) @@@@ -206,13 +209,10 @@@@ libpostproc/libpostproc.a: $(MAKE) -C libpostproc %.o: %.c - $(CC) $(CFLAGS) -c -o $@@ $< + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@@ $< %.o: %.S - $(CC) $(CFLAGS) -c -o $@@ $< - -depend: $(SRCS) - $(CC) -MM $(CFLAGS) $^ 1>.depend + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@@ $< dep: depend @@@@ -278,14 +278,14 @@@@ install: endif installlib: all install-headers - install -m 644 $(LIB) $(prefix)/lib + install -m 644 $(LIB) ${DESTDIR}$(prefix)/lib d21 2 a22 8 install-headers: - mkdir -p "$(prefix)/include/ffmpeg" + mkdir -p "${DESTDIR}$(prefix)/include/ffmpeg" install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \ $(SRC_PATH)/libavcodec/common.h \ $(SRC_PATH)/libavcodec/rational.h \ - "$(prefix)/include/ffmpeg" + ${DESTDIR}$(prefix)/include/ffmpeg d24 2 a25 2 # # include dependency files if they exist @ 1.8 log @Linux needs -ldl in all cases (from PR 37587). Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @fixes to compile on darwin @ text @d1 1 a1 1 -$NetBSD: patch-ae,v 1.6 2006/12/23 20:53:42 jdc Exp $ d3 2 a4 2 --- libavcodec/Makefile.orig 2004-06-18 06:11:15.000000000 -0700 +++ libavcodec/Makefile 2007-08-02 10:50:10.000000000 -0700 d28 1 a28 1 + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib d60 18 @ 1.6 log @Make this compile under sparc64. OK joerg@@. @ text @d1 13 a13 3 -$NetBSD: patch-ae,v 1.5 2006/06/26 19:39:54 wiz Exp $ --- libavcodec/Makefile.orig 2004-06-18 14:11:15.000000000 +0100 +++ libavcodec/Makefile 2006-12-18 16:06:24.000000000 +0000 @ 1.5 log @regen (offsets) @ text @d1 12 a12 4 $NetBSD: patch-ae,v 1.4 2006/02/16 10:26:30 abs Exp $ --- libavcodec/Makefile.orig 2004-06-18 13:11:15.000000000 +0000 +++ libavcodec/Makefile @ 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-ae,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ d3 1 a3 1 --- libavcodec/Makefile.orig 2003-09-28 17:26:39.000000000 +0200 d5 1 a5 1 @@@@ -145,6 +145,9 @@@@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF) d15 1 a15 1 @@@@ -154,8 +157,8 @@@@ tests: apiexample cpuid_test $(TESTS) d26 1 a26 1 @@@@ -171,13 +174,10 @@@@ libpostproc/libpostproc.a: @ 1.3 log @make sure libavcodec gets linked against libz and libm for proper inter-library dependencies @ text @d1 1 a1 1 $NetBSD$ @ 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 @d21 1 a21 1 + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2002/03/22 11:59:19 tron Exp $ d3 1 a3 1 --- libavcodec/Makefile.orig Mon Aug 13 06:52:36 2001 d5 3 a7 10 @@@@ -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 d12 4 a15 2 all: $(LIB) tests: apiexample cpuid_test $(TESTS) d17 1 a17 1 $(LIB): $(OBJS) $(ASM_OBJS) d19 2 a20 1 - $(AR) rcs $@@ $(OBJS) $(ASM_OBJS) d22 1 d24 4 a27 1 dsputil.o: dsputil.c dsputil.h d35 3 d40 1 a40 3 %.o: %.s - nasm -f elf -o $@@ $< + nasm -f $(FILEFORMAT) -o $@@ $< a41 2 # depend only used by mplayer now dep: depend @ 1.1.1.1 log @Reimport graphics/ffmpeg as multimedia/ffmpeg. @ text @@