fix build with ffmpeg2, bug #498454

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 56 insertions, 3 deletions

diff --git a/net-libs/pjsip/ChangeLog b/net-libs/pjsip/ChangeLog
index c864ee435501..14b5af12b233 100644
--- a/net-libs/pjsip/ChangeLog
+++ b/net-libs/pjsip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/pjsip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.16 2014/01/20 12:36:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.17 2014/03/09 13:07:51 aballier Exp $
+
+  09 Mar 2014; Alexis Ballier <aballier@gentoo.org> pjsip-2.1-r2.ebuild,
+  +files/pjsip-2.1-codecid.patch:
+  fix build with ffmpeg2, bug #498454
 
   20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> pjsip-2.1-r2.ebuild:
   Fix install failure on non-multilib systems, bug #497744. Thanks to Luke-Jr
diff --git a/net-libs/pjsip/files/pjsip-2.1-codecid.patch b/net-libs/pjsip/files/pjsip-2.1-codecid.patch
new file mode 100644
index 000000000000..a6abdca7ff83
--- /dev/null
+++ b/net-libs/pjsip/files/pjsip-2.1-codecid.patch
@@ -0,0 +1,47 @@
+Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c
+===================================================================
+--- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.c
++++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c
+@@ -62,7 +62,7 @@ static const struct ffmpeg_fmt_table_t
+ static const struct ffmpeg_codec_table_t
+ {
+     pjmedia_format_id	id;
+-    enum CodecID	codec_id;
++    enum AVCodecID	codec_id;
+ } ffmpeg_codec_table[] =
+ {
+     {PJMEDIA_FORMAT_H261,	CODEC_ID_H261},
+@@ -165,7 +165,7 @@ pj_status_t PixelFormat_to_pjmedia_forma
+ }
+ 
+ pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
+-					 enum CodecID *codec_id)
++					 enum AVCodecID *codec_id)
+ {
+     unsigned i;
+     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
+@@ -180,7 +180,7 @@ pj_status_t pjmedia_format_id_to_CodecID
+     return PJ_ENOTFOUND;
+ }
+ 
+-pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
++pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
+ 					 pjmedia_format_id *fmt_id)
+ {
+     unsigned i;
+Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h
+===================================================================
+--- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.h
++++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h
+@@ -51,9 +51,9 @@ pj_status_t PixelFormat_to_pjmedia_forma
+ 					     pjmedia_format_id *fmt_id);
+ 
+ pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
+-					 enum CodecID *codec_id);
++					 enum AVCodecID *codec_id);
+ 
+-pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
++pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
+ 					 pjmedia_format_id *fmt_id);
+ 
+ #endif /* __PJMEDIA_FFMPEG_UTIL_H__ */
diff --git a/net-libs/pjsip/pjsip-2.1-r2.ebuild b/net-libs/pjsip/pjsip-2.1-r2.ebuild
index 337fa3a6118c..8cc54bada518 100644
--- a/net-libs/pjsip/pjsip-2.1-r2.ebuild
+++ b/net-libs/pjsip/pjsip-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.2 2014/01/20 12:36:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.3 2014/03/09 13:07:51 aballier Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ IUSE="alsa cli doc examples ext-sound ffmpeg g711 g722 g7221 gsm ilbc l16 oss py
 #small-filter large-filter speex-aec ssl
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
 	gsm? ( media-sound/gsm )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
 	speex? ( media-libs/speex )"
@@ -31,6 +31,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-new-ffmpeg-workaround.patch"
 	# bug #496430
 	epatch "${FILESDIR}/${P}-multilib.patch"
+	# bug #498454
+	epatch "${FILESDIR}/${P}-codecid.patch"
 
 	epatch_user
 }