Patch around ffmpeg API breakage in devel/opal.

Require multimedia/ffmpeg010 too -- easier than patching the further
breakage in multimedia/ffmpeg, which should probably wait until we
just update opal.

3 files changed, 28 insertions, 9 deletions

diff --git a/devel/opal/Makefile b/devel/opal/Makefile
index 407c1b1c0f5..a5d934d1571 100644
--- a/devel/opal/Makefile
+++ b/devel/opal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2012/12/16 01:52:11 obache Exp $
+# $NetBSD: Makefile,v 1.23 2013/01/19 20:29:24 riastradh Exp $
 #
 
 DISTNAME=		opal-3.6.6
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/opal/3.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -60,6 +60,6 @@ BUILDLINK_API_DEPENDS.gsm+=	gsm>=1.0.12
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/ptlib/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg010/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/opal/distinfo b/devel/opal/distinfo
index 79e49276a69..6627ebeadb9 100644
--- a/devel/opal/distinfo
+++ b/devel/opal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/04/20 07:24:39 dholland Exp $
+$NetBSD: distinfo,v 1.12 2013/01/19 20:29:24 riastradh Exp $
 
 SHA1 (opal-3.6.6.tar.bz2) = bd5e3907faf96db884a64dacdedb2259aca30cd3
 RMD160 (opal-3.6.6.tar.bz2) = b639709f7e28ce607478bddc41d171e0e54bee9f
@@ -7,7 +7,7 @@ SHA1 (patch-configure) = e478024b9f80d08e5d3cfb85f9a825a12a7a4ec2
 SHA1 (patch-configure.ac) = 0ca73eeab0cb4cd8b1da85cf285e1e6edb596820
 SHA1 (patch-plugins_configure) = dcddc6200e457e0a2d1434036f5ad029dca5fbcf
 SHA1 (patch-plugins_configure.ac) = 559fd67e0813a56b1ed13a020acb600ac706d81d
-SHA1 (patch-plugins_video_H.263-1998_h263-1993.cxx) = 5119490e7fecaca0a42e9542182a987ea56f99fc
+SHA1 (patch-plugins_video_H.263-1998_h263-1993.cxx) = 4af35a91f97aec8883fa26dd11e0dac655e9dc3a
 SHA1 (patch-plugins_video_H.263-1998_h263pframe.cxx) = b006ac9d5f8b5ee3e26180eeba85a76f52ffcaf8
 SHA1 (patch-plugins_video_H.264_Makefile.in) = f8b740cd8aebb5ac0b3c6e89e57ed4d7553e3e9d
 SHA1 (patch-plugins_video_H.264_gpl_Makefile.in) = fdc5c9923a897e5ec8ba5f201844fdf9cd5b1ad4
diff --git a/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx b/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx
index e85c970da35..6f2f27946d1 100644
--- a/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx
+++ b/devel/opal/patches/patch-plugins_video_H.263-1998_h263-1993.cxx
@@ -1,8 +1,27 @@
-$NetBSD: patch-plugins_video_H.263-1998_h263-1993.cxx,v 1.1 2011/12/04 22:06:04 marino Exp $
+$NetBSD: patch-plugins_video_H.263-1998_h263-1993.cxx,v 1.2 2013/01/19 20:29:24 riastradh Exp $
 
---- plugins/video/H.263-1998/h263-1998.cxx.orig	2011-12-04 20:11:24.617287000 +0000
+--- plugins/video/H.263-1998/h263-1998.cxx.orig	2009-09-22 00:57:52.000000000 +0000
 +++ plugins/video/H.263-1998/h263-1998.cxx
-@@ -688,7 +688,7 @@ int H263_RFC2190_EncoderContext::EncodeF
+@@ -364,9 +364,6 @@ void H263_Base_EncoderContext::SetTSTO (
+   _context->qmax = round ( (31.0 - H263P_MIN_QUANT) / 31.0 * tsto + H263P_MIN_QUANT);
+   _context->qmax = std::min( _context->qmax, 31);
+ 
+-  _context->mb_qmin = _context->qmin;
+-  _context->mb_qmax = _context->qmax;
+-
+   // Lagrange multipliers - this is how the context defaults do it:
+   _context->lmin = _context->qmin * FF_QP2LAMBDA;
+   _context->lmax = _context->qmax * FF_QP2LAMBDA; 
+@@ -478,8 +475,6 @@ bool H263_Base_EncoderContext::OpenCodec
+   CODEC_TRACER(tracer, "GOP is " << _context->gop_size);
+   CODEC_TRACER(tracer, "qmin set to " << _context->qmin);
+   CODEC_TRACER(tracer, "qmax set to " << _context->qmax);
+-  CODEC_TRACER(tracer, "mb_qmin set to " << _context->mb_qmin);
+-  CODEC_TRACER(tracer, "mb_qmax set to " << _context->mb_qmax);
+   CODEC_TRACER(tracer, "bit_rate set to " << _context->bit_rate);
+   CODEC_TRACER(tracer, "bit_rate_tolerance set to " <<_context->bit_rate_tolerance);
+   CODEC_TRACER(tracer, "rc_min_rate set to " << _context->rc_min_rate);
+@@ -688,7 +683,7 @@ int H263_RFC2190_EncoderContext::EncodeF
  
    _inputFrame->data[1] = _inputFrame->data[0] + size;
    _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
@@ -11,7 +30,7 @@ $NetBSD: patch-plugins_video_H.263-1998_h263-1993.cxx,v 1.1 2011/12/04 22:06:04
  
    currentMb = 0;
    currentBytes = 0;
-@@ -885,7 +885,7 @@ int H263_RFC2429_EncoderContext::EncodeF
+@@ -885,7 +880,7 @@ int H263_RFC2429_EncoderContext::EncodeF
    _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
    _inputFrame->data[1] = _inputFrame->data[0] + size;
    _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);