On Sun, Jun 29, 2008 at 02:56:35AM +0000, Jacob Meuser wrote: > > here's an update to a recent snapshot of ffmpeg.
> this also requires changes to several ffmpeg related ports. the > patches for those are attached. as ajacoutot@ pointed out, I missed that net/openh323 is also affected. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/net/openh323/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 22 May 2008 19:27:04 -0000 1.17 +++ Makefile 29 Jun 2008 23:46:35 -0000 @@ -6,7 +6,7 @@ V= 1_19_0_1 DISTNAME= openh323-v${V} -PKGNAME= openh323-${V:S/_/./g}p0 +PKGNAME= openh323-${V:S/_/./g}p1 CATEGORIES= net devel EXTRACT_SUFX= -src-tar.gz @@ -39,7 +39,7 @@ NO_REGRESS= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil" CONFIGURE_ARGS= --enable-h263avcodec \ --disable-localspeex \ @@ -53,6 +53,8 @@ CC=${CC} CPLUS=${CXX} BUILDSELF="1" MAKE_FLAGS= LIB_MAJOR_VERSION=${LIBh323_VERSION:R} \ LIB_MINOR_VERSION=${LIBh323_VERSION:E} + +CFLAGS += -I${LOCALBASE}/include/libavcodec do-extract: @tar xzf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR} Index: patches/patch-src_ffh263codec_cxx =================================================================== RCS file: /home/cvs/OpenBSD/ports/net/openh323/patches/patch-src_ffh263codec_cxx,v retrieving revision 1.2 diff -u -r1.2 patch-src_ffh263codec_cxx --- patches/patch-src_ffh263codec_cxx 15 Mar 2008 17:38:43 -0000 1.2 +++ patches/patch-src_ffh263codec_cxx 29 Jun 2008 23:46:35 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.2 2008/03/15 17:38:43 ajacoutot Exp $ ---- src/ffh263codec.cxx.orig Wed Dec 8 03:03:59 2004 -+++ src/ffh263codec.cxx Tue Mar 4 14:29:13 2008 +--- src/ffh263codec.cxx.orig Tue Dec 7 18:03:59 2004 ++++ src/ffh263codec.cxx Sun Jun 29 16:00:47 2008 @@ -142,6 +142,7 @@ * */ @@ -50,6 +50,24 @@ isLoadedOK = TRUE; } +@@ -357,7 +364,7 @@ int FfmpgLink::AvcodecDecodeVideo(AVCodecContext *ctx, + PWaitAndSignal m(processLock); + + PTRACE(6, "Avcodec decode video at " << ::hex << ctx << " frame" << picture +- << " buf" << (int)buf << ::dec << " got picture" << *got_picture_ptr ++ << " buf" << (long)buf << ::dec << " got picture" << *got_picture_ptr + << " buffer size is" << buf_size); + int res = Favcodec_decode_video(ctx, picture, got_picture_ptr, buf, buf_size); + PTRACE(6, "Avcodec decode video of " <<buf_size << " bytes. result is " << res ); +@@ -370,7 +377,7 @@ int FfmpgLink::AvcodecEncodeVideo(AVCodecContext *ctx, + PWaitAndSignal m(processLock); + + PTRACE(6, "Avcodec encode video for ctxt " << ::hex << ctx << " picture" << pict +- << " buf" << (int)buf << ::dec << " buffer size is" << buf_size); ++ << " buf" << (long)buf << ::dec << " buffer size is" << buf_size); + int res = Favcodec_encode_video(ctx, buf, buf_size, pict); + + PTRACE(6, "Avcodec encode video into " << res << " bytes."); @@ -388,10 +395,12 @@ void FfmpgLink::AvcodecInit(void) Favcodec_init(); }
