git: 0af5d42d3e79 - main - net/opal: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Jun 2023 05:48:36 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0af5d42d3e79a370e0620fd97c5ce26968e2ab9c
commit 0af5d42d3e79a370e0620fd97c5ce26968e2ab9c
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-30 05:41:35 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-30 05:48:20 +0000
net/opal: Remove expired port
2023-06-30 net/opal: Very outdated, current version in tree was released back in 2013 and upstream is still active
Approved by: portmgr (blanket)
---
MOVED | 1 +
net/Makefile | 1 -
net/opal/Makefile | 286 ---------------
net/opal/distinfo | 2 -
net/opal/files/patch-Makefile.in | 15 -
net/opal/files/patch-c++11 | 173 ---------
net/opal/files/patch-ffmpeg | 398 ---------------------
net/opal/files/patch-ffmpeg3 | 247 -------------
net/opal/files/patch-ffmpeg4 | 262 --------------
net/opal/files/patch-include_h323_h323ep.h | 11 -
.../patch-plugins_audio_SILK_SILK-SDK_Makefile | 17 -
net/opal/files/patch-plugins_configure | 189 ----------
...patch-plugins_fax_fax__spandsp_spandsp__fax.cpp | 153 --------
.../patch-plugins_video_H.263-1998_rfc2190.cxx | 11 -
.../patch-plugins_video_H.264_shared_x264wrap.h | 11 -
net/opal/files/patch-plugins_video_common_mpi.cxx | 13 -
net/opal/pkg-descr | 16 -
net/opal/pkg-plist | 162 ---------
18 files changed, 1 insertion(+), 1967 deletions(-)
diff --git a/MOVED b/MOVED
index f3290863539e..823d5775956a 100644
--- a/MOVED
+++ b/MOVED
@@ -7702,3 +7702,4 @@ databases/mariadb104-server||2023-06-30|Has expired: Use databases/mariadb106-se
databases/mariadb104-client||2023-06-30|Has expired: Use databases/mariadb106-client
dns/mydns-ng||2023-06-30|Has expired: Abandonware, last release in 2010. Consider migrating to dns/powerdns
dns/mydns||2023-06-30|Has expired: Abandonware, last release in 2006. Consider migrating to dns/powerdns
+net/opal||2023-06-30|Has expired: Very outdated, current version in tree was released back in 2013 and upstream is still active
diff --git a/net/Makefile b/net/Makefile
index 81c4c3e4943d..ff66f4621d5a 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -565,7 +565,6 @@
SUBDIR += onionprobe
SUBDIR += ooni-mini
SUBDIR += ooni-probe-cli
- SUBDIR += opal
SUBDIR += open-isns
SUBDIR += openbgpd
SUBDIR += openbgpd6
diff --git a/net/opal/Makefile b/net/opal/Makefile
deleted file mode 100644
index 3020c76e1584..000000000000
--- a/net/opal/Makefile
+++ /dev/null
@@ -1,286 +0,0 @@
-PORTNAME= opal
-PORTVERSION= 3.10.10
-PORTREVISION= 32
-CATEGORIES= net
-MASTER_SITES= GNOME
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= VoIP abstraction library
-WWW= http://opalvoip.org/
-
-LICENSE= MPL10
-
-DEPRECATED= Very outdated, current version in tree was released back in 2013 and upstream is still active
-EXPIRATION_DATE=2023-06-30
-
-LIB_DEPENDS= libpt.so:devel/ptlib
-
-USES= compiler:c11 gmake pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-CXXFLAGS+= -I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include
-CPPFLAGS+= -I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib -L${LOCALBASE}/lib
-
-OPTIONS_DEFINE= JAVA ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \
- H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \
- AEC DEBUG RUBY
-# MSRP = plist extra line vpd?
-# RTPTEXT disable == build fail, so make it default?
-OPTIONS_DEFAULT=GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \
- RTPTEXT LID AEC
-DEBUG_DESC= Install debug library
-JAVA_DESC= Java JNI support
-RUBY_DESC= Ruby support
-ILBC_DESC= iLBC codec from ports
-GSM_DESC= GSM 06.10 codec from ports
-SPEEX_DESC= SPEEX codec from ports
-THEORA_DESC= Theora codec support
-FFMPEG_DESC= Ffmpeg codec support
-X264_DESC= x.264 codec support
-SIP_DESC= SIP protocol support
-H323_DESC= H.323 protocol support
-IAX_DESC= IAX2 protocol support
-H224_DESC= H.224 control protocol
-H281_DESC= H.281 (Far End Camera Control) protocol support
-FAX_DESC= Fax T.38 support
-MSRP_DESC= MSRP protocol
-SIPIM_DESC= SIP-IM protocol
-RTPTEXT_DESC= RFC4103 Text RTP payload support
-H450_DESC= H.450 H.323 subset
-H460_DESC= H.460 H.323 extension for NAT traversal
-H501_DESC= H.501 H323 mobility extensions
-LID_DESC= Light-Weight Identity (incl. xJack cards and voicetronix vpb) support
-UVIDEO_DESC= RFC4175 uncompressed video RTP payload
-AEC_DESC= Accoustic echo cancellation
-
-.include <bsd.port.options.mk>
-
-.ifdef OPALDIR
-.error OPALDIR is defined as an environment variable, or in the arguments \
- to "make". Please unset it and restart the build.
-.endif
-
-PLIST_SUB+= VERSION=${PORTVERSION} \
- PVERSION_MAJOR=${PVERSION_MAJOR} \
- PVERSION_MINOR=${PVERSION_MINOR}
-
-PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+$//g}
-PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g}
-
-.if ${PORT_OPTIONS:MDEBUG}
-ALL_TARGET= debug opt
-PLIST_SUB+= DEBUG=""
-.else
-ALL_TARGET= opt
-PLIST_SUB+= DEBUG="@comment "
-.endif
-
-CONFIGURE_ARGS+= --disable-celt --disable-zrtp
-
-.if ${PORT_OPTIONS:MGSM}
-LIB_DEPENDS+= libgsm.so:audio/gsm
-.else
-CONFIGURE_ARGS+= --enable-localgsm
-.endif
-
-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+= libspeex.so:audio/speex
-.else
-CONFIGURE_ARGS+= --enable-localspeex
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-CONFIGURE_ARGS+= --enable-java
-.else
-CONFIGURE_ARGS+= --disable-java
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-CONFIGURE_ARGS+= --enable-ruby
-.else
-CONFIGURE_ARGS+= --disable-ruby
-.endif
-
-.if ${PORT_OPTIONS:MILBC}
-LIB_DEPENDS+= libilbc.so:net/ilbc
-.else
-CONFIGURE_ARGS+= --enable-localilbc
-.endif
-
-.if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+= libtheora.so:multimedia/libtheora
-CONFIGURE_ARGS+= --enable-theora
-PLIST_SUB+= THEORA=""
-WITH_VIDEO= yes
-.else
-CONFIGURE_ARGS+= --disable-theora
-PLIST_SUB+= THEORA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= libx264.so:multimedia/libx264
-CONFIGURE_ARGS+= --enable-x264
-PLIST_SUB+= X264=""
-WITH_VIDEO= yes
-# work around some weirdness in plugins/configure where it looses the
-# cflags/libs of x264
-CONFIGURE_ENV+= X264_CFLAGS="`pkg-config --cflags x264`" \
- X264_LIBS="`pkg-config --libs x264`"
-.else
-CONFIGURE_ARGS+= --disable-x264
-PLIST_SUB+= X264="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= libavutil.so.56:multimedia/ffmpeg4
-CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-CONFIGURE_ARGS+= --enable-libavcodec
-MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-PLIST_SUB+= FFMPEG=""
-WITH_VIDEO= yes
-.else
-CONFIGURE_ARGS+= --disable-libavcodec
-PLIST_SUB+= FFMPEG="@comment "
-.endif
-
-WITH_VIDEO=yes
-.if defined(WITH_VIDEO)
-CONFIGURE_ARGS+= --enable-video
-PLIST_SUB+= VIDEO=""
-.else
-CONFIGURE_ARGS+= --disable-video
-PLIST_SUB+= VIDEO="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSIP}
-CONFIGURE_ARGS+= --enable-sip
-.else
-CONFIGURE_ARGS+= --disable-sip
-.endif
-
-.if ${PORT_OPTIONS:MH323}
-CONFIGURE_ARGS+= --enable-h323
-.else
-CONFIGURE_ARGS+= --disable-h323
-.endif
-
-.if ${PORT_OPTIONS:MIAX}
-CONFIGURE_ARGS+= --enable-iax2
-.else
-CONFIGURE_ARGS+= --disable-iax2
-.endif
-
-.if ${PORT_OPTIONS:MH224}
-CONFIGURE_ARGS+= --enable-h224
-.else
-CONFIGURE_ARGS+= --disable-h224
-.endif
-
-.if ${PORT_OPTIONS:MH281}
-CONFIGURE_ARGS+= --enable-h281
-.else
-CONFIGURE_ARGS+= --disable-h281
-.endif
-
-.if ${PORT_OPTIONS:MFAX}
-LIB_DEPENDS+= libspandsp.so:comms/spandsp
-CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38
-PLIST_SUB+= FAX=""
-.else
-CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp
-PLIST_SUB+= FAX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMSRP}
-CONFIGURE_ARGS+= --enable-msrp
-##BROKEN= Does not compile
-.else
-CONFIGURE_ARGS+= --disable-msrp
-.endif
-
-.if ${PORT_OPTIONS:MSIPIM}
-CONFIGURE_ARGS+= --enable-sipim
-.else
-CONFIGURE_ARGS+= --disable-sipim
-.endif
-
-.if ${PORT_OPTIONS:MRTPTEXT}
-CONFIGURE_ARGS+= --enable-rfc4103
-.else
-CONFIGURE_ARGS+= --disable-rfc4103
-.endif
-
-.if ${PORT_OPTIONS:MH450}
-CONFIGURE_ARGS+= --enable-h450
-.else
-CONFIGURE_ARGS+= --disable-h450
-.endif
-
-.if ${PORT_OPTIONS:MH460}
-CONFIGURE_ARGS+= --enable-h460
-.else
-CONFIGURE_ARGS+= --disable-h460
-.endif
-
-.if ${PORT_OPTIONS:MH501}
-CONFIGURE_ARGS+= --enable-h501
-.else
-CONFIGURE_ARGS+= --disable-h501
-.endif
-
-.if ${PORT_OPTIONS:MLID}
-CONFIGURE_ARGS+= --enable-lid --enable-ixj --enable-vpb
-PLIST_SUB+= LID=""
-.else
-CONFIGURE_ARGS+= --disable-lid --disable-ixj --disable-vpb
-PLIST_SUB+= LID="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MUVIDEO}
-CONFIGURE_ARGS+= --enable-rfc4175
-.else
-CONFIGURE_ARGS+= --disable-rfc4175
-.endif
-
-# xxxx
-.if ${PORT_OPTIONS:MXXXX}
-CONFIGURE_ARGS+= --enable-rfc2435
-.else
-CONFIGURE_ARGS+= --disable-rfc2435
-.endif
-
-.if ${PORT_OPTIONS:MAEC}
-CONFIGURE_ARGS+= --enable-aec
-.else
-CONFIGURE_ARGS+= --disable-aec
-.endif
-
-# ??
-CONFIGURE_ARGS+= --disable-debug
-
-# configure flags not used
-CONFIGURE_ARGS+= --disable-gsmamr \
- --disable-ruby
-
-post-install:
- ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MAJOR}
- ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MINOR}
-.if ${PORT_OPTIONS:MDEBUG}
- ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR}
- ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR}
-.endif
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PORTVERSION}
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*/*.so
-
-post-install-FAX-on:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/fax/spandsp_ptplugin.so
-
-post-install-LID-on:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/lid/vpb_ptplugin.so
-
-post-install-X264-on:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/codecs/video/h264_video_pwplugin_helper
-
-.include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
deleted file mode 100644
index 7cbf2a283067..000000000000
--- a/net/opal/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (opal-3.10.10.tar.xz) = f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864
-SIZE (opal-3.10.10.tar.xz) = 5886812
diff --git a/net/opal/files/patch-Makefile.in b/net/opal/files/patch-Makefile.in
deleted file mode 100644
index 98d4b537af17..000000000000
--- a/net/opal/files/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.orig 2013-07-11 10:39:04.000000000 +0200
-+++ Makefile.in 2013-07-11 10:39:56.000000000 +0200
-@@ -666,12 +666,6 @@
-
- install:
- mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)
-- ( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) ; then \
-- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \
-- fi )
-- ( if test -e $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) ; then \
-- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \
-- fi )
- ( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) ; then \
- $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir) ; \
- ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED) ; \
diff --git a/net/opal/files/patch-c++11 b/net/opal/files/patch-c++11
deleted file mode 100644
index 0438b2f54570..000000000000
--- a/net/opal/files/patch-c++11
+++ /dev/null
@@ -1,173 +0,0 @@
-src/im/msrp.cxx:838:47: error: invalid operands to binary expression ('basic_ostream<char, std::__1::char_traits<char> >' and 'std::__1::ostream' (aka 'basic_ostream<char>'))
- PStringStream str; str << ::setfill('\r') << mime.PrintContents(str);
- ~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~
-src/sip/sipep.cxx:474:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
- if (remoteParty.Find(";OPAL-"OPAL_SIP_REFERRED_CONNECTION) == P_MAX_INDEX)
- ^
-
-speexcodec.cxx:783:64: error: non-constant-expression cannot be narrowed from type 'int' to
- 'unsigned int' in initializer list [-Wc++11-narrowing]
- DECLARE_H323_NARROW_SPEEX_CODEC(ietfSpeex, Narrow5k95, 2, NARROW_BITSPERFRAME_MODE2),
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
-speexcodec.cxx:759:38: note: expanded from macro 'NARROW_BITSPERFRAME_MODE2'
-#define NARROW_BITSPERFRAME_MODE2 (Speex_Bits_Per_Second(2, 8000)/50) // 119 // 5950
- ^
-speexcodec.cxx:466:3: note: expanded from macro 'DECLARE_H323_NARROW_SPEEX_CODEC'
- bitsPerFrame*50, /* raw bits per second */ \
- ^~~~~~~~~~~~~~~
-speexcodec.cxx:783:64: note: insert an explicit cast to silence this issue
- DECLARE_H323_NARROW_SPEEX_CODEC(ietfSpeex, Narrow5k95, 2, NARROW_BITSPERFRAME_MODE2),
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
- static_cast<unsigned int>(
-speexcodec.cxx:759:38: note: expanded from macro 'NARROW_BITSPERFRAME_MODE2'
-#define NARROW_BITSPERFRAME_MODE2 (Speex_Bits_Per_Second(2, 8000)/50) // 119 // 5950
- ^
-speexcodec.cxx:466:3: note: expanded from macro 'DECLARE_H323_NARROW_SPEEX_CODEC'
- bitsPerFrame*50, /* raw bits per second */ \
- ^~~~~~~~~~~~~~~
-G7222Codec.cpp:617:5: error: non-constant-expression cannot be narrowed from type 'int' to
- 'unsigned int' in initializer list [-Wc++11-narrowing]
- AMRWB_ALIGNED_BPS (AMRWB_24k), // raw bits per second
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-G7222Codec.cpp:119:33: note: expanded from macro 'AMRWB_ALIGNED_BPS'
-#define AMRWB_ALIGNED_BPS(mode) ((AMRWB_block_size_octet[(mode)] + 1) * 50 * 8)
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-G7222Codec.cpp:617:5: note: insert an explicit cast to silence this issue
- AMRWB_ALIGNED_BPS (AMRWB_24k), // raw bits per second
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- static_cast<unsigned int>( )
-G7222Codec.cpp:119:33: note: expanded from macro 'AMRWB_ALIGNED_BPS'
-#define AMRWB_ALIGNED_BPS(mode) ((AMRWB_block_size_octet[(mode)] + 1) * 50 * 8)
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-h263-1998.cxx:77:34: error: invalid suffix on literal; C++11 requires a space between literal and
- identifier [-Wreserved-user-defined-literal]
-#define DEFAULT_CUSTOM_MPI "0,0,"STRINGIZE(PLUGINCODEC_MPI_DISABLED)
- ^
-h264-x264.cxx:1183:35: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t'
- (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~
-h264-x264.cxx:1183:35: note: insert an explicit cast to silence this issue
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~
- static_cast<size_t>( )
-h264-x264.cxx:1183:53: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t'
- (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~~~
-h264-x264.cxx:1183:53: note: insert an explicit cast to silence this issue
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~~~
- static_cast<size_t>( )
-h264-x264.cxx:1183:73: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t'
- (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~~~
-h264-x264.cxx:1183:73: note: insert an explicit cast to silence this issue
- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
- ^~~~~~~~~~~~~~~~~~
- static_cast<size_t>( )
-
---- plugins/audio/G.722.2/G7222Codec.cpp.orig 2013-02-20 02:17:52 UTC
-+++ plugins/audio/G.722.2/G7222Codec.cpp
-@@ -109,7 +109,7 @@ const UWord16 AMRWB_core_block_bits[16]= { 132, 177, 2
- const UWord16 AMRWB_efficient_ToC_bits = 6;
- const UWord16 AMRWB_efficient_CMR_bits = 4;
-
--const UWord8 AMRWB_block_size_octet[16]= { 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1 };
-+const unsigned AMRWB_block_size_octet[16]= { 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1 };
-
- // RFC 3267 octet-aligned ToC adds 8 bits to each core speech bits frame and 8 per packet for header
- // RFC 3267 bandwidth-efficient adds 6 bits to each core speech bits frame and 4 per packet for header
-@@ -186,7 +186,7 @@ static int AMRWBEncode (const struct PluginCodec_Defin
- //PTRACE(2, "Codec\tAMR-WB encoder: Audio data of size " << *fromLen << " did not match expected " << AMRWB_FRAME_SAMPLES * sizeof(short));
- return 0;
- }
-- if (*toLen < (unsigned) AMRWB_block_size_octet[Context->mode] + 1)
-+ if (*toLen < AMRWB_block_size_octet[Context->mode] + 1)
- {
- //PTRACE(2,"Codec\tAMR-WB encoder: Output buffer of size " << *toLen << " too short for mode " << mode);
- return 0;
-@@ -346,7 +346,7 @@ static int AMRWBDecode (const struct PluginCodec_Defin
- return 0;
-
- case -2:
-- //PTRACE(2, "Codec\tAMR-WB decoder: Packet size " << *fromLen << " did not match expected " << (unsigned)(AMRWB_block_size_octet[FrameType] + 1) << " for frame type " << FrameType);
-+ //PTRACE(2, "Codec\tAMR-WB decoder: Packet size " << *fromLen << " did not match expected " << (AMRWB_block_size_octet[FrameType] + 1) << " for frame type " << FrameType);
- return 0;
-
- case -3:
---- plugins/audio/Speex/speexcodec.cxx.orig 2013-02-20 02:17:48 UTC
-+++ plugins/audio/Speex/speexcodec.cxx
-@@ -756,18 +756,19 @@ CREATE_NARROW_SPEEXW_CAP_DATA(Narrow-8k, Narrow8k,
-
- ////////////////////////////////////////////////////////////////////////////////////////////////
-
--#define NARROW_BITSPERFRAME_MODE2 (Speex_Bits_Per_Second(2, 8000)/50) // 119 // 5950
--#define NARROW_BITSPERFRAME_MODE3 (Speex_Bits_Per_Second(3, 8000)/50) // 160 // 8000
--#define NARROW_BITSPERFRAME_MODE4 (Speex_Bits_Per_Second(4, 8000)/50) // 220 // 11000
--#define NARROW_BITSPERFRAME_MODE5 (Speex_Bits_Per_Second(5, 8000)/50) // 300 // 15000
--#define NARROW_BITSPERFRAME_MODE6 (Speex_Bits_Per_Second(6, 8000)/50) // 364 // 18200
--#define NARROW_BITSPERFRAME_MODE7 (Speex_Bits_Per_Second(7, 8000)/50) // 492 // 26400
-+#define NARROW_BITSPERFRAME_MODE(m) ((unsigned)Speex_Bits_Per_Second(m, 8000)/50)
-+#define NARROW_BITSPERFRAME_MODE2 NARROW_BITSPERFRAME_MODE(2) // 119 // 5950
-+#define NARROW_BITSPERFRAME_MODE3 NARROW_BITSPERFRAME_MODE(3) // 160 // 8000
-+#define NARROW_BITSPERFRAME_MODE4 NARROW_BITSPERFRAME_MODE(4) // 220 // 11000
-+#define NARROW_BITSPERFRAME_MODE5 NARROW_BITSPERFRAME_MODE(5) // 300 // 15000
-+#define NARROW_BITSPERFRAME_MODE6 NARROW_BITSPERFRAME_MODE(6) // 364 // 18200
-+#define NARROW_BITSPERFRAME_MODE7 NARROW_BITSPERFRAME_MODE(7) // 492 // 26400
-
- //#define WIDE_BITSPERFRAME_MODE2 ((Speex_Bytes_Per_Frame(2, 16000)/50) // NARROW_BITSPERFRAME_MODE2 + 112) // 11550
- //#define WIDE_BITSPERFRAME_MODE3 ((Speex_Bytes_Per_Frame(3, 16000)/50) // 17600
- //#define WIDE_BITSPERFRAME_MODE4 ((Speex_Bytes_Per_Frame(4, 16000)/50) // 28600
- //#define WIDE_BITSPERFRAME_MODE5 ((Speex_Bytes_Per_Frame(5, 16000)/50) // 28600
--#define WIDE_BITSPERFRAME_MODE6 (Speex_Bits_Per_Second(6, 16000)/50) // 20600
-+#define WIDE_BITSPERFRAME_MODE6 ((unsigned)Speex_Bits_Per_Second(6, 16000)/50) // 20600
-
- static struct PluginCodec_Definition ver1SpeexCodecDefn[] = {
-
---- plugins/video/H.263-1998/h263-1998.cxx.orig 2013-02-20 02:18:03 UTC
-+++ plugins/video/H.263-1998/h263-1998.cxx
-@@ -70,7 +70,7 @@ static const char sdpH263[] = { "H263" };
-
-
- #define MAX_H263_CUSTOM_SIZES 10
--#define DEFAULT_CUSTOM_MPI "0,0,"STRINGIZE(PLUGINCODEC_MPI_DISABLED)
-+#define DEFAULT_CUSTOM_MPI "0,0," STRINGIZE(PLUGINCODEC_MPI_DISABLED)
-
- static struct StdSizes {
- enum {
---- plugins/video/H.264/h264-x264.cxx.orig 2013-02-20 02:18:02 UTC
-+++ plugins/video/H.264/h264-x264.cxx
-@@ -1181,7 +1181,7 @@ class MyDecoder : public PluginCodec<MY_CODEC>
-
- uint8_t * src[3] = { m_picture->data[0], m_picture->data[1], m_picture->data[2] };
- uint8_t * dst[3] = { OPAL_VIDEO_FRAME_DATA_PTR(videoHeader), dst[0] + ySize, dst[1] + uvSize };
-- size_t dstLineSize[3] = { m_context->width, m_context->width/2, m_context->width/2 };
-+ size_t dstLineSize[3] = { (size_t)m_context->width, (size_t)m_context->width/2, (size_t)m_context->width/2 };
-
- for (int y = 0; y < m_context->height; ++y) {
- for (int plane = 0; plane < 3; ++plane) {
---- src/im/msrp.cxx.orig 2013-02-20 02:18:42 UTC
-+++ src/im/msrp.cxx
-@@ -835,7 +835,8 @@ bool MSRPProtocol::SendREPORT(const PString & chunkId,
- flush();
-
- {
-- PStringStream str; str << ::setfill('\r') << mime.PrintContents(str);
-+ PStringStream str; str << ::setfill('\r');
-+ mime.PrintContents(str);
- PTRACE(4, "Sending MSRP REPORT\n" << "MSRP " << chunkId << " " << MSRPCommands[REPORT] << CRLF
- << "To-Path: " << toUrl << CRLF
- << "From-Path: "<< fromUrl << CRLF
---- src/sip/sipep.cxx.orig 2013-02-20 02:18:32 UTC
-+++ src/sip/sipep.cxx
-@@ -471,7 +471,7 @@ PBoolean SIPEndPoint::SetupTransfer(const PString & to
- if (!AddConnection(connection))
- return false;
-
-- if (remoteParty.Find(";OPAL-"OPAL_SIP_REFERRED_CONNECTION) == P_MAX_INDEX)
-+ if (remoteParty.Find(";OPAL-" OPAL_SIP_REFERRED_CONNECTION) == P_MAX_INDEX)
- otherConnection->Release(OpalConnection::EndedByCallForwarded);
- else
- otherConnection->SetPhase(OpalConnection::ForwardingPhase);
diff --git a/net/opal/files/patch-ffmpeg b/net/opal/files/patch-ffmpeg
deleted file mode 100644
index 80dca469d947..000000000000
--- a/net/opal/files/patch-ffmpeg
+++ /dev/null
@@ -1,398 +0,0 @@
-patch from: http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opal.html
-
-Submitted By: Igor Živković <contact@igor-zivkovic.from.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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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
-+++ 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/opal/files/patch-ffmpeg3 b/net/opal/files/patch-ffmpeg3
deleted file mode 100644
index 470903d97b68..000000000000
--- a/net/opal/files/patch-ffmpeg3
+++ /dev/null
@@ -1,247 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-02>
-
---- plugins/video/H.263-1998/h263-1998.cxx.orig
-+++ plugins/video/H.263-1998/h263-1998.cxx
-@@ -230,11 +230,10 @@ bool H263_Base_EncoderContext::Init(AVCo
-
- m_context->opaque = this;
-
-- m_context->flags = CODEC_FLAG_EMU_EDGE // don't draw edges
-- | CODEC_FLAG_TRUNCATED // Possible missing packets
-+ m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets
- ;
-
-- m_context->pix_fmt = PIX_FMT_YUV420P;
-+ m_context->pix_fmt = AV_PIX_FMT_YUV420P;
- m_context->gop_size = H263_KEY_FRAME_INTERVAL;
-
- // X-Lite does not like Custom Picture frequency clocks... stick to 29.97Hz
*** 1132 LINES SKIPPED ***