[gentoo-commits] repo/gentoo:master commit in: net-libs/opal/, net-libs/opal/files/

[Pacho Ramos]

commit:     eb032a7df8f22e980bab0cc686c0ccfb4ce231c0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 11:51:50 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 28 11:51:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb032a7d

net-libs/opal: Support ffmpeg-3 (#575230 by Oleg)

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch | 396 +++++++++++++++++++++++
 net-libs/opal/opal-3.10.11-r1.ebuild             | 253 +++++++++++++++
 2 files changed, 649 insertions(+)

diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
new file mode 100644
index 00000000000..6b58ac28f3d
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
@@ -0,0 +1,396 @@
+Submitted By:            Igor Živković <contact@××××××××××××××××××.hr>
+Date:                    2013-10-08
+Initial Package Version: 3.10.10
+Upstream Status:         Unknown
+Origin:                  Gentoo
+Description:             Fixes building against FFmpeg version >= 2.0.0
+
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
+--- opal-3.10.10.orig/plugins/video/common/dyna.cxx	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.cxx	2013-10-08 12:57:25.058873513 +0200
+@@ -210,7 +210,7 @@
+ #endif
+ 
+ 
+-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+   m_codec = codec;
+   if (m_codec==CODEC_ID_H264)
+@@ -348,12 +348,12 @@
+   return true;
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
+ {
+   return Favcodec_find_encoder(id);
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
+ {
+   WaitAndSignal m(processLock);
+ 
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
+--- opal-3.10.10.orig/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.h	2013-10-08 12:57:25.058873513 +0200
+@@ -88,13 +88,13 @@
+ class FFMPEGLibrary 
+ {
+   public:
+-    FFMPEGLibrary(CodecID codec);
++    FFMPEGLibrary(AVCodecID codec);
+     ~FFMPEGLibrary();
+ 
+     bool Load();
+ 
+-    AVCodec *AvcodecFindEncoder(enum CodecID id);
+-    AVCodec *AvcodecFindDecoder(enum CodecID id);
++    AVCodec *AvcodecFindEncoder(enum AVCodecID id);
++    AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+     AVCodecContext *AvcodecAllocContext(void);
+     AVFrame *AvcodecAllocFrame(void);
+     int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
+@@ -117,15 +117,15 @@
+     DynaLink m_libAvcodec;
+     DynaLink m_libAvutil;
+ 
+-    CodecID m_codec;
++    AVCodecID m_codec;
+     char m_codecString[32];
+ 
+     void (*Favcodec_init)(void);
+     void (*Fav_init_packet)(AVPacket *pkt);
+ 
+     void (*Favcodec_register_all)(void);
+-    AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
+-    AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++    AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
++    AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
+     AVCodecContext *(*Favcodec_alloc_context)(void);
+     AVFrame *(*Favcodec_alloc_frame)(void);
+     int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
+diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
+--- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 03:18:04.000000000 +0100
++++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-10-08 12:57:25.060873488 +0200
+@@ -101,7 +101,7 @@
+  * 1. no value of a existing codec ID changes (that would break ABI),
+  * 2. it is as close as possible to similar codecs.
+  */
+-enum CodecID {
++enum AVCodecID {
+     CODEC_ID_NONE,
+ 
+     /* video codecs */
+@@ -1390,7 +1390,7 @@
+ 
+     char codec_name[32];
+     enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+-    enum CodecID codec_id; /* see CODEC_ID_xxx */
++    enum AVCodecID codec_id; /* see CODEC_ID_xxx */
+ 
+     /**
+      * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+@@ -2843,7 +2843,7 @@
+      */
+     const char *name;
+     enum AVMediaType type;
+-    enum CodecID id;
++    enum AVCodecID id;
+     int priv_data_size;
+     int (*init)(AVCodecContext *);
+     int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
+@@ -2898,7 +2898,7 @@
+      *
+      * See CODEC_ID_xxx
+      */
+-    enum CodecID id;
++    enum AVCodecID id;
+ 
+     /**
+      * Supported pixel format.
+@@ -3402,10 +3402,10 @@
+ /**
+  * Find a registered encoder with a matching codec ID.
+  *
+- * @param id CodecID of the requested encoder
++ * @param id AVCodecID of the requested encoder
+  * @return An encoder if one was found, NULL otherwise.
+  */
+-AVCodec *avcodec_find_encoder(enum CodecID id);
++AVCodec *avcodec_find_encoder(enum AVCodecID id);
+ 
+ /**
+  * Find a registered encoder with the specified name.
+@@ -3418,10 +3418,10 @@
+ /**
+  * Find a registered decoder with a matching codec ID.
+  *
+- * @param id CodecID of the requested decoder
++ * @param id AVCodecID of the requested decoder
+  * @return A decoder if one was found, NULL otherwise.
+  */
+-AVCodec *avcodec_find_decoder(enum CodecID id);
++AVCodec *avcodec_find_decoder(enum AVCodecID id);
+ 
+ /**
+  * Find a registered decoder with the specified name.
+@@ -3822,7 +3822,7 @@
+  * @param[in] codec_id the codec
+  * @return Number of bits per sample or zero if unknown for the given codec.
+  */
+-int av_get_bits_per_sample(enum CodecID codec_id);
++int av_get_bits_per_sample(enum AVCodecID codec_id);
+ 
+ #if FF_API_OLD_SAMPLE_FMT
+ /**
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx	2013-10-08 12:57:25.061873475 +0200
+@@ -48,6 +48,10 @@
+ #endif
+ 
+ #include "h263-1998.h"
++extern "C"
++{
++#include <libavutil/opt.h>
++}
+ #include <limits>
+ #include <iomanip>
+ #include <stdio.h>
+@@ -203,7 +207,7 @@
+   PTRACE(4, m_prefix, "Encoder closed");
+ }
+ 
+-bool H263_Base_EncoderContext::Init(CodecID codecId)
++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+ {
+   PTRACE(5, m_prefix, "Opening encoder");
+ 
+@@ -317,9 +321,9 @@
+     // Level 2+ 
+     // works with eyeBeam, signaled via  non-standard "D"
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+     return;
+   }
+ 
+@@ -328,9 +332,9 @@
+     // Annex F: Advanced Prediction Mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
+     return;
+   }
+ #endif
+@@ -360,9 +364,9 @@
+     // Annex K: Slice Structure
+     // does not work with eyeBeam
+     if (atoi(value) != 0)
+-      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+     return;
+   }
+ 
+@@ -370,9 +374,9 @@
+     // Annex S: Alternative INTER VLC mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
+     return;
+   }
+ 
+@@ -450,15 +454,6 @@
+   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
+   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
+ 
+-  #define CODEC_TRACER_FLAG(tracer, flag) \
+-    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
+-
+   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+ 
+@@ -521,7 +516,7 @@
+ 
+     // Need to copy to local buffer to guarantee 16 byte alignment
+     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
+-    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+ 
+     /*
+     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -603,13 +598,13 @@
+   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+   m_context->opaque = this; // used to separate out packets from different encode threads
+ 
+-  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+   m_context->flags &= ~CODEC_FLAG_4MV;
+ #if LIBAVCODEC_RTP_MODE
+   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
+-  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+-  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
++  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+ 
+   return true;
+ }
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
+--- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h	2013-10-08 12:57:25.062873463 +0200
+@@ -115,7 +115,7 @@
+     virtual ~H263_Base_EncoderContext();
+ 
+     virtual bool Init() = 0;
+-    virtual bool Init(CodecID codecId);
++    virtual bool Init(AVCodecID codecId);
+ 
+     virtual bool SetOptions(const char * const * options);
+     virtual void SetOption(const char * option, const char * value);
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
+--- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in	2013-10-08 12:57:25.062873463 +0200
+@@ -35,7 +35,7 @@
+              $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx	2013-10-08 12:57:25.062873463 +0200
+@@ -27,6 +27,7 @@
+ #include <fstream>
+ #include <stdlib.h> 
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-10-08 12:57:25.063873450 +0200
+@@ -40,6 +40,9 @@
+ #include "plugin-config.h"
+ #endif
+ 
++#define FF_IDCT_H264 11
++#define CODEC_FLAG2_SKIP_RD 0x00004000
++
+ #include <codec/opalplugin.hpp>
+ 
+ #include "../common/ffmpeg.h"
+@@ -1071,13 +1074,10 @@
+         return false;
+ 
+       m_context->workaround_bugs = FF_BUG_AUTODETECT;
+-      m_context->error_recognition = FF_ER_AGGRESSIVE;
+       m_context->idct_algo = FF_IDCT_H264;
+       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+-      m_context->flags2 = CODEC_FLAG2_BRDO |
+-                          CODEC_FLAG2_MEMC_ONLY |
+-                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
++      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+                           CODEC_FLAG2_SKIP_RD |
+                           CODEC_FLAG2_CHUNKS;
+ 
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx	2013-10-08 12:57:25.064873438 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <codec/opalplugin.hpp>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-10-08 12:57:25.064873438 +0200
+@@ -31,7 +31,7 @@
+ SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-10-08 12:57:25.065873425 +0200
+@@ -103,6 +103,7 @@
+ 
+ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ #include "../common/ffmpeg.h"
++#include <libavutil/opt.h>
+ #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ }
+ 
+@@ -589,17 +590,17 @@
+     m_avpicture->quality = m_videoQMin;
+ 
+ #ifdef USE_ORIG
+-    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
+ #else
+     m_avcontext->max_b_frames=0; /*don't use b frames*/
+     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
++    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
+     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+     m_avcontext->flags|=CODEC_FLAG_4MV;
+     m_avcontext->flags|=CODEC_FLAG_GMC;
+     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
+ #endif
+     m_avcontext->opaque = this;              // for use in RTP callback
+ }
+@@ -804,7 +805,7 @@
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+         {
+-            m_avpicture->pict_type = FF_I_TYPE;
++            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+         }
+         else // No IFrame requested, let avcodec decide what to do
+         {
+@@ -1325,7 +1326,7 @@
+ 
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+     m_avcontext->flags |= CODEC_FLAG_4MV; 
+-    m_avcontext->flags |= CODEC_FLAG_PART;
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
+ 

diff --git a/net-libs/opal/opal-3.10.11-r1.ebuild b/net-libs/opal/opal-3.10.11-r1.ebuild
new file mode 100644
index 00000000000..333385c2cdd
--- /dev/null
+++ b/net-libs/opal/opal-3.10.11-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs
+stats swig theora +video vpb vxml +wav x264 x264-static +xml"
+
+REQUIRED_USE="
+	x264-static? ( x264 )
+	h281? ( h224 )
+	sip? ( sipim )
+"
+
+RDEPEND="
+	>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
+	>=media-libs/speex-1.2_beta
+	fax? ( net-libs/ptlib[asn] )
+	h323? ( net-libs/ptlib[asn] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
+	java? ( >=virtual/jre-1.4 )
+	plugins? (
+		media-sound/gsm
+		celt? ( media-libs/celt )
+		ffmpeg? (
+			libav? ( media-video/libav:0=[encode] )
+			!libav? ( media-video/ffmpeg:0=[encode] ) )
+		ixj? ( sys-kernel/linux-headers )
+		ilbc? ( dev-libs/ilbc-rfc3951 )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	virtual/ffmpeg
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp )
+	vxml? ( net-libs/ptlib[http,vxml] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? ( swig? ( dev-lang/swig )
+		>=virtual/jdk-1.4 )
+"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
+#   herited from ptlib: feature is enabled if ptlib has enabled it
+#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+#   forcing ptlib to disable it for opal is not a solution too
+#   atm, accepting the "auto-feature" looks like a good solution
+#   (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+	# workaround for bug 282838
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+	
+	# LFS ffmpeg2+ fixes.
+	eapply "${FILESDIR}"/opal-3.10.10-ffmpeg2-1.patch
+	
+	if ! use h323; then
+		# Without this patch, ekiga wont compile, even with
+		# USE=-h323.
+		eapply "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+	fi
+
+	eapply "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
+
+	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+		|| die "sed failed"
+
+	# sed fixes for ffmpeg-3.
+	sed -e 's/CODEC_ID/AV_&/' \
+		-e 's/PIX_FMT_/AV_&/' \
+		-i plugins/video/H.263-1998/h263-1998.cxx \
+		   plugins/video/common/dyna.cxx          \
+		   plugins/video/H.264/h264-x264.cxx      \
+		   plugins/video/MPEG4-ffmpeg/mpeg4.cxx || die "sed failed"
+	
+	eaclocal
+	eautoconf
+
+	# in plugins
+	cd plugins/
+	eaclocal
+	eautoconf
+	cd ..
+
+	# disable celt if celt is not enabled (prevent auto magic dep)
+	# already in repository
+	if ! use celt; then
+		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+			|| die "sed failed"
+	fi
+
+	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+	if ! use swig; then
+		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+	fi
+
+	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local forcedconf=""
+
+	# fix bug 277233, upstream bug 2820939
+	if use fax; then
+		forcedconf="${forcedconf} --enable-statistics"
+	fi
+
+	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+	# versioncheck: check for ptlib version
+	# shared: should always be enabled for a lib
+	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+	# samples: only build some samples, useless
+	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+	# default-to-full-capabilties: default enable by upstream
+	# aec: atm, only used when bundled speex, so it's painless for us
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# msrp: highly experimental
+	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
+	# g711plc: force enable
+	# rfc4103: not really used, upstream bug 2795831
+	# t38, spandsp: merged in fax
+	# h450, h460, h501: merged in h323 (they are additional features of h323)
+	econf \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-localilbc \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-msrp \
+		--disable-spandsp \
+		--enable-g711plc \
+		--enable-rfc4103 \
+		--disable-capi \
+		$(use_enable debug) \
+		$(use_enable fax) \
+		$(use_enable fax t38) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable h323) \
+		$(use_enable h323 h450) \
+		$(use_enable h323 h460) \
+		$(use_enable h323 h501) \
+		$(use_enable iax) \
+		$(use_enable ivr) \
+		$(use_enable ixj) \
+		$(use_enable java) \
+		$(use_enable lid) \
+		$(use_enable plugins) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) $(use_enable video rfc4175) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static) \
+		${forcedconf}
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts}
+}
+
+src_install() {
+	default
+
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
+	fi
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls ${basedir} --hide=configure* \
+			--hide=opal_samples.mak.in`"
+
+		# first, install files
+		insinto ${exampledir}/
+		doins ${basedir}/{configure*,opal_samples*} \
+			|| die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+
+		# some examples need version.h
+		insinto "/usr/share/doc/${PF}/"
+		doins version.h || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags in ptlib and opal"
+	fi
+
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
+		ewarn "Most audio/video features or plugins have been disabled silently"
+		ewarn "even if enabled via USE flags."
+		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+	fi
+}