Works fine for a while on amd64 and i386.
Could it get commited finnaly?
Fixes problem if /tmp mounted noexec (from RD Thrush):
diff -wbu /usr/ports/graphics/ffmpeg/Makefile.20070429
/usr/ports/graphics/ffmpeg/Makefile
--- /usr/ports/graphics/ffmpeg/Makefile.20070429 Sun Apr 29 01:31:52
2007
+++ /usr/ports/graphics/ffmpeg/Makefile Tue May 22 11:31:27 2007
@@ -69,7 +69,13 @@
LIBavformat_VERSION=$(LIBavformat_VERSION) \
LIBpostproc_VERSION=$(LIBpostproc_VERSION)
+WRKTMP= ${WRKDIR}/tmp
+CONFIGURE_ENV+= TMPDIR=${WRKTMP}
+
REGRESS_TARGET= codectest
+
+pre-configure:
+ -mkdir ${WRKTMP}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffmpeg
On Wed, May 02, 2007 at 09:49:10AM +0000, Jacob Meuser wrote:
>On Wed, May 02, 2007 at 09:24:04AM +0200, Antoine Jacoutot wrote:
>> On Wednesday 02 May 2007 09:13:42 Jacob Meuser wrote:
>> > update FFmpeg to (more or less) latest svn.
>>
>> Didn't you forget anything ;)
>
>yeah, the diff would help.
>
>
>--
>[EMAIL PROTECTED]
>SDF Public Access UNIX System - http://sdf.lonestar.org
>
>
>Index: ffmpeg/Makefile
>===================================================================
>RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/Makefile,v
>retrieving revision 1.26
>diff -u -r1.26 Makefile
>--- ffmpeg/Makefile 2 Mar 2007 23:38:28 -0000 1.26
>+++ ffmpeg/Makefile 1 May 2007 20:53:32 -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-20070501
>+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]>
>+HOMEPAGE= http://ffmpeg.mplayerhq.hu/
>+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
>
>@@ -39,28 +43,44 @@
> CFLAGS+=-fomit-frame-pointer
> .endif
>
>+# inter-library dependencies for the current configuration
>+LIBavutil_EXTRALIBS=-lm
>+LIBavcodec_EXTRALIBS=-lavutil -lm -lz -L${LOCALBASE}/lib -lfaac -lfaad
>-lmp3lame -lvorbis -lvorbisenc -la52 -ltheora -lx264 -pthread
>+LIBavformat_EXTRALIBS=-lavutil -lavcodec -lossaudio -lm -L${LOCALBASE}/lib
>-logg
>+LIBpostproc_EXTRALIBS=-lavutil
>+
> CONFIGURE_STYLE= simple
> 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
>
>+CONFIGURE_ENV+= LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
>+ LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
>+ LIBavformat_EXTRALIBS="${LIBavformat_EXTRALIBS}" \
>+ LIBpostproc_EXTRALIBS="${LIBpostproc_EXTRALIBS}"
>
> MAKE_FLAGS= LIBavutil_VERSION=$(LIBavutil_VERSION) \
> LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
> LIBavformat_VERSION=$(LIBavformat_VERSION) \
>- LIBpostproc_VERSION=$(LIBpostproc_VERSION)
>+ LIBpostproc_VERSION=$(LIBpostproc_VERSION) \
>+ LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
>+ LIBavcodec_EXTRALIBS="-L${WRKBUILD}/libavutil
>${LIBavcodec_EXTRALIBS}" \
>+ LIBavformat_EXTRALIBS="-L${WRKBUILD}/libavutil
>-L${WRKBUILD}/libavcodec ${LIBavformat_EXTRALIBS}" \
>+ LIBpostproc_EXTRALIBS="-L${WRKBUILD}/libavutil
>${LIBpostproc_EXTRALIBS}"
>
> FAKE_FLAGS= DESTDIR=${WRKINST} \
> LDCONFIG=true \
>Index: ffmpeg/distinfo
>===================================================================
>RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/distinfo,v
>retrieving revision 1.12
>diff -u -r1.12 distinfo
>--- ffmpeg/distinfo 5 Apr 2007 16:19:55 -0000 1.12
>+++ ffmpeg/distinfo 1 May 2007 20:53:32 -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-20070501.tar.gz) = 7CjiHgpM+BEIM9VXSpKfmw==
>+RMD160 (ffmpeg-svn-20070501.tar.gz) = 9O2Xt3UkaUVLqPI3e1oZ36gkU5E=
>+SHA1 (ffmpeg-svn-20070501.tar.gz) = Gh3M0xS5fbx6a+KfOWBJzfr0RKo=
>+SHA256 (ffmpeg-svn-20070501.tar.gz) =
>qTeso7MbiB9K5aPacZQ6yQrFl+rmXmlsXXf+wSFbJRk=
>+SIZE (ffmpeg-svn-20070501.tar.gz) = 2656700
>Index: ffmpeg/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
>--- ffmpeg/patches/patch-common_mak 23 Jan 2007 09:34:45 -0000 1.3
>+++ ffmpeg/patches/patch-common_mak 1 May 2007 20:53:32 -0000
>@@ -1,12 +1,21 @@
>-$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 Fri Apr 20 00:31:46 2007
>+@@ -29,7 +29,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
>+ ln -sf $^ $@
>+
>+ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
>+- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
>++ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRAOBJS)
>+ $(SLIB_EXTRA_CMD)
>+
>+ %.o: %.c
>+@@ -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: ffmpeg/patches/patch-configure
>===================================================================
>RCS file: ffmpeg/patches/patch-configure
>diff -N ffmpeg/patches/patch-configure
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ ffmpeg/patches/patch-configure 1 May 2007 20:53:32 -0000
>@@ -0,0 +1,30 @@
>+$OpenBSD$
>+--- configure.orig Tue May 1 13:26:05 2007
>++++ configure Tue May 1 13:29:58 2007
>+@@ -2123,18 +2123,18 @@ Cflags: -I\${includedir}
>+ EOF
>+ }
>+
>+-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version"
>-lavutil "" ffmpeg
>+-pkgconfig_generate_uninstalled libavutil "FFmpeg utility library"
>"$lavu_version"
>++pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version"
>"-lavutil $LIBavutil_EXTRALIBS" "" ffmpeg
>++pkgconfig_generate_uninstalled libavutil "FFmpeg utility library"
>"$lavu_version" "$LIBavutil_EXTRALIBS"
>+
>+-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version"
>"-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
>+-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library"
>"$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
>++pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version"
>"-lavcodec $LIBavcodec_EXTRALIBS" "vorbis vorbisenc theora x264 libavutil =
>$lavu_version" ffmpeg
>++pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library"
>"$lavc_version" "$LIBavcodec_EXTRALIBS" "vorbis vorbisenc theora x264
>libavutil = $lavu_version"
>+
>+-pkgconfig_generate libavformat "FFmpeg container format library"
>"$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec =
>$lavc_version" ffmpeg
>+-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library"
>"$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
>++pkgconfig_generate libavformat "FFmpeg container format library"
>"$lavf_version" "-lavformat $LIBavformat_EXTRALIBS" "ogg >= 1.1 libavutil =
>$lavu_version libavcodec = $lavc_version" ffmpeg
>++pkgconfig_generate_uninstalled libavformat "FFmpeg container format library"
>"$lavf_version" "$LIBavformat_EXTRALIBS" "ogg >= 1.1 libavutil = $lavu_version
>libavcodec = $lavc_version"
>+
>+ if enabled pp; then
>+- pkgconfig_generate libpostproc "FFmpeg post processing library"
>"$pp_version" -lpostproc "" postproc
>+- pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing
>library" "$pp_version"
>++ pkgconfig_generate libpostproc "FFmpeg post processing library"
>"$pp_version" "-lpostproc $LIBpostproc_EXTRALIBS" "" postproc
>++ pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing
>library" "$pp_version" "$LIBpostproc_EXTRALIBS"
>+ fi
>+
>+ if enabled swscaler; then
>Index: ffmpeg/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
>--- ffmpeg/patches/patch-libavcodec_Makefile 23 Jan 2007 09:34:45 -0000
>1.13
>+++ ffmpeg/patches/patch-libavcodec_Makefile 1 May 2007 20:53:32 -0000
>@@ -1,16 +1,26 @@
>-$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 May 1 13:26:00 2007
>++++ libavcodec/Makefile Tue May 1 13:29:58 2007
>+@@ -380,10 +380,11 @@ ASM_OBJS-$(TARGET_ARCH_BFIN) += bfin/pixels_
>+ bfin/idct_bfin.o \
>+ bfin/fdct_bfin.o \
>
> -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
>--
>++#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
>++EXTRALIBS=${LIBavcodec_EXTRALIBS}
>+
> NAME=avcodec
>- ifeq ($(BUILD_SHARED),yes)
> -LIBVERSION=$(LAVCVERSION)
> +LIBVERSION=$(LIBavcodec_VERSION)
> LIBMAJOR=$(LAVCMAJOR)
>- endif
>+
>+ TESTS= imgresample-test fft-test dct-test
>+@@ -413,7 +414,7 @@ cpuid_test: i386/cputest.c
>+ $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
>+
>+ imgresample-test: imgresample.c $(LIB)
>+- $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
>++ $(CC) $(CFLAGS) -DTEST -o $@ $^ $(LIBavcodec_EXTRALIBS)
>+
>+ dct-test: dct-test.o fdctref.o $(LIB)
>
>Index: ffmpeg/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
>--- ffmpeg/patches/patch-libavcodec_dsputil_c 23 Jan 2007 09:34:45 -0000
>1.1
>+++ ffmpeg/patches/patch-libavcodec_dsputil_c 1 May 2007 20:53:32 -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: ffmpeg/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
>--- ffmpeg/patches/patch-libavcodec_mpegvideo_c 23 Jan 2007 09:34:45
>-0000 1.1
>+++ ffmpeg/patches/patch-libavcodec_mpegvideo_c 1 May 2007 20:53:32
>-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: ffmpeg/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
>--- ffmpeg/patches/patch-libavformat_Makefile 23 Jan 2007 09:34:45 -0000
>1.12
>+++ ffmpeg/patches/patch-libavformat_Makefile 1 May 2007 20:53:32 -0000
>@@ -1,12 +1,23 @@
>-$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 May 1 13:26:05 2007
>++++ libavformat/Makefile Tue May 1 13:29:58 2007
>+@@ -154,8 +154,9 @@ OBJS+= framehook.o
>+ OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER) += grab.o
>+ OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER) += grab_bktr.o
>+
>+-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
>++#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
>+ -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
>++EXTRALIBS=${LIBavformat_EXTRALIBS}
>+
>+ CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o
>+
>+@@ -170,7 +171,7 @@ OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
>+ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
>
> NAME=avformat
>- ifeq ($(BUILD_SHARED),yes)
> -LIBVERSION=$(LAVFVERSION)
> +LIBVERSION=$(LIBavformat_VERSION)
> LIBMAJOR=$(LAVFMAJOR)
>- endif
>
>+ include ../common.mak
>Index: ffmpeg/patches/patch-libavformat_utils_c
>===================================================================
>RCS file: ffmpeg/patches/patch-libavformat_utils_c
>diff -N ffmpeg/patches/patch-libavformat_utils_c
>--- ffmpeg/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: ffmpeg/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
>--- ffmpeg/patches/patch-libavutil_Makefile 23 Jan 2007 09:34:45 -0000
>1.2
>+++ ffmpeg/patches/patch-libavutil_Makefile 1 May 2007 20:53:32 -0000
>@@ -1,12 +1,14 @@
>-$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 Fri Apr 20 00:33:41 2007
>+@@ -21,7 +21,9 @@ 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
>++
>++EXTRALIBS=${LIBavutil_EXTRALIBS}
>
>+ include ../common.mak
>Index: ffmpeg/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
>--- ffmpeg/patches/patch-libpostproc_Makefile 23 Jan 2007 09:34:45 -0000
>1.1
>+++ ffmpeg/patches/patch-libpostproc_Makefile 1 May 2007 20:53:32 -0000
>@@ -1,12 +1,17 @@
>-$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 Fri Apr 20 00:36:12 2007
>+@@ -4,10 +4,11 @@ include ../config.mak
>+ # Overload incdir, postproc include files go in a different directory.
>+ incdir=$(prefix)/include/postproc
>+
>+-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
>++#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
>++EXTRALIBS=${LIBpostproc_EXTRALIBS}
>
> NAME=postproc
>- ifeq ($(BUILD_SHARED),yes)
> -LIBVERSION=$(SPPVERSION)
> +LIBVERSION=$(LIBpostproc_VERSION)
> LIBMAJOR=$(SPPMAJOR)
>- endif
>
>+ STATIC_OBJS=postprocess.o
>Index: ffmpeg/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
>--- ffmpeg/patches/patch-libswscale_Makefile 23 Jan 2007 09:34:45 -0000
>1.1
>+++ ffmpeg/patches/patch-libswscale_Makefile 1 May 2007 20:53:32 -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: ffmpeg/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
>--- ffmpeg/patches/patch-tests_regression_sh 23 Jan 2007 09:34:45 -0000
>1.1
>+++ ffmpeg/patches/patch-tests_regression_sh 1 May 2007 20:53:32 -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: ffmpeg/patches/patch-version_sh
>===================================================================
>RCS file: ffmpeg/patches/patch-version_sh
>diff -N ffmpeg/patches/patch-version_sh
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ ffmpeg/patches/patch-version_sh 1 May 2007 20:53:32 -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: ffmpeg/pkg/PLIST
>===================================================================
>RCS file: /home/cvs/OpenBSD/ports/graphics/ffmpeg/pkg/PLIST,v
>retrieving revision 1.11
>diff -u -r1.11 PLIST
>--- ffmpeg/pkg/PLIST 2 Mar 2007 23:38:28 -0000 1.11
>+++ ffmpeg/pkg/PLIST 1 May 2007 20:53:32 -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
>
