http://secure.lv/~nikns/stuff/ports/ffmpeg-20070208.diff
Index: ffmpeg/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ffmpeg/Makefile 26 Jan 2007 16:03:20 -0000 1.25
+++ ffmpeg/Makefile 8 Feb 2007 11:35:56 -0000
@@ -2,13 +2,13 @@
COMMENT= "audio/video converter and streamer with bktr(4) support"
-DISTNAME= ffmpeg-cvs-20070110
-PKGNAME= ${DISTNAME:S/-cvs//}p0
-SHARED_LIBS= avutil 2.0 \
- avcodec 8.0 \
- avformat 8.0 \
- postproc 8.0 \
- swscale 0.0
+DISTNAME= ffmpeg-cvs-20070208
+PKGNAME= ${DISTNAME:S/-cvs//}
+SHARED_LIBS= avutil 3.0 \
+ avcodec 9.0 \
+ avformat 9.0 \
+ postproc 9.0 \
+ swscale 1.0
CATEGORIES= graphics multimedia
HOMEPAGE= http://www.ffmpeg.org/
Index: ffmpeg/distinfo
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- ffmpeg/distinfo 23 Jan 2007 09:34:45 -0000 1.11
+++ ffmpeg/distinfo 8 Feb 2007 11:35:56 -0000
@@ -1,4 +1,4 @@
-MD5 (ffmpeg-cvs-20070110.tar.gz) = af7284a1e4f49a2f858e5c6537b376ff
-RMD160 (ffmpeg-cvs-20070110.tar.gz) = a0869c18e2791f98d1e791e465f9b2038993497c
-SHA1 (ffmpeg-cvs-20070110.tar.gz) = d4cb810aa1da67bc231e1009544315df625105ea
-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
+MD5 (ffmpeg-cvs-20070208.tar.gz) = 851e932ff189c8a4cf99b8b3612aebc1
+RMD160 (ffmpeg-cvs-20070208.tar.gz) = a95e7033c8cb4eee91d7fb9188903b4bec264e06
+SHA1 (ffmpeg-cvs-20070208.tar.gz) = f20bb42ebbc3c4e5f8e66ef149e9dee13be9996e
+SIZE (ffmpeg-cvs-20070208.tar.gz) = 2489667
Index: ffmpeg/patches/patch-common_mak
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -0000
@@ -1,12 +1,13 @@
$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)
+--- common.mak.orig Thu Jan 25 14:29:48 2007
++++ common.mak Wed Feb 7 12:59:43 2007
+@@ -62,14 +62,7 @@ install: install-libs install-headers
+ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME)
- install -d "$(shlibdir)"
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+- install -d "$(shlibdir)"
+- 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-libavcodec_Makefile
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -0000
@@ -1,9 +1,9 @@
$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)
+--- libavcodec/Makefile.orig Tue Feb 6 22:19:04 2007
++++ libavcodec/Makefile Wed Feb 7 12:58:38 2007
+@@ -405,11 +405,9 @@ endif
+
+ OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
Index: ffmpeg/patches/patch-libavformat_Makefile
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -0000
@@ -1,7 +1,7 @@
$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)
+--- libavformat/Makefile.orig Thu Jan 25 02:34:38 2007
++++ libavformat/Makefile Wed Feb 7 12:58:38 2007
+@@ -175,7 +175,7 @@ endif
NAME=avformat
ifeq ($(BUILD_SHARED),yes)
Index: ffmpeg/patches/patch-libavformat_utils_c
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavformat_utils_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libavformat_utils_c
--- ffmpeg/patches/patch-libavformat_utils_c 23 Jan 2007 09:34:45 -0000
1.1
+++ ffmpeg/patches/patch-libavformat_utils_c 8 Feb 2007 11:35:56 -0000
@@ -1,16 +1,16 @@
$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
+--- libavformat/utils.c.orig Tue Feb 6 01:04:48 2007
++++ libavformat/utils.c Wed Feb 7 14:47:20 2007
+@@ -1813,7 +1813,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));
+ offset_t old_offset = url_ftell(&ic->pb);
for(i=0;i<ic->nb_streams;i++) {
- st = ic->streams[i];
-@@ -1893,7 +1893,7 @@ int av_find_stream_info(AVFormatContext
+@@ -1926,7 +1926,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)
@@ -19,7 +19,7 @@
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
+@@ -2046,6 +2046,9 @@ int av_find_stream_info(AVFormatContext
}
}
#endif
Index: ffmpeg/patches/patch-libavutil_Makefile
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -0000
@@ -1,7 +1,7 @@
$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.
+--- libavutil/Makefile.orig Thu Feb 1 00:58:53 2007
++++ libavutil/Makefile Wed Feb 7 12:58:39 2007
+@@ -23,7 +23,7 @@ HEADERS = avutil.h common.h mathematics.
NAME=avutil
ifeq ($(BUILD_SHARED),yes)
Index: ffmpeg/patches/patch-libswscale_Makefile
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -0000
@@ -1,6 +1,6 @@
$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
+--- libswscale/Makefile.orig Sun Jan 28 19:52:59 2007
++++ libswscale/Makefile Wed Feb 7 12:58:39 2007
@@ -3,11 +3,9 @@ include ../config.mak
NAME=swscale
@@ -13,4 +13,4 @@
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
OBJS= swscale.o rgb2rgb.o
- ifeq ($(TARGET_ALTIVEC),yes)
+
Index: ffmpeg/patches/patch-tests_regression_sh
===================================================================
RCS file: /cvs/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 8 Feb 2007 11:35:56 -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
+--- tests/regression.sh.orig Wed Feb 7 01:59:10 2007
++++ tests/regression.sh Wed Feb 7 12:58:39 2007
+@@ -90,7 +90,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`" !=
+@@ -106,6 +106,8 @@ if [ X"`echo | md5sum 2> /dev/null`" !=
do_md5sum() { md5sum -b $1; }
elif [ -x /sbin/md5 ]; then
do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
Index: ffmpeg/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- ffmpeg/pkg/PLIST 23 Jan 2007 09:34:45 -0000 1.10
+++ ffmpeg/pkg/PLIST 8 Feb 2007 11:35:56 -0000
@@ -14,6 +14,7 @@
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/opt.h
