[Midnightbsd-cvs] mports [24863] trunk/net: add opal
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 2 11:54:51 EST 2019
Revision: 24863
http://svnweb.midnightbsd.org/mports/?rev=24863
Author: laffer1
Date: 2019-02-02 11:54:50 -0500 (Sat, 02 Feb 2019)
Log Message:
-----------
add opal
Modified Paths:
--------------
trunk/net/Makefile
Added Paths:
-----------
trunk/net/opal/
trunk/net/opal/Makefile
trunk/net/opal/distinfo
trunk/net/opal/files/
trunk/net/opal/files/patch-Makefile.in
trunk/net/opal/files/patch-c++11
trunk/net/opal/files/patch-ffmpeg
trunk/net/opal/files/patch-ffmpeg3
trunk/net/opal/files/patch-ffmpeg4
trunk/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile
trunk/net/opal/files/patch-plugins_configure
trunk/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx
trunk/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h
trunk/net/opal/files/patch-plugins_video_common_mpi.cxx
trunk/net/opal/pkg-descr
trunk/net/opal/pkg-plist
Modified: trunk/net/Makefile
===================================================================
--- trunk/net/Makefile 2019-02-02 16:53:20 UTC (rev 24862)
+++ trunk/net/Makefile 2019-02-02 16:54:50 UTC (rev 24863)
@@ -72,6 +72,7 @@
SUBDIR += nload
SUBDIR += nss_ldap
SUBDIR += ntp
+SUBDIR += opal
SUBDIR += openldap24-client
SUBDIR += openldap24-sasl-client
SUBDIR += openldap24-server
Added: trunk/net/opal/Makefile
===================================================================
--- trunk/net/opal/Makefile (rev 0)
+++ trunk/net/opal/Makefile 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,298 @@
+# $MidnightBSD$
+
+PORTNAME= opal
+PORTVERSION= 3.10.10
+CATEGORIES= net
+MASTER_SITES= GNOME
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= VoIP abstraction library
+
+LICENSE= mpl
+
+LIB_DEPENDS= libpt.so:devel/ptlib
+
+USES= compiler:c11 gmake pathfix pkgconfig tar:xz
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+CXXFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \
+ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \
+ AEC DEBUG RUBY
+# ZRTP
+# MSRP = plist extra line vpd?
+# RTPTEXT disable == build fail, so make it default?
+OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \
+ RTPTEXT LID AEC
+DEBUG_DESC= Install debug library
+ZRTP_DESC= ZRTP protocol support
+JAVA_DESC= Java JNI support
+RUBY_DESC= Ruby support
+CELT_DESC= Celt codec from ports
+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.mport.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
+
+# libzrtpcpp uses port ssl, which will conflict with this port since we use
+# base ssl.
+#.if ${PORT_OPTIONS:MZRTP}
+.if 0
+.if !defined(SAFE_ZRTP)
+IGNORE= please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set
+.endif
+LIB_DEPENDS+= libzrtpcpp.so:devel/libzrtpcpp
+CONFIGURE_ARGS+= --enable-zrtp
+.else
+CONFIGURE_ARGS+= --disable-zrtp
+.endif
+
+.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:MCELT}
+LIB_DEPENDS+= libcelt0.so:audio/celt
+CONFIGURE_ARGS+= --enable-celt
+PLIST_SUB+= CELT=""
+.else
+CONFIGURE_ARGS+= --disable-celt
+PLIST_SUB+= CELT="@comment "
+.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}
+BUILD_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg
+RUN_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg
+CONFIGURE_ARGS+= --enable-libavcodec
+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}/codecs/video/h264_video_pwplugin_helper
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*.so
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*/*.so
+
+.include <bsd.port.mk>
Property changes on: trunk/net/opal/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/distinfo
===================================================================
--- trunk/net/opal/distinfo (rev 0)
+++ trunk/net/opal/distinfo 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,2 @@
+SHA256 (opal-3.10.10.tar.xz) = f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864
+SIZE (opal-3.10.10.tar.xz) = 5886812
Property changes on: trunk/net/opal/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-Makefile.in
===================================================================
--- trunk/net/opal/files/patch-Makefile.in (rev 0)
+++ trunk/net/opal/files/patch-Makefile.in 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,15 @@
+--- 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) ; \
Property changes on: trunk/net/opal/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-c++11
===================================================================
--- trunk/net/opal/files/patch-c++11 (rev 0)
+++ trunk/net/opal/files/patch-c++11 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,173 @@
+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);
Property changes on: trunk/net/opal/files/patch-c++11
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-ffmpeg
===================================================================
--- trunk/net/opal/files/patch-ffmpeg (rev 0)
+++ trunk/net/opal/files/patch-ffmpeg 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,398 @@
+patch from: http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opal.html
+
+Submitted By: Igor Živković <contact at 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
+ }
+
Property changes on: trunk/net/opal/files/patch-ffmpeg
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-ffmpeg3
===================================================================
--- trunk/net/opal/files/patch-ffmpeg3 (rev 0)
+++ trunk/net/opal/files/patch-ffmpeg3 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,247 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at 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
+@@ -440,9 +439,6 @@ bool H263_Base_EncoderContext::OpenCodec
+ m_inputFrame->data[1] = m_inputFrame->data[0] + planeSize;
+ m_inputFrame->data[2] = m_inputFrame->data[1] + (planeSize / 4);
+
+- if (m_context->width > 352)
+- m_context->flags &= ~CODEC_FLAG_EMU_EDGE; // Totally bizarre! FFMPEG crashes if on for CIF4
+-
+ // Dump info
+ PTRACE(5, m_prefix, "Size is " << m_context->width << "x" << m_context->height);
+ PTRACE(5, m_prefix, "GOP is " << m_context->gop_size);
+@@ -456,7 +452,7 @@ bool H263_Base_EncoderContext::OpenCodec
+ PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
+ PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
+
+- return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
++ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec, NULL) == 0;
+ }
+
+ void H263_Base_EncoderContext::CloseCodec()
+@@ -707,7 +703,7 @@ bool H263_Base_DecoderContext::OpenCodec
+ return 0;
+ }
+
+- if (FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) < 0) {
++ if (FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec, NULL) < 0) {
+ PTRACE(1, m_prefix, "Failed to open H.263 decoder");
+ return false;
+ }
+--- plugins/video/H.264/h264-x264.cxx.orig
++++ plugins/video/H.264/h264-x264.cxx
+@@ -1074,7 +1074,6 @@ class MyDecoder : public PluginCodec<MY_
+ m_context->workaround_bugs = FF_BUG_AUTODETECT;
+ 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_DROP_FRAME_TIMECODE |
+ CODEC_FLAG2_SKIP_RD |
+ CODEC_FLAG2_CHUNKS;
+@@ -1084,7 +1083,7 @@ class MyDecoder : public PluginCodec<MY_
+ if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL)
+ return false;
+
+- if (FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) < 0)
++ if (FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec, NULL) < 0)
+ return false;
+
+ PTRACE(4, MY_CODEC_LOG, "Opened decoder (SVN $Revision: 28048 $)");
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -539,7 +539,7 @@ void MPEG4EncoderContext::ResetBitCounte
+ //
+
+ void MPEG4EncoderContext::SetStaticEncodingParams(){
+- m_avcontext->pix_fmt = PIX_FMT_YUV420P;
++ m_avcontext->pix_fmt = AV_PIX_FMT_YUV420P;
+ m_avcontext->mb_decision = FF_MB_DECISION_SIMPLE; // high quality off
+ m_avcontext->rtp_payload_size = 750; // ffh263 uses 750
+ m_avcontext->rtp_callback = &MPEG4EncoderContext::RtpCallback;
+@@ -595,7 +595,6 @@ void MPEG4EncoderContext::SetStaticEncod
+ m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+ /*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;
+ #endif
+ m_avcontext->opaque = this; // for use in RTP callback
+@@ -710,13 +709,15 @@ bool MPEG4EncoderContext::OpenCodec()
+ if (PTRACE_CHECK(4)) {
+ m_avcontext->debug |= FF_DEBUG_RC;
+ m_avcontext->debug |= FF_DEBUG_PICT_INFO;
+- m_avcontext->debug |= FF_DEBUG_MV;
++// m_avcontext->debug |= FF_DEBUG_MV;
+ }
+ #endif
+
+ SetStaticEncodingParams();
+ SetDynamicEncodingParams(false); // don't force a restart, it's not open
+- if (FFMPEGLibraryInstance.AvcodecOpen(m_avcontext, m_avcodec) < 0)
++ AVDictionary *opts = NULL;
++ av_dict_set_int(&opts, "gmc", 1, 0);
++ if (FFMPEGLibraryInstance.AvcodecOpen(m_avcontext, m_avcodec, &opts) < 0)
+ {
+ PTRACE(1, "MPEG4", "Encoder could not be opened");
+ return false;
+@@ -1411,7 +1412,7 @@ bool MPEG4DecoderContext::OpenCodec()
+
+ SetStaticDecodingParams();
+ SetDynamicDecodingParams(false); // don't force a restart, it's not open
+- if (FFMPEGLibraryInstance.AvcodecOpen(m_avcontext, m_avcodec) < 0) {
++ if (FFMPEGLibraryInstance.AvcodecOpen(m_avcontext, m_avcodec, NULL) < 0) {
+ PTRACE(1, "MPEG4", "Decoder failed to open");
+ return false;
+ }
+--- plugins/video/common/dyna.h.orig
++++ plugins/video/common/dyna.h
+@@ -97,7 +97,7 @@ class FFMPEGLibrary
+ AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+ AVCodecContext *AvcodecAllocContext(AVCodec*);
+ AVFrame *AvcodecAllocFrame(void);
+- int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
++ int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec, AVDictionary **options);
+ int AvcodecClose(AVCodecContext *ctx);
+ int AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict);
+ int AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, BYTE *buf, int buf_size);
+--- plugins/video/common/ffmpeg.h.orig
++++ plugins/video/common/ffmpeg.h
+@@ -47,6 +47,7 @@
+
+ extern "C" {
+ #include "libavcodec/avcodec.h"
++#include "libavutil/imgutils.h"
+ // AVPacket was declared in avformat.h before April 2009
+ #if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52, 25, 0)
+ #include <libavformat/avformat.h>
+--- plugins/video/H.263-1998/h263-1998.cxx.orig
++++ plugins/video/H.263-1998/h263-1998.cxx
+@@ -98,7 +98,7 @@
+ { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
+ };
+
+-static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
++static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
+
+
+ /////////////////////////////////////////////////////////////////////////////
+@@ -583,7 +583,7 @@
+
+ bool H263_RFC2190_EncoderContext::Init()
+ {
+- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263))
++ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263))
+ return false;
+
+ #if LIBAVCODEC_RTP_MODE
+@@ -620,7 +620,7 @@
+
+ bool H263_RFC2429_EncoderContext::Init()
+ {
+- return H263_Base_EncoderContext::Init(CODEC_ID_H263P);
++ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P);
+ }
+
+
+@@ -644,7 +644,7 @@
+ if (!FFMPEGLibraryInstance.Load())
+ return;
+
+- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) {
++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) {
+ PTRACE(1, m_prefix, "Codec not found for decoder");
+ return;
+ }
+--- plugins/video/common/dyna.cxx.orig
++++ plugins/video/common/dyna.cxx
+@@ -213,11 +213,11 @@
+ FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+ m_codec = codec;
+- if (m_codec==CODEC_ID_H264)
++ if (m_codec==AV_CODEC_ID_H264)
+ snprintf( m_codecString, sizeof(m_codecString), "H264");
+- if (m_codec==CODEC_ID_H263P)
++ if (m_codec==AV_CODEC_ID_H263P)
+ snprintf( m_codecString, sizeof(m_codecString), "H263+");
+- if (m_codec==CODEC_ID_MPEG4)
++ if (m_codec==AV_CODEC_ID_MPEG4)
+ snprintf( m_codecString, sizeof(m_codecString), "MPEG4");
+ m_isLoadedOK = false;
+ }
+@@ -374,7 +374,7 @@
+ return Favcodec_alloc_frame();
+ }
+
+-int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec)
++int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec, AVDictionary **options)
+ {
+ WaitAndSignal m(processLock);
+
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -206,7 +206,7 @@
+ { 0 }
+ };
+
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4);
+
+
+ static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen )
+@@ -703,7 +703,7 @@
+ return false;
+ }
+
+- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){
+ PTRACE(1, "MPEG4", "Encoder not found");
+ return false;
+ }
+@@ -1396,7 +1396,7 @@
+
+ bool MPEG4DecoderContext::OpenCodec()
+ {
+- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) {
++ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) {
+ PTRACE(1, "MPEG4", "Decoder not found for encoder");
+ return false;
+ }
+--- plugins/video/H.264/h264-x264.cxx.orig
++++ plugins/video/H.264/h264-x264.cxx
+@@ -107,7 +107,7 @@
+
+ ///////////////////////////////////////////////////////////////////////////////
+
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264);
+
+ PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF
+
+@@ -1067,7 +1067,7 @@
+ allows you to fail the create operation (return false), which cannot
+ be done in the normal C++ constructor. */
+
+- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL)
++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H264)) == NULL)
+ return false;
+
+ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL)
Property changes on: trunk/net/opal/files/patch-ffmpeg3
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-ffmpeg4
===================================================================
--- trunk/net/opal/files/patch-ffmpeg4 (rev 0)
+++ trunk/net/opal/files/patch-ffmpeg4 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,262 @@
+h263-1998.cxx:237:22: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
+ m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets
+ ^
+h263-1998.cxx:346:27: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
+ m_context->flags |= CODEC_FLAG_AC_PRED;
+ ^
+h263-1998.cxx:348:28: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
+ m_context->flags &= ~CODEC_FLAG_AC_PRED;
+ ^
+h263-1998.cxx:356:27: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
+ m_context->flags |= CODEC_FLAG_LOOP_FILTER;
+ ^
+h263-1998.cxx:358:28: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
+ m_context->flags &= ~CODEC_FLAG_LOOP_FILTER;
+ ^
+h263-1998.cxx:422:14: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'?
+ m_context->lmin = m_context->qmin * FF_QP2LAMBDA;
+ ^~~~
+ qmin
+/usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here
+ int qmin;
+ ^
+h263-1998.cxx:423:14: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'?
+ m_context->lmax = m_context->qmax * FF_QP2LAMBDA;
+ ^~~~
+ qmax
+/usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here
+ int qmax;
+ ^
+h263-1998.cxx:598:24: error: use of undeclared identifier 'CODEC_FLAG_4MV'
+ m_context->flags &= ~CODEC_FLAG_4MV;
+ ^
+
+rfc2429.cxx:289:55: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+ memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE);
+ ^
+rfc2429.cxx:343:79: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+ if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) {
+ ^
+rfc2429.cxx:346:80: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+ << " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZ...
+ ^
+h264-x264.cxx:1079:27: error: use of undeclared identifier 'CODEC_FLAG2_DROP_FRAME_TIMECODE'
+ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+ ^
+h264-x264.cxx:1081:27: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS'
+ CODEC_FLAG2_CHUNKS;
+ ^
+mpeg4.cxx:551:18: error: no member named 'rc_eq' in 'AVCodecContext'
+ m_avcontext->rc_eq = (char*) "1";
+ ~~~~~~~~~~~ ^
+mpeg4.cxx:556:18: error: no member named 'rc_initial_cplx' in 'AVCodecContext'
+ m_avcontext->rc_initial_cplx = 0.0f;
+ ~~~~~~~~~~~ ^
+mpeg4.cxx:563:18: error: no member named 'rc_buffer_aggressivity' in 'AVCodecContext'
+ m_avcontext->rc_buffer_aggressivity = 1.0f;
+ ~~~~~~~~~~~ ^
+mpeg4.cxx:597:25: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
+ m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+ ^
+mpeg4.cxx:600:25: error: use of undeclared identifier 'CODEC_FLAG_4MV'
+ m_avcontext->flags|=CODEC_FLAG_4MV;
+ ^
+mpeg4.cxx:601:25: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
+ m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+ ^
+mpeg4.cxx:639:18: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'?
+ m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA;
+ ^~~~
+ qmin
+/usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here
+ int qmin;
+ ^
+mpeg4.cxx:640:18: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'?
+ m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA;
+ ^~~~
+ qmax
+/usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here
+ int qmax;
+ ^
+mpeg4.cxx:668:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+ m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE];
+ ^
+mpeg4.cxx:678:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+ memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ ^
+mpeg4.cxx:1329:27: error: use of undeclared identifier 'CODEC_FLAG_4MV'
+ m_avcontext->flags |= CODEC_FLAG_4MV;
+ ^
+
+--- plugins/video/H.263-1998/h263-1998.cxx.orig
++++ plugins/video/H.263-1998/h263-1998.cxx
+@@ -234,7 +234,7 @@ bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+
+ m_context->opaque = this;
+
+- m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets
++ m_context->flags = AV_CODEC_FLAG_TRUNCATED // Possible missing packets
+ ;
+
+ m_context->pix_fmt = AV_PIX_FMT_YUV420P;
+@@ -343,9 +343,9 @@ void H263_Base_EncoderContext::SetOption(const char *
+ // Level 3+
+ // works with eyeBeam
+ if (atoi(value) == 1)
+- m_context->flags |= CODEC_FLAG_AC_PRED;
++ m_context->flags |= AV_CODEC_FLAG_AC_PRED;
+ else
+- m_context->flags &= ~CODEC_FLAG_AC_PRED;
++ m_context->flags &= ~AV_CODEC_FLAG_AC_PRED;
+ return;
+ }
+
+@@ -353,9 +353,9 @@ void H263_Base_EncoderContext::SetOption(const char *
+ // Annex J: Deblocking Filter
+ // works with eyeBeam
+ if (atoi(value) == 1)
+- m_context->flags |= CODEC_FLAG_LOOP_FILTER;
++ m_context->flags |= AV_CODEC_FLAG_LOOP_FILTER;
+ else
+- m_context->flags &= ~CODEC_FLAG_LOOP_FILTER;
++ m_context->flags &= ~AV_CODEC_FLAG_LOOP_FILTER;
+ return;
+ }
+
+@@ -419,8 +419,8 @@ bool H263_Base_EncoderContext::OpenCodec()
+ m_context->qcompress = 0.5; // qscale factor between easy & hard scenes (0.0-1.0)
+
+ // Lagrange multipliers - this is how the context defaults do it:
+- m_context->lmin = m_context->qmin * FF_QP2LAMBDA;
+- m_context->lmax = m_context->qmax * FF_QP2LAMBDA;
++ av_opt_set_int(m_context->priv_data, "lmin", m_context->qmin * FF_QP2LAMBDA, 0);
++ av_opt_set_int(m_context->priv_data, "lmax", m_context->qmax * FF_QP2LAMBDA, 0);
+
+ // YUV420P input
+ m_inputFrame->linesize[0] = m_context->width;
+@@ -595,7 +595,7 @@ bool H263_RFC2190_EncoderContext::Init()
+ m_context->opaque = this; // used to separate out packets from different encode threads
+
+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+- m_context->flags &= ~CODEC_FLAG_4MV;
++ m_context->flags &= ~AV_CODEC_FLAG_4MV;
+ #if LIBAVCODEC_RTP_MODE
+ m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
+--- plugins/video/H.263-1998/rfc2429.cxx.orig
++++ plugins/video/H.263-1998/rfc2429.cxx
+@@ -286,7 +286,7 @@ bool RFC2429Frame::GetPacket(RTPFrame & frame, unsigne
+
+ unsigned char * RFC2429Frame::GetBuffer()
+ {
+- memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE);
++ memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , AV_INPUT_BUFFER_PADDING_SIZE);
+ return (m_encodedFrame.ptr);
+ }
+
+@@ -340,10 +340,10 @@ bool RFC2429Frame::AddPacket(const RTPFrame & packet)
+
+ unsigned remBytes = packet.GetPayloadSize() - headerPLEN - (headerV ? 3 : 2);
+
+- if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) {
++ if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - AV_INPUT_BUFFER_PADDING_SIZE)) {
+ PTRACE(2, "H.263-RFC2429", "Trying to add " << remBytes
+ << " bytes to frame at position " << m_encodedFrame.pos + (headerP ? 2 : 0)
+- << " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZE << " bytes");
++ << " bytes while maximum frame size is " << m_maxFrameSize << "-" << AV_INPUT_BUFFER_PADDING_SIZE << " bytes");
+ return false;
+ }
+
+--- plugins/video/H.264/h264-x264.cxx.orig
++++ plugins/video/H.264/h264-x264.cxx
+@@ -1076,9 +1076,9 @@ class MyDecoder : public PluginCodec<MY_CODEC>
+ m_context->workaround_bugs = FF_BUG_AUTODETECT;
+ m_context->idct_algo = FF_IDCT_H264;
+ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+- m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
++ m_context->flags2 = AV_CODEC_FLAG2_DROP_FRAME_TIMECODE |
+ CODEC_FLAG2_SKIP_RD |
+- CODEC_FLAG2_CHUNKS;
++ AV_CODEC_FLAG2_CHUNKS;
+
+ if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL)
+ return false;
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -548,19 +548,19 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){
+ // Reduce the difference in quantization between frames.
+ m_avcontext->qblur = 0.3f;
+ // default is tex^qComp; 1 is constant bitrate
+- m_avcontext->rc_eq = (char*) "1";
+- //avcontext->rc_eq = "tex^qComp";
++ av_opt_set(m_avcontext->priv_data, "rc_eq", (char*) "1", 0);
++ //av_opt_set(m_avcontext->priv_data, "rc_eq", "tex^qComp", 0);
+ // These ones technically could be dynamic, I think
+ m_avcontext->rc_min_rate = 0;
+ // This is set to 0 in ffmpeg.c, the command-line utility.
+- m_avcontext->rc_initial_cplx = 0.0f;
++ av_opt_set_double(m_avcontext->priv_data, "rc_init_cplx", 0.0f, 0);
+
+ // And this is set to 1.
+ // It seems to affect how aggressively the library will raise and lower
+ // quantization to keep bandwidth constant. Except it's in reference to
+ // the "vbv buffer", not bits per second, so nobody really knows how
+ // it works.
+- m_avcontext->rc_buffer_aggressivity = 1.0f;
++ av_opt_set_double(m_avcontext->priv_data, "rc_buf_aggressivity", 1.0f, 0);
+
+ // Ratecontrol buffer size, in bits. Usually 0.5-1 second worth.
+ // 224 kbyte is what VLC uses, and it seems to fix the quantization pulse (at Level 5)
+@@ -594,11 +594,11 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){
+ 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|=AV_CODEC_FLAG_AC_PRED;
+ 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_LOOP_FILTER;
++ m_avcontext->flags|=AV_CODEC_FLAG_4MV;
++ m_avcontext->flags|=AV_CODEC_FLAG_LOOP_FILTER;
+ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
+ #endif
+ m_avcontext->opaque = this; // for use in RTP callback
+@@ -636,8 +636,8 @@ void MPEG4EncoderContext::SetDynamicEncodingParams(boo
+ m_avcontext->qmax = std::min( m_avcontext->qmax, 31);
+
+ // Lagrange multipliers - this is how the context defaults do it:
+- m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA;
+- m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA;
++ av_opt_set_int(m_avcontext->priv_data, "lmin", m_avcontext->qmin * FF_QP2LAMBDA, 0);
++ av_opt_set_int(m_avcontext->priv_data, "lmax", m_avcontext->qmax * FF_QP2LAMBDA, 0);
+
+ // If framesize has changed or is not yet initialized, fix it up
+ if((unsigned)m_avcontext->width != m_frameWidth || (unsigned)m_avcontext->height != m_frameHeight) {
+@@ -665,7 +665,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res
+ {
+ delete[] m_rawFrameBuffer;
+ }
+- m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE];
++ m_rawFrameBuffer = new BYTE[m_rawFrameLen + AV_INPUT_BUFFER_PADDING_SIZE];
+
+ if (m_encFrameBuffer)
+ {
+@@ -675,7 +675,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res
+ m_encFrameBuffer = new BYTE[m_encFrameLen];
+
+ // Clear the back padding
+- memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ memset(m_rawFrameBuffer + m_rawFrameLen, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ const unsigned fsz = m_frameWidth * m_frameHeight;
+ m_avpicture->data[0] = m_rawFrameBuffer; // luminance
+ m_avpicture->data[1] = m_rawFrameBuffer + fsz; // first chroma channel
+@@ -1326,7 +1326,7 @@ void MPEG4DecoderContext::SetFrameHeight(int height) {
+ //
+
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+- m_avcontext->flags |= CODEC_FLAG_4MV;
++ m_avcontext->flags |= AV_CODEC_FLAG_4MV;
+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+ m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
Property changes on: trunk/net/opal/files/patch-ffmpeg4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile
===================================================================
--- trunk/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile (rev 0)
+++ trunk/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,17 @@
+--- plugins/audio/SILK/SILK_SDK/Makefile.orig 2013-09-17 11:51:45.000000000 +0200
++++ plugins/audio/SILK/SILK_SDK/Makefile 2013-09-17 11:55:40.000000000 +0200
+@@ -16,10 +16,10 @@
+ LIBSUFFIX = .a
+ OBJSUFFIX = .o
+
+-CC = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
+-AR = $(TOOLCHAIN_PREFIX)ar
+-RANLIB = $(TOOLCHAIN_PREFIX)ranlib
+-CP = $(TOOLCHAIN_PREFIX)cp
++CC ?= $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
++AR ?= $(TOOLCHAIN_PREFIX)ar
++RANLIB ?= $(TOOLCHAIN_PREFIX)ranlib
++CP ?= $(TOOLCHAIN_PREFIX)cp
+
+ cflags-from-defines = $(addprefix -D,$(1))
+ cflags-from-includes = $(addprefix -I,$(1))
Property changes on: trunk/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-plugins_configure
===================================================================
--- trunk/net/opal/files/patch-plugins_configure (rev 0)
+++ trunk/net/opal/files/patch-plugins_configure 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,189 @@
+--- plugins/configure.orig 2013-07-09 00:25:14.000000000 +0200
++++ plugins/configure 2013-07-09 00:28:04.000000000 +0200
+@@ -6924,7 +6924,7 @@
+ if test "x${HAVE_GSM0610}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/GSM0610/Makefile"
+
+- SUBDIRS+=" audio/GSM0610"
++ SUBDIRS="${SUBDIRS} audio/GSM0610"
+
+ # Check whether --enable-localgsm was given.
+ if test "${enable_localgsm+set}" = set; then :
+@@ -7181,7 +7181,7 @@
+ if test "x${HAVE_GSMAMR}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/gsm-amr/Makefile"
+
+- SUBDIRS+=" audio/gsm-amr"
++ SUBDIRS="${SUBDIRS} audio/gsm-amr"
+ fi
+
+
+@@ -7199,7 +7199,7 @@
+ if test "x${HAVE_iLBC}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/iLBC/Makefile"
+
+- SUBDIRS+=" audio/iLBC"
++ SUBDIRS="${SUBDIRS} audio/iLBC"
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -8632,7 +8632,7 @@
+
+ ac_config_files="$ac_config_files audio/Speex/Makefile"
+
+- SUBDIRS+=" audio/Speex"
++ SUBDIRS="${SUBDIRS} audio/Speex"
+
+
+ old_CFLAGS="$CFLAGS"
+@@ -9002,7 +9002,7 @@
+ if test "x${HAVE_G722}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/G722/Makefile"
+
+- SUBDIRS+=" audio/G722"
++ SUBDIRS="${SUBDIRS} audio/G722"
+ fi
+
+
+@@ -9020,7 +9020,7 @@
+ if test "x${HAVE_G7221}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/G.722.1/Makefile"
+
+- SUBDIRS+=" audio/G.722.1"
++ SUBDIRS="${SUBDIRS} audio/G.722.1"
+ fi
+
+
+@@ -9038,7 +9038,7 @@
+ if test "x${HAVE_G7222}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/G.722.2/Makefile"
+
+- SUBDIRS+=" audio/G.722.2"
++ SUBDIRS="${SUBDIRS} audio/G.722.2"
+ fi
+
+
+@@ -9056,7 +9056,7 @@
+ if test "x${HAVE_G726}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/G726/Makefile"
+
+- SUBDIRS+=" audio/G726"
++ SUBDIRS="${SUBDIRS} audio/G726"
+ fi
+
+
+@@ -9074,7 +9074,7 @@
+ if test "x${HAVE_LPC10}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/LPC_10/Makefile"
+
+- SUBDIRS+=" audio/LPC_10"
++ SUBDIRS="${SUBDIRS} audio/LPC_10"
+ fi
+
+
+@@ -9092,7 +9092,7 @@
+ if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/IMA_ADPCM/Makefile"
+
+- SUBDIRS+=" audio/IMA_ADPCM"
++ SUBDIRS="${SUBDIRS} audio/IMA_ADPCM"
+ fi
+
+
+@@ -9155,7 +9155,7 @@
+ if test "x${HAVE_SBC}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/SBC/Makefile"
+
+- SUBDIRS+=" audio/SBC"
++ SUBDIRS="${SUBDIRS} audio/SBC"
+ fi
+
+
+@@ -9251,7 +9251,7 @@
+ sed -e "s/\./*10000+/" -e "s/\./*100+/"`\""
+ ac_config_files="$ac_config_files audio/celt/Makefile"
+
+- SUBDIRS+=" audio/celt"
++ SUBDIRS="${SUBDIRS} audio/celt"
+ fi
+
+
+@@ -9269,7 +9269,7 @@
+ if test "x${HAVE_SILK}" = "xyes" ; then
+ ac_config_files="$ac_config_files audio/SILK/Makefile"
+
+- SUBDIRS+=" audio/SILK"
++ SUBDIRS="${SUBDIRS} audio/SILK"
+ fi
+
+
+@@ -9288,7 +9288,7 @@
+ if test "x${HAVE_H261}" = "xyes" ; then
+ ac_config_files="$ac_config_files video/H.261-vic/Makefile"
+
+- SUBDIRS+=" video/H.261-vic"
++ SUBDIRS="${SUBDIRS} video/H.261-vic"
+ fi
+
+
+@@ -9717,13 +9717,13 @@
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+ ac_config_files="$ac_config_files video/H.263-1998/Makefile"
+
+- SUBDIRS+=" video/H.263-1998"
++ SUBDIRS="${SUBDIRS} video/H.263-1998"
+ fi
+
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+ ac_config_files="$ac_config_files video/MPEG4-ffmpeg/Makefile"
+
+- SUBDIRS+=" video/MPEG4-ffmpeg"
++ SUBDIRS="${SUBDIRS} video/MPEG4-ffmpeg"
+ fi
+
+
+@@ -9875,7 +9875,7 @@
+ fi
+
+
+- SUBDIRS+=" video/H.264"
++ SUBDIRS="${SUBDIRS} video/H.264"
+ ac_config_files="$ac_config_files video/H.264/Makefile"
+
+ ac_config_files="$ac_config_files video/H.264/gpl/Makefile"
+@@ -9973,7 +9973,7 @@
+ if test "x$HAVE_THEORA" = "xyes" ; then
+ ac_config_files="$ac_config_files video/THEORA/Makefile"
+
+- SUBDIRS+=" video/THEORA"
++ SUBDIRS="${SUBDIRS} video/THEORA"
+ fi
+
+
+@@ -10054,7 +10054,7 @@
+ if test "x$HAVE_IXJ" = "xyes" ; then
+ ac_config_files="$ac_config_files LID/IxJ/Makefile"
+
+- SUBDIRS+=" LID/IxJ"
++ SUBDIRS="${SUBDIRS} LID/IxJ"
+ fi
+
+ if test -d LID/VPB ; then
+@@ -10101,7 +10101,7 @@
+ if test "x$HAVE_VPB" = "xyes" ; then
+ ac_config_files="$ac_config_files LID/VPB/Makefile"
+
+- SUBDIRS+=" LID/VPB"
++ SUBDIRS="${SUBDIRS} LID/VPB"
+ fi
+
+
+@@ -10284,7 +10284,7 @@
+ if test "x$HAVE_SPANDSP" = "xyes" ; then
+ ac_config_files="$ac_config_files fax/fax_spandsp/Makefile"
+
+- SUBDIRS+=" fax/fax_spandsp"
++ SUBDIRS="${SUBDIRS} fax/fax_spandsp"
+ fi
+
+
Property changes on: trunk/net/opal/files/patch-plugins_configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx
===================================================================
--- trunk/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx (rev 0)
+++ trunk/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,11 @@
+--- plugins/video/H.263-1998/rfc2190.cxx.orig 2013-02-20 03:18:03.000000000 +0100
++++ plugins/video/H.263-1998/rfc2190.cxx 2013-07-09 00:32:54.000000000 +0200
+@@ -25,7 +25,7 @@
+
+ #include <iostream>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+
+ const unsigned char PSC[3] = { 0x00, 0x00, 0x80 };
Property changes on: trunk/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h
===================================================================
--- trunk/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h (rev 0)
+++ trunk/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,11 @@
+--- plugins/video/H.264/shared/x264wrap.h.orig 2013-07-09 00:34:36.000000000 +0200
++++ plugins/video/H.264/shared/x264wrap.h 2013-07-09 00:38:14.000000000 +0200
+@@ -126,7 +126,7 @@
+ char m_ulName[100];
+ int m_pipeToProcess;
+ int m_pipeFromProcess;
+- pid_t m_pid;
++ int m_pid;
+ #endif // WIN32
+
+ bool m_startNewFrame;
Property changes on: trunk/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/files/patch-plugins_video_common_mpi.cxx
===================================================================
--- trunk/net/opal/files/patch-plugins_video_common_mpi.cxx (rev 0)
+++ trunk/net/opal/files/patch-plugins_video_common_mpi.cxx 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,13 @@
+--- plugins/video/common/mpi.cxx.orig 2013-02-20 02:18:05 UTC
++++ plugins/video/common/mpi.cxx
+@@ -132,8 +132,8 @@ bool MPIList::getNegotiatedMPI( unsigned
+ // to the desired one or matches it
+ for (i=0; i < MPIs.size(); i++) {
+ // we square the value in order to get absolute distances
+- distance = ( abs(MPIs[i].width - desiredWidth ) *
+- abs(MPIs[i].height - desiredHeight) );
++ distance = ( abs((int)(MPIs[i].width - desiredWidth )) *
++ abs((int)(MPIs[i].height - desiredHeight)) );
+
+ if (distance < minDistance) {
+ minDistance = distance;
Property changes on: trunk/net/opal/files/patch-plugins_video_common_mpi.cxx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/pkg-descr
===================================================================
--- trunk/net/opal/pkg-descr (rev 0)
+++ trunk/net/opal/pkg-descr 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,18 @@
+Opal is a full-featured voip library that supports a variety of protocols and
+multi-media fornats. Features include:
+
+ * Low latency RTP stack designed specifically for real-time multimedia
+ * Full featured H.323, SIP and IAX2 protocol stacks
+ * Audio codecs including G.711, GSM06.10, Speex and iLBC.
+ * Video codecs including H.261 and H.263
+ * Run-time loadable codec interface for proprietary or codecs such as G.729,
+ H.263, H.264 and MPEG4
+ * Completely Open Source using the commercially friendly MPL 1.1 license
+
+Through the use of a platform isolation library called PTLIB, Opal can run on
+tiny embedded systems or multi-processor servers.
+
+BTW: OPAL is an acronym for Open Phone Abstraction Library, but that is not
+really important :)
+
+WWW: http://opalvoip.org/
Property changes on: trunk/net/opal/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/opal/pkg-plist
===================================================================
--- trunk/net/opal/pkg-plist (rev 0)
+++ trunk/net/opal/pkg-plist 2019-02-02 16:54:50 UTC (rev 24863)
@@ -0,0 +1,163 @@
+include/opal/asn/gcc.h
+include/opal/asn/h225.h
+include/opal/asn/h235.h
+include/opal/asn/h235_srtp.h
+include/opal/asn/h245.h
+include/opal/asn/h248.h
+include/opal/asn/h4501.h
+include/opal/asn/h45010.h
+include/opal/asn/h45011.h
+include/opal/asn/h4502.h
+include/opal/asn/h4503.h
+include/opal/asn/h4504.h
+include/opal/asn/h4505.h
+include/opal/asn/h4506.h
+include/opal/asn/h4507.h
+include/opal/asn/h4508.h
+include/opal/asn/h4509.h
+include/opal/asn/h501.h
+include/opal/asn/mcs.h
+include/opal/asn/t38.h
+include/opal/asn/x880.h
+include/opal/codec/echocancel.h
+include/opal/codec/g711a1_plc.h
+include/opal/codec/g711codec.h
+include/opal/codec/opalplugin.h
+include/opal/codec/opalpluginmgr.h
+include/opal/codec/opalwavfile.h
+include/opal/codec/ratectl.h
+include/opal/codec/rfc2435.h
+include/opal/codec/rfc2833.h
+include/opal/codec/rfc4175.h
+include/opal/codec/silencedetect.h
+include/opal/codec/vidcodec.h
+include/opal/h323/channels.h
+include/opal/h323/gkclient.h
+include/opal/h323/gkserver.h
+include/opal/h323/h225ras.h
+include/opal/h323/h235auth.h
+include/opal/h323/h323.h
+include/opal/h323/h323annexg.h
+include/opal/h323/h323caps.h
+include/opal/h323/h323con.h
+include/opal/h323/h323ep.h
+include/opal/h323/h323neg.h
+include/opal/h323/h323pdu.h
+include/opal/h323/h323rtp.h
+include/opal/h323/h323trans.h
+include/opal/h323/h450pdu.h
+include/opal/h323/h501pdu.h
+include/opal/h323/peclient.h
+include/opal/h323/q931.h
+include/opal/h323/svcctrl.h
+include/opal/h323/transaddr.h
+include/opal/h460/h460.h
+include/opal/h460/h4601.h
+include/opal/h460/h46018.h
+include/opal/h460/h46019.h
+include/opal/h460/h4609.h
+include/opal/h460/h460p.h
+include/opal/h460/h460pres.h
+include/opal/h460/h460tm.h
+include/opal/iax2/callprocessor.h
+include/opal/iax2/causecode.h
+include/opal/iax2/frame.h
+include/opal/iax2/iax2.h
+include/opal/iax2/iax2con.h
+include/opal/iax2/iax2ep.h
+include/opal/iax2/iax2medstrm.h
+include/opal/iax2/iedata.h
+include/opal/iax2/ies.h
+include/opal/iax2/overview.h
+include/opal/iax2/processor.h
+include/opal/iax2/receiver.h
+include/opal/iax2/regprocessor.h
+include/opal/iax2/remote.h
+include/opal/iax2/safestrings.h
+include/opal/iax2/sound.h
+include/opal/iax2/specialprocessor.h
+include/opal/iax2/transmit.h
+include/opal/iax2/version.h
+include/opal/im/im.h
+include/opal/im/msrp.h
+include/opal/im/rfc4103.h
+include/opal/im/sipim.h
+include/opal/im/t140.h
+include/opal/lids/capi_ep.h
+include/opal/lids/lid.h
+include/opal/lids/lidep.h
+include/opal/lids/lidplugin.h
+include/opal/lids/lidpluginmgr.h
+include/opal/opal.h
+include/opal/opal/buildopts.h
+include/opal/opal/call.h
+include/opal/opal/connection.h
+include/opal/opal/console_mgr.h
+include/opal/opal/endpoint.h
+include/opal/opal/guid.h
+include/opal/opal/ivr.h
+include/opal/opal/localep.h
+include/opal/opal/manager.h
+include/opal/opal/mediacmd.h
+include/opal/opal/mediafmt.h
+include/opal/opal/mediastrm.h
+include/opal/opal/mediatype.h
+include/opal/opal/opalmixer.h
+include/opal/opal/opalvxml.h
+include/opal/opal/patch.h
+include/opal/opal/pcss.h
+include/opal/opal/pres_ent.h
+include/opal/opal/recording.h
+include/opal/opal/rtpconn.h
+include/opal/opal/rtpep.h
+include/opal/opal/transcoders.h
+include/opal/opal/transports.h
+include/opal/rtp/jitter.h
+include/opal/rtp/metrics.h
+include/opal/rtp/pcapfile.h
+include/opal/rtp/rtp.h
+include/opal/rtp/srtp.h
+include/opal/rtp/zrtpudp.h
+include/opal/sip/handlers.h
+include/opal/sip/sdp.h
+include/opal/sip/sip.h
+include/opal/sip/sipcon.h
+include/opal/sip/sipep.h
+include/opal/sip/sippdu.h
+include/opal/sip/sippres.h
+include/opal/t120/h323t120.h
+include/opal/t120/t120proto.h
+include/opal/t120/x224.h
+include/opal/t38/h323t38.h
+include/opal/t38/sipt38.h
+include/opal/t38/t38proto.h
+include/opal/zrtp/opalzrtp.h
+include/opal/zrtp/zrtpeventproc.h
+lib/libopal.so
+lib/libopal.so.%%PVERSION_MAJOR%%
+lib/libopal.so.%%PVERSION_MINOR%%
+lib/libopal.so.%%VERSION%%
+%%DEBUG%%lib/libopal_d.so
+%%DEBUG%%lib/libopal_d.so.%%PVERSION_MAJOR%%
+%%DEBUG%%lib/libopal_d.so.%%PVERSION_MINOR%%
+%%DEBUG%%lib/libopal_d.so.%%VERSION%%
+%%CELT%%lib/opal-%%VERSION%%/codecs/audio/celt_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g7221_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g7222_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g722_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g726_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/gsm0610_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/iLBC_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/ima_adpcm_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/lpc10_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/silk_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/speex_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/h261_vic_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/h263_ffmpeg_ptplugin.so
+%%X264%%lib/opal-%%VERSION%%/codecs/video/h264_video_pwplugin_helper
+%%X264%%lib/opal-%%VERSION%%/codecs/video/h264_x264_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/mpeg4_ffmpeg_ptplugin.so
+%%THEORA%%lib/opal-%%VERSION%%/codecs/video/theora_ptplugin.so
+%%FAX%%lib/opal-%%VERSION%%/fax/spandsp_ptplugin.so
+%%LID%%lib/opal-%%VERSION%%/lid/vpb_ptplugin.so
+libdata/pkgconfig/opal.pc
Property changes on: trunk/net/opal/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list