On Wed, Apr 11, 2007 at 09:10:20PM -0400, Brad wrote: > On Wed, 11 Apr 2007 12:27:17 +0200 (CEST) > Antoine Jacoutot <[EMAIL PROTECTED]> wrote: > > > Hi. > > > > The included diff > > - updates ffmpeg to CVS version 20070407 > > - adds x264 support > > > > Note that adding libtheora and xvid support could be interesting too, > > but I leave this to the maintainer ;-) > > Tested under i386. > > > > Comments, Ok? > > Here is an updated version of your update to the ffmpeg port.
below is another update. the x264 optimizations won't build on amd64. also, don't rely on svn being installed to get a version #. passed regression tests on amd64 and i386. also tested recording from bktr and encoding to h264 on amd64 and i386. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 2 Mar 2007 23:38:28 -0000 1.26 +++ Makefile 19 Apr 2007 13:02:16 -0000 @@ -2,16 +2,17 @@ COMMENT= "audio/video converter and streamer with bktr(4) support" -DISTNAME= ffmpeg-cvs-20070110 -PKGNAME= ${DISTNAME:S/-cvs//}p1 -SHARED_LIBS= avutil 2.0 \ - avcodec 8.0 \ - avformat 8.0 \ - postproc 8.0 +DISTNAME= ffmpeg-svn-20070419 +PKGNAME= ${DISTNAME:S/-svn//} +SHARED_LIBS= avutil 3.0 \ + avcodec 9.0 \ + avformat 9.0 \ + postproc 9.0 + CATEGORIES= graphics multimedia HOMEPAGE= http://www.ffmpeg.org/ -MAINTAINER= Nikns Siankin <[EMAIL PROTECTED]> +MAINTAINER= Jacob Meuser <[EMAIL PROTECTED]> # GPL PERMIT_PACKAGE_CDROM= "patents" @@ -19,15 +20,18 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -# only available through CVS -MASTER_SITES= ftp://ftp.secure.lv/pub/distfiles/ +# only available through SVN +MASTER_SITES= http://jakemsr.trancell.org/distfiles/ BUILD_DEPENDS= ::textproc/texi2html LIB_DEPENDS= SDL.>=4::devel/sdl \ faac::audio/faac \ faad::audio/faad \ mp3lame.>=0.1::audio/lame \ - vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis + vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \ + a52::audio/liba52 \ + x264::multimedia/x264 \ + theora::multimedia/libtheora WANTLIB= X11 Xext c freetype m pthread ogg ossaudio usbhid z @@ -43,19 +47,20 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --cc=${CC} \ --disable-opts \ - --enable-a52 \ + --enable-liba52 \ --enable-pp \ --enable-gpl \ --enable-pthreads \ --disable-debug \ - --enable-faac \ - --enable-faad \ - --enable-mp3lame \ + --enable-libfaac \ + --enable-libfaad \ + --enable-libmp3lame \ --enable-libogg \ - --enable-vorbis \ + --enable-libvorbis \ + --enable-libtheora \ + --enable-x264 \ --extra-libs="-L${LOCALBASE}/lib" \ --extra-cflags=-I${LOCALBASE}/include - MAKE_FLAGS= LIBavutil_VERSION=$(LIBavutil_VERSION) \ LIBavcodec_VERSION=$(LIBavcodec_VERSION) \ Index: distinfo =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- distinfo 5 Apr 2007 16:19:55 -0000 1.12 +++ distinfo 19 Apr 2007 13:02:16 -0000 @@ -1,5 +1,5 @@ -MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w== -RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw= -SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo= -SHA256 (ffmpeg-cvs-20070110.tar.gz) = TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk= -SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143 +MD5 (ffmpeg-svn-20070419.tar.gz) = 0Ii0yytO/Pd3Tlf0TvwAzQ== +RMD160 (ffmpeg-svn-20070419.tar.gz) = vYnOYS3TfJz7vAP1X/0c7ybm0e8= +SHA1 (ffmpeg-svn-20070419.tar.gz) = Hrhte4jEkxDf9/S1OyQaUFFeqdA= +SHA256 (ffmpeg-svn-20070419.tar.gz) = OoHkV+hdazwtZcoyQf0xp29PjlsrDJwFPMVE/1hqyJM= +SIZE (ffmpeg-svn-20070419.tar.gz) = 2638961 Index: patches/patch-common_mak =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-common_mak,v retrieving revision 1.3 diff -u -r1.3 patch-common_mak --- patches/patch-common_mak 23 Jan 2007 09:34:45 -0000 1.3 +++ patches/patch-common_mak 19 Apr 2007 13:02:16 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-common_mak,v 1.3 2007/01/23 09:34:45 robert Exp $ ---- common.mak.orig Tue Jan 2 18:27:55 2007 -+++ common.mak Tue Jan 2 18:28:19 2007 -@@ -63,13 +63,7 @@ install-libs: $(INSTLIBTARGETS) +$OpenBSD$ +--- common.mak.orig Wed Apr 4 21:25:05 2007 ++++ common.mak Tue Apr 17 22:02:51 2007 +@@ -64,13 +64,7 @@ install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) install -d "$(shlibdir)" -- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ -- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" +- install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" +- $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" - cd "$(shlibdir)" && \ - ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) - cd "$(shlibdir)" && \ Index: patches/patch-libavcodec_Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libavcodec_Makefile,v retrieving revision 1.13 diff -u -r1.13 patch-libavcodec_Makefile --- patches/patch-libavcodec_Makefile 23 Jan 2007 09:34:45 -0000 1.13 +++ patches/patch-libavcodec_Makefile 19 Apr 2007 13:02:16 -0000 @@ -1,16 +1,15 @@ -$OpenBSD: patch-libavcodec_Makefile,v 1.13 2007/01/23 09:34:45 robert Exp $ ---- libavcodec/Makefile.orig Mon Jan 8 01:24:14 2007 -+++ libavcodec/Makefile Mon Jan 8 13:43:41 2007 -@@ -402,11 +402,9 @@ CFLAGS += $(CFLAGS-yes) - OBJS += $(OBJS-yes) - ASM_OBJS += $(ASM_OBJS-yes) +$OpenBSD$ +--- libavcodec/Makefile.orig Tue Apr 17 21:21:04 2007 ++++ libavcodec/Makefile Tue Apr 17 22:12:03 2007 +@@ -385,9 +385,10 @@ ASM_OBJS-$(TARGET_ARCH_BFIN) += bfin/pixels_ + bfin/fdct_bfin.o \ + + EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) ++# really needed: avutil m z faac faad mp3lame vorbis vorbisenc ogg (pthread) --EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) -- NAME=avcodec - ifeq ($(BUILD_SHARED),yes) -LIBVERSION=$(LAVCVERSION) +LIBVERSION=$(LIBavcodec_VERSION) LIBMAJOR=$(LAVCMAJOR) - endif + TESTS= imgresample-test fft-test dct-test Index: patches/patch-libavcodec_cabac_h =================================================================== RCS file: patches/patch-libavcodec_cabac_h diff -N patches/patch-libavcodec_cabac_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libavcodec_cabac_h 19 Apr 2007 13:02:16 -0000 @@ -0,0 +1,30 @@ +$OpenBSD$ +--- libavcodec/cabac.h.orig Tue Apr 17 21:21:05 2007 ++++ libavcodec/cabac.h Tue Apr 17 23:09:53 2007 +@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_inline(CABACCont + #define BYTE "16" + #define BYTEEND "20" + #endif +-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) ++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !defined(ARCH_X86_64) + int bit; + + #ifndef BRANCHLESS_CABAC_DECODER +@@ -632,7 +632,7 @@ static int get_cabac_bypass(CABACContext *c){ + + + static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ +-#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) ++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !defined(ARCH_X86_64) + asm volatile( + "movl "RANGE "(%1), %%ebx \n\t" + "movl "LOW "(%1), %%eax \n\t" +@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_bypass_sign(CABA + + //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) + //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard) +-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) ++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !defined(ARCH_X86_64) + static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ + void *end= significant_coeff_ctx_base + max_coeff - 1; + int minusstart= -(int)significant_coeff_ctx_base; Index: patches/patch-libavcodec_dsputil_c =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libavcodec_dsputil_c,v retrieving revision 1.1 diff -u -r1.1 patch-libavcodec_dsputil_c --- patches/patch-libavcodec_dsputil_c 23 Jan 2007 09:34:45 -0000 1.1 +++ patches/patch-libavcodec_dsputil_c 19 Apr 2007 13:02:16 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-libavcodec_dsputil_c,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- libavcodec/dsputil.c.orig Mon Dec 11 17:53:55 2006 -+++ libavcodec/dsputil.c Tue Jan 2 18:22:01 2007 -@@ -3829,7 +3829,7 @@ void dsputil_init(DSPContext* c, AVCodec +$OpenBSD$ +--- libavcodec/dsputil.c.orig Wed Apr 4 21:25:04 2007 ++++ libavcodec/dsputil.c Tue Apr 17 22:02:51 2007 +@@ -3837,7 +3837,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx { int i; Index: patches/patch-libavcodec_h264_c =================================================================== RCS file: patches/patch-libavcodec_h264_c diff -N patches/patch-libavcodec_h264_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libavcodec_h264_c 19 Apr 2007 13:02:16 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libavcodec/h264.c.orig Tue Apr 17 22:58:23 2007 ++++ libavcodec/h264.c Tue Apr 17 22:59:36 2007 +@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Context *h, DCTE + index[coeff_count++] = last;\ + } + const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; +-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) ++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !defined(ARCH_X86_64) + coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); + } else { + coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); Index: patches/patch-libavcodec_mpegvideo_c =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libavcodec_mpegvideo_c,v retrieving revision 1.1 diff -u -r1.1 patch-libavcodec_mpegvideo_c --- patches/patch-libavcodec_mpegvideo_c 23 Jan 2007 09:34:45 -0000 1.1 +++ patches/patch-libavcodec_mpegvideo_c 19 Apr 2007 13:02:16 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-libavcodec_mpegvideo_c,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- libavcodec/mpegvideo.c.orig Sat Dec 23 05:05:36 2006 -+++ libavcodec/mpegvideo.c Tue Jan 2 18:22:01 2007 -@@ -4837,7 +4837,7 @@ static int pre_estimate_motion_thread(AV +$OpenBSD$ +--- libavcodec/mpegvideo.c.orig Wed Apr 4 21:25:04 2007 ++++ libavcodec/mpegvideo.c Tue Apr 17 22:02:51 2007 +@@ -4840,7 +4840,7 @@ static int pre_estimate_motion_thread(AVCodecContext * static int estimate_motion_thread(AVCodecContext *c, void *arg){ MpegEncContext *s= arg; @@ -10,7 +10,7 @@ s->me.dia_size= s->avctx->dia_size; s->first_slice_line=1; -@@ -4865,7 +4865,7 @@ static int mb_var_thread(AVCodecContext +@@ -4868,7 +4868,7 @@ static int mb_var_thread(AVCodecContext *c, void *arg) MpegEncContext *s= arg; int mb_x, mb_y; @@ -19,7 +19,7 @@ for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { for(mb_x=0; mb_x < s->mb_width; mb_x++) { -@@ -4914,7 +4914,7 @@ static int encode_thread(AVCodecContext +@@ -4917,7 +4917,7 @@ static int encode_thread(AVCodecContext *c, void *arg) PutBitContext pb[2], pb2[2], tex_pb[2]; //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); Index: patches/patch-libavformat_Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libavformat_Makefile,v retrieving revision 1.12 diff -u -r1.12 patch-libavformat_Makefile --- patches/patch-libavformat_Makefile 23 Jan 2007 09:34:45 -0000 1.12 +++ patches/patch-libavformat_Makefile 19 Apr 2007 13:02:16 -0000 @@ -1,12 +1,20 @@ -$OpenBSD: patch-libavformat_Makefile,v 1.12 2007/01/23 09:34:45 robert Exp $ ---- libavformat/Makefile.orig Sun Dec 24 06:51:43 2006 -+++ libavformat/Makefile Tue Jan 2 18:22:01 2007 -@@ -195,7 +195,7 @@ OBJS += $(OBJS-yes) +$OpenBSD$ +--- libavformat/Makefile.orig Tue Apr 17 21:21:09 2007 ++++ libavformat/Makefile Tue Apr 17 22:14:28 2007 +@@ -152,6 +152,7 @@ OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER) += grab_bktr. + + EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ + -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) ++# really needed: m ossaudio avutil avcodec ogg + + CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o + +@@ -163,7 +164,7 @@ OBJS-$(CONFIG_NETWORK) += udp.o tcp. + rtpproto.o mpegts.o rtp_h264.o NAME=avformat - ifeq ($(BUILD_SHARED),yes) -LIBVERSION=$(LAVFVERSION) +LIBVERSION=$(LIBavformat_VERSION) LIBMAJOR=$(LAVFMAJOR) - endif + include ../common.mak Index: patches/patch-libavformat_utils_c =================================================================== RCS file: patches/patch-libavformat_utils_c diff -N patches/patch-libavformat_utils_c --- patches/patch-libavformat_utils_c 23 Jan 2007 09:34:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-libavformat_utils_c,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- libavformat/utils.c.orig Mon Jan 8 16:44:13 2007 -+++ libavformat/utils.c Wed Jan 10 14:38:27 2007 -@@ -1781,7 +1781,7 @@ int av_find_stream_info(AVFormatContext - AVPacketList *pktl=NULL, **ppktl; - int64_t last_dts[MAX_STREAMS]; - int duration_count[MAX_STREAMS]={0}; -- double duration_error[MAX_STREAMS][MAX_STD_TIMEBASES]={{0}}; //FIXME malloc()? -+ double (*duration_error)[MAX_STD_TIMEBASES] = av_mallocz(MAX_STREAMS * sizeof(*duration_error)); - - for(i=0;i<ic->nb_streams;i++) { - st = ic->streams[i]; -@@ -1893,7 +1893,7 @@ int av_find_stream_info(AVFormatContext - // if(st->codec->codec_type == CODEC_TYPE_VIDEO) - // av_log(NULL, AV_LOG_ERROR, "%f\n", dur); - if(duration_count[index] < 2) -- memset(duration_error, 0, sizeof(duration_error)); -+ memset(duration_error, 0, MAX_STREAMS * sizeof(*duration_error)); - for(i=1; i<MAX_STD_TIMEBASES; i++){ - int framerate= get_std_framerate(i); - int ticks= lrintf(dur*framerate/(1001*12)); -@@ -2013,6 +2013,9 @@ int av_find_stream_info(AVFormatContext - } - } - #endif -+ -+ av_freep(&duration_error); -+ - return ret; - } - Index: patches/patch-libavutil_Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libavutil_Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-libavutil_Makefile --- patches/patch-libavutil_Makefile 23 Jan 2007 09:34:45 -0000 1.2 +++ patches/patch-libavutil_Makefile 19 Apr 2007 13:02:16 -0000 @@ -1,12 +1,13 @@ -$OpenBSD: patch-libavutil_Makefile,v 1.2 2007/01/23 09:34:45 robert Exp $ ---- libavutil/Makefile.orig Tue Nov 14 03:02:30 2006 -+++ libavutil/Makefile Mon Dec 11 14:01:08 2006 -@@ -22,7 +22,7 @@ HEADERS = avutil.h common.h mathematics. +$OpenBSD$ +--- libavutil/Makefile.orig Wed Apr 4 21:25:01 2007 ++++ libavutil/Makefile Tue Apr 17 22:12:34 2007 +@@ -21,7 +21,8 @@ HEADERS = avutil.h common.h mathematics.h integer.h ra + random.h mem.h base64.h NAME=avutil - ifeq ($(BUILD_SHARED),yes) -LIBVERSION=$(LAVUVERSION) +LIBVERSION=$(LIBavutil_VERSION) LIBMAJOR=$(LAVUMAJOR) - endif ++# really needed: m + include ../common.mak Index: patches/patch-libpostproc_Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libpostproc_Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-libpostproc_Makefile --- patches/patch-libpostproc_Makefile 23 Jan 2007 09:34:45 -0000 1.1 +++ patches/patch-libpostproc_Makefile 19 Apr 2007 13:02:16 -0000 @@ -1,12 +1,15 @@ -$OpenBSD: patch-libpostproc_Makefile,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- libpostproc/Makefile.orig Mon Dec 4 14:38:30 2006 -+++ libpostproc/Makefile Mon Dec 4 14:38:48 2006 -@@ -8,7 +8,7 @@ EXTRALIBS := -L$(BUILD_ROOT)/libavutil - +$OpenBSD$ +--- libpostproc/Makefile.orig Wed Apr 4 21:25:04 2007 ++++ libpostproc/Makefile Tue Apr 17 22:13:35 2007 +@@ -5,9 +5,10 @@ include ../config.mak + incdir=$(prefix)/include/postproc + + EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) ++# really needed: avutil NAME=postproc - ifeq ($(BUILD_SHARED),yes) -LIBVERSION=$(SPPVERSION) +LIBVERSION=$(LIBpostproc_VERSION) LIBMAJOR=$(SPPMAJOR) - endif + STATIC_OBJS=postprocess.o Index: patches/patch-libswscale_Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-libswscale_Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-libswscale_Makefile --- patches/patch-libswscale_Makefile 23 Jan 2007 09:34:45 -0000 1.1 +++ patches/patch-libswscale_Makefile 19 Apr 2007 13:02:16 -0000 @@ -1,16 +1,12 @@ $OpenBSD: patch-libswscale_Makefile,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- libswscale/Makefile.orig Tue Jan 2 19:01:04 2007 -+++ libswscale/Makefile Tue Jan 2 19:02:35 2007 -@@ -3,11 +3,9 @@ include ../config.mak +--- libswscale/Makefile.orig Wed Apr 4 21:25:05 2007 ++++ libswscale/Makefile Thu Apr 19 05:00:48 2007 +@@ -2,7 +2,7 @@ + include ../config.mak NAME=swscale - ifeq ($(BUILD_SHARED),yes) -LIBVERSION=$(SWSVERSION) +LIBVERSION=$(LIBswscale_VERSION) LIBMAJOR=$(SWSMAJOR) - endif -- --EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) - OBJS= swscale.o rgb2rgb.o - ifeq ($(TARGET_ALTIVEC),yes) + EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) Index: patches/patch-tests_regression_sh =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/patches/patch-tests_regression_sh,v retrieving revision 1.1 diff -u -r1.1 patch-tests_regression_sh --- patches/patch-tests_regression_sh 23 Jan 2007 09:34:45 -0000 1.1 +++ patches/patch-tests_regression_sh 19 Apr 2007 13:02:16 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-tests_regression_sh,v 1.1 2007/01/23 09:34:45 robert Exp $ ---- tests/regression.sh.orig Sat Dec 2 17:03:28 2006 -+++ tests/regression.sh Sat Dec 9 20:16:17 2006 -@@ -89,7 +89,7 @@ fi +$OpenBSD$ +--- tests/regression.sh.orig Tue Apr 17 21:21:06 2007 ++++ tests/regression.sh Tue Apr 17 22:02:51 2007 +@@ -91,7 +91,7 @@ fi # various files @@ -10,7 +10,7 @@ tiny_psnr="./tiny_psnr" reffile="$2" benchfile="$datadir/ffmpeg.bench" -@@ -103,6 +103,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != +@@ -107,6 +107,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then do_md5sum() { md5sum -b $1; } elif [ -x /sbin/md5 ]; then do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } Index: patches/patch-version_sh =================================================================== RCS file: patches/patch-version_sh diff -N patches/patch-version_sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-version_sh 19 Apr 2007 13:02:16 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- version.sh.orig Wed Apr 4 21:25:05 2007 ++++ version.sh Thu Apr 19 05:39:26 2007 +@@ -1,9 +1,9 @@ + #!/bin/sh + +-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` +-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \ +- cut -d '"' -f2 2> /dev/null` +-test $svn_revision || svn_revision=UNKNOWN ++#svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` ++svn_revision=`cd "$1" && grep Revision svn-info | \ ++ cut -d' ' -f2 2> /dev/null` ++test -n "$svn_revision" || svn_revision=UNKNOWN + + NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\"" + OLD_REVISION=`cat version.h 2> /dev/null` Index: pkg/PLIST =================================================================== RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/pkg/PLIST,v retrieving revision 1.11 diff -u -r1.11 PLIST --- pkg/PLIST 2 Mar 2007 23:38:28 -0000 1.11 +++ pkg/PLIST 19 Apr 2007 13:02:16 -0000 @@ -9,14 +9,18 @@ include/ffmpeg/avformat.h include/ffmpeg/avio.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
