[packages/opal] - updated to 3.18.6
baggins
baggins at pld-linux.org
Sat Feb 13 23:53:05 CET 2021
commit c9789360b67d64e0ab737210e7296c2b05d2d908
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Feb 13 23:52:43 2021 +0100
- updated to 3.18.6
celt.patch | 11 +
ffmpeg.patch | 831 --------------------------------------------------
opal-ah.patch | 27 --
opal-build.patch | 38 ---
opal-exceptions.patch | 9 -
opal-libilbc.patch | 70 -----
opal-ruby.patch | 34 ---
opal-sh.patch | 188 ------------
opal.spec | 75 +----
srtp.patch | 20 --
10 files changed, 17 insertions(+), 1286 deletions(-)
---
diff --git a/opal.spec b/opal.spec
index f3ec622..cd7d969 100644
--- a/opal.spec
+++ b/opal.spec
@@ -14,7 +14,6 @@
%bcond_without srtp # SRTP protocol support (mutually exclusive with zrtp)
%bcond_with zrtp # ZRTP protocol support (mutually exclusive with srtp; broken as of 3.10.9)
%bcond_with capi # CAPI support
-%bcond_without vpb # Voicetronix VPB support
%bcond_with java # Java JNI interface (only swig wrapper, Java part not built)
%bcond_with ruby # Ruby interface (very initial, only swig wrapper)
#
@@ -30,20 +29,13 @@
Summary: Open Phone Abstraction Library (aka OpenH323 v2)
Summary(pl.UTF-8): Biblioteka Open Phone Abstraction Library (aka OpenH323 v2)
Name: opal
-Version: 3.10.11
-Release: 7
+Version: 3.18.6
+Release: 0.1
License: MPL v1.0
Group: Libraries
Source0: http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5: fc36a30d2cbce0fbf7cb6ef33b8d63c3
-Patch0: %{name}-build.patch
-Patch1: ffmpeg.patch
-Patch2: %{name}-sh.patch
-Patch3: %{name}-libilbc.patch
-Patch4: %{name}-ah.patch
-Patch5: %{name}-exceptions.patch
-Patch6: %{name}-ruby.patch
-Patch7: srtp.patch
+# Source0-md5: 0b4dfe603834b3cf2252782f1594403d
+Patch0: celt.patch
URL: http://www.opalvoip.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -53,7 +45,7 @@ BuildRequires: expat-devel
BuildRequires: libstdc++-devel
%{?with_zrtp:BuildRequires: libzrtp-devel}
BuildRequires: pkgconfig
-BuildRequires: ptlib-devel >= 1:2.10.9
+BuildRequires: ptlib-devel >= 1:2.18.5
BuildRequires: sed >= 4.0
BuildRequires: speex-devel >= 1:1.2
BuildRequires: speexdsp-devel >= 1.2
@@ -65,7 +57,6 @@ BuildRequires: ffmpeg-devel
%{?with_java:BuildRequires: jdk}
BuildRequires: libgsm-devel
BuildRequires: libtheora-devel
-%{?with_vpb:BuildRequires: vpb-devel}
# ABI 0.102
BuildRequires: libx264-devel >= 0.1.3-1.20101031_2245.1
BuildRequires: webrtc-libilbc-devel
@@ -90,18 +81,6 @@ wyposażonej implementacji protokołu telekonferencyjnego ITU H.323,
który może być używany przez użytkowników prywatnych i komercyjnych
bez opłat.
-%package lid-vpb
-Summary: Opal LID plugin for Voicetronix VPB devices
-Summary(pl.UTF-8): Wtyczka Opal LID dla urządzeń VPB firmy Voicetronix
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description lid-vpb
-Opal LID plugin for Voicetronix VPB devices.
-
-%description lid-vpb -l pl.UTF-8
-Wtyczka Opal LID dla urządzeń VPB firmy Voicetronix.
-
%package devel
Summary: Opal development files
Summary(pl.UTF-8): Pliki dla developerów Opal
@@ -110,7 +89,7 @@ Requires: %{name} = %{version}-%{release}
%{?with_capi:Requires: capi4k-utils-devel}
Requires: libstdc++-devel
%{?with_zrtp:Requires: libzrtp-devel}
-Requires: ptlib-devel >= 1:2.10.9
+Requires: ptlib-devel >= 1:2.18.5
Requires: speex-devel >= 1:1.2
%{?with_srtp:Requires: libsrtp2-devel}
@@ -136,30 +115,17 @@ Biblioteki statyczne OPAL.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
PWLIBDIR=%{_prefix}; export PWLIBDIR
OPALDIR=`pwd`; export OPALDIR
OPAL_BUILD="yes"; export OPAL_BUILD
-%{__aclocal}
-%{__autoconf}
-# don't run autoheader here, include/opal/buildopts.h.in is manually written
cd plugins
%{__aclocal}
%{__autoconf}
-%{__autoheader}
cd ..
# Run grep '^OPAL_.*=' configure.ac|grep 'yes\|no' to check current defaults
%configure \
- CFLAGS="%{rpmcflags} -std=gnu++98" \
- CXXFLAGS="%{rpmcxxflags} -std=gnu++98" \
%{?with_java:JDK_ROOT=%{_jvmdir}/java} \
%if %{with sip_fax_only}
--disable-aec \
@@ -172,7 +138,6 @@ cd ..
--disable-h501 \
--disable-iax \
--disable-ivr \
- --disable-lid \
--disable-plugins
--disable-rfc4103 \
--disable-rfc4175 \
@@ -186,7 +151,6 @@ cd ..
%{!?with_java:--disable-java} \
%{!?with_ruby:--disable-ruby} \
%{!?with_srtp:--disable-srtp} \
- %{?with_vpb:--enable-vpb} \
%if %{with zrtp}
--enable-zrtp \
--with-bn-includedir=/usr/include \
@@ -201,15 +165,6 @@ cd ..
OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}" \
VERBOSE=1
-%{__cp} -a */libopal* .
-%if %{without sip_fax_only}
-%{__make} -C samples/simple %{?debug:debug}%{!?debug:opt} \
- CC="%{__cc}" \
- CPLUS="%{__cxx}" \
- CFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG} -I`pwd`/include" \
- LDFLAGS="%{rpmldflags} -L`pwd` -lpt -lopal"
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
@@ -217,17 +172,6 @@ install -d $RPM_BUILD_ROOT%{_bindir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{!?with_sip_fax_only:install samples/simple/obj/simpleopal $RPM_BUILD_ROOT%{_bindir}}
-
-# This needs to be done after 'make install'
-%{__sed} \
- -e 's,^OPALDIR.*=.*$,OPALDIR\t\t\t\t= %{_libdir}/opal-%{version},;' \
- -e 's,^OPAL_SRCDIR.*=.*$,OPAL_SRCDIR\t\t\t= %{_usrsrc}/debug/opal-%{version},;' \
- -e 's,^OPAL_INCDIR.*=.*$,OPAL_INCDIR\t\t\t= %{_includedir}/opal,;' \
- -e 's,^OPAL_LIBDIR.*=.*$,OPAL_LIBDIR\t\t\t= %{_libdir},;' \
- opal_defs.mak > $RPM_BUILD_ROOT%{_includedir}/opal/opal_defs.mak
-cp -p opal_inc.mak $RPM_BUILD_ROOT%{_includedir}/opal
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -264,13 +208,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/opal-%{version}/fax
%attr(755,root,root) %{_libdir}/opal-%{version}/fax/spandsp_ptplugin.so
%endif
-%dir %{_libdir}/opal-%{version}/lid
-
-%if %{with vpb}
-%files lid-vpb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_ptplugin.so
-%endif
%files devel
%defattr(644,root,root,755)
diff --git a/celt.patch b/celt.patch
new file mode 100644
index 0000000..72dba4a
--- /dev/null
+++ b/celt.patch
@@ -0,0 +1,11 @@
+--- opal-3.18.6/plugins/configure.ac~ 2020-10-26 19:16:58.000000000 +0100
++++ opal-3.18.6/plugins/configure.ac 2021-02-13 23:25:55.988102170 +0100
+@@ -149,7 +149,7 @@
+ [],
+ [],
+ [#include <celt/celt.h>],
+- [celt_mode_create(8000, 1 320, 0)],
++ [celt_mode_create(8000, 1320, 0)],
+ [
+ CELT_CFLAGS="${CELT_CFLAGS} -DCELT_VERSION=\"`pkg-config --modversion celt | \
+ sed -e "s/\./*10000+/" -e "s/\./*100+/"`\""
diff --git a/ffmpeg.patch b/ffmpeg.patch
deleted file mode 100644
index 91e726b..0000000
--- a/ffmpeg.patch
+++ /dev/null
@@ -1,831 +0,0 @@
-diff -ur opal-3.10.11.org/plugins/audio/G.722.2/G7222Codec.cpp opal-3.10.11/plugins/audio/G.722.2/G7222Codec.cpp
---- opal-3.10.11.org/plugins/audio/G.722.2/G7222Codec.cpp 2013-08-15 01:22:45.000000000 +0200
-+++ opal-3.10.11/plugins/audio/G.722.2/G7222Codec.cpp 2018-09-29 11:58:07.796456792 +0200
-@@ -109,7 +109,7 @@
- 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 @@
- //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 @@
- 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:
-diff -ur opal-3.10.11.org/plugins/audio/Speex/speexcodec.cxx opal-3.10.11/plugins/audio/Speex/speexcodec.cxx
---- opal-3.10.11.org/plugins/audio/Speex/speexcodec.cxx 2013-08-15 01:22:44.000000000 +0200
-+++ opal-3.10.11/plugins/audio/Speex/speexcodec.cxx 2018-09-29 11:58:07.796456792 +0200
-@@ -756,18 +756,19 @@
-
- ////////////////////////////////////////////////////////////////////////////////////////////////
-
--#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[] = {
-
-diff -ur opal-3.10.11.org/plugins/video/common/dyna.cxx opal-3.10.11/plugins/video/common/dyna.cxx
---- opal-3.10.11.org/plugins/video/common/dyna.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/common/dyna.cxx 2018-09-29 11:58:52.681123038 +0200
-@@ -210,14 +210,14 @@
- #endif
-
-
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+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;
- }
-@@ -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);
-
-@@ -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);
-
-diff -ur opal-3.10.11.org/plugins/video/common/dyna.h opal-3.10.11/plugins/video/common/dyna.h
---- opal-3.10.11.org/plugins/video/common/dyna.h 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/common/dyna.h 2018-09-29 11:58:52.681123038 +0200
-@@ -88,16 +88,16 @@
- 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);
-+ 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);
-@@ -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 -ur opal-3.10.11.org/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.11/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- opal-3.10.11.org/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2018-09-29 11:58:31.047147254 +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 -ur opal-3.10.11.org/plugins/video/common/ffmpeg.h opal-3.10.11/plugins/video/common/ffmpeg.h
---- opal-3.10.11.org/plugins/video/common/ffmpeg.h 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/common/ffmpeg.h 2018-09-29 11:58:52.681123038 +0200
-@@ -46,6 +46,7 @@
- #include "platform.h"
-
- #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"
-diff -ur opal-3.10.11.org/plugins/video/common/mpi.cxx opal-3.10.11/plugins/video/common/mpi.cxx
---- opal-3.10.11.org/plugins/video/common/mpi.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/common/mpi.cxx 2018-09-29 12:00:33.957463916 +0200
-@@ -132,8 +132,8 @@
- // 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;
-diff -ur opal-3.10.11.org/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.11/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.11.org/plugins/video/H.263-1998/h263-1998.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.263-1998/h263-1998.cxx 2018-09-29 11:59:17.348522238 +0200
-@@ -48,6 +48,10 @@
- #endif
-
- #include "h263-1998.h"
-+extern "C"
-+{
-+#include <libavutil/opt.h>
-+}
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -70,7 +74,7 @@
-
-
- #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 {
-@@ -94,7 +98,7 @@
- { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
- };
-
--static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
-+static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
-
-
- /////////////////////////////////////////////////////////////////////////////
-@@ -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");
-
-@@ -230,11 +234,10 @@
-
- m_context->opaque = this;
-
-- m_context->flags = CODEC_FLAG_EMU_EDGE // don't draw edges
-- | CODEC_FLAG_TRUNCATED // Possible missing packets
-+ m_context->flags = AV_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
-@@ -317,9 +320,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 +331,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
-@@ -340,9 +343,9 @@
- // 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;
- }
-
-@@ -350,9 +353,9 @@
- // 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;
- }
-
-@@ -360,9 +363,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 +373,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;
- }
-
-@@ -416,8 +419,8 @@
- 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;
-@@ -434,9 +437,6 @@
- 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);
-@@ -450,16 +450,7 @@
- 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;
-+ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec, NULL) == 0;
- }
-
- void H263_Base_EncoderContext::CloseCodec()
-@@ -521,7 +512,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;
-@@ -592,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
-@@ -603,13 +594,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;
-- m_context->flags &= ~CODEC_FLAG_4MV;
-+ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-+ m_context->flags &= ~AV_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;
- }
-@@ -629,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);
- }
-
-
-@@ -653,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;
- }
-@@ -704,7 +695,7 @@
- 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;
- }
-diff -ur opal-3.10.11.org/plugins/video/H.263-1998/h263-1998.h opal-3.10.11/plugins/video/H.263-1998/h263-1998.h
---- opal-3.10.11.org/plugins/video/H.263-1998/h263-1998.h 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.263-1998/h263-1998.h 2018-09-29 11:58:31.047147254 +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 -ur opal-3.10.11.org/plugins/video/H.263-1998/Makefile.in opal-3.10.11/plugins/video/H.263-1998/Makefile.in
---- opal-3.10.11.org/plugins/video/H.263-1998/Makefile.in 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.263-1998/Makefile.in 2018-09-29 11:58:31.047147254 +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 -ur opal-3.10.11.org/plugins/video/H.263-1998/rfc2190.cxx opal-3.10.11/plugins/video/H.263-1998/rfc2190.cxx
---- opal-3.10.11.org/plugins/video/H.263-1998/rfc2190.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.263-1998/rfc2190.cxx 2018-09-29 12:00:01.429831294 +0200
-@@ -25,7 +25,7 @@
-
- #include <iostream>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
-
- const unsigned char PSC[3] = { 0x00, 0x00, 0x80 };
-diff -ur opal-3.10.11.org/plugins/video/H.263-1998/rfc2429.cxx opal-3.10.11/plugins/video/H.263-1998/rfc2429.cxx
---- opal-3.10.11.org/plugins/video/H.263-1998/rfc2429.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.263-1998/rfc2429.cxx 2018-09-29 11:59:17.348522238 +0200
-@@ -286,7 +286,7 @@
-
- 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 @@
-
- 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;
- }
-
-diff -ur opal-3.10.11.org/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.11/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.11.org/plugins/video/H.264/gpl/h264_helper.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.264/gpl/h264_helper.cxx 2018-09-29 11:58:31.047147254 +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 -ur opal-3.10.11.org/plugins/video/H.264/h264-x264.cxx opal-3.10.11/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.11.org/plugins/video/H.264/h264-x264.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.264/h264-x264.cxx 2018-09-29 11:59:17.351855670 +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"
-@@ -104,7 +107,7 @@
-
- ///////////////////////////////////////////////////////////////////////////////
-
--FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264);
-+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264);
-
- PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF
-
-@@ -1064,27 +1067,23 @@
- 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)
- 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 = 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;
-
-- 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 $)");
-@@ -1181,7 +1180,7 @@
-
- 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) {
-diff -ur opal-3.10.11.org/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.11/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.11.org/plugins/video/H.264/shared/x264wrap.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/H.264/shared/x264wrap.cxx 2018-09-29 11:58:31.047147254 +0200
-@@ -33,6 +33,7 @@
-
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -ur opal-3.10.11.org/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.11/plugins/video/MPEG4-ffmpeg/Makefile.in
---- opal-3.10.11.org/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/MPEG4-ffmpeg/Makefile.in 2018-09-29 11:58:31.047147254 +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 -ur opal-3.10.11.org/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.11/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.11.org/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-08-15 01:22:47.000000000 +0200
-+++ opal-3.10.11/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2018-09-29 11:59:17.351855670 +0200
-@@ -103,6 +103,7 @@
-
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
-
-@@ -205,7 +206,7 @@
- { 0 }
- };
-
--FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4);
-+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4);
-
-
- static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen )
-@@ -539,7 +540,7 @@
- //
-
- 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;
-@@ -547,19 +548,19 @@
- // 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)
-@@ -589,17 +590,16 @@
- 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;
-+ 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_GMC;
-- m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
-- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+ 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 @@
- 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 @@
- {
- 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 @@
- 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
-@@ -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;
- }
-@@ -713,13 +713,15 @@
- 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;
-@@ -804,7 +806,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
- {
-@@ -1324,8 +1326,8 @@
- //
-
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-- m_avcontext->flags |= CODEC_FLAG_4MV;
-- m_avcontext->flags |= CODEC_FLAG_PART;
-+ 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
- }
-
-@@ -1394,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;
- }
-@@ -1415,7 +1417,7 @@
-
- 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;
- }
-diff -ur opal-3.10.11.org/src/im/msrp.cxx opal-3.10.11/src/im/msrp.cxx
---- opal-3.10.11.org/src/im/msrp.cxx 2013-08-15 01:22:57.000000000 +0200
-+++ opal-3.10.11/src/im/msrp.cxx 2018-09-29 11:58:07.796456792 +0200
-@@ -835,7 +835,8 @@
- 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
-diff -ur opal-3.10.11.org/src/sip/sipep.cxx opal-3.10.11/src/sip/sipep.cxx
---- opal-3.10.11.org/src/sip/sipep.cxx 2013-08-15 01:22:51.000000000 +0200
-+++ opal-3.10.11/src/sip/sipep.cxx 2018-09-29 11:58:07.796456792 +0200
-@@ -471,7 +471,7 @@
- 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/opal-ah.patch b/opal-ah.patch
deleted file mode 100644
index ecb229d..0000000
--- a/opal-ah.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- opal-3.10.9/plugins/configure.ac.orig 2013-01-24 15:50:58.908808589 +0100
-+++ opal-3.10.9/plugins/configure.ac 2013-01-24 16:05:12.328790801 +0100
-@@ -517,11 +517,11 @@
- ],
- [
- AC_MSG_RESULT(yes);
-- AC_DEFINE([AV_PICTURE_TYPE_NONE], [(AVPictureType)0])
-+ AC_DEFINE([AV_PICTURE_TYPE_NONE], [(AVPictureType)0], [Compatibilty with various versions of the libavcodec library])
- ],
- [
- AC_MSG_RESULT(no)
-- AC_DEFINE([AV_PICTURE_TYPE_NONE], [0])
-+ AC_DEFINE([AV_PICTURE_TYPE_NONE], [0], [Compatibilty with various versions of the libavcodec library])
- ]
- )
- ]
---- opal-3.10.9/configure.ac.orig 2012-11-26 11:49:22.000000000 +0100
-+++ opal-3.10.9/configure.ac 2013-01-24 16:06:31.778789145 +0100
-@@ -400,7 +400,7 @@
- if test "x$OPAL_CAPI" = "xyes" ; then
- AC_CHECK_HEADERS([capi20.h], [OPAL_CAPI=yes], [OPAL_CAPI=no])
- if test "x$OPAL_CAPI" = "xyes" ; then
-- AC_DEFINE([OPAL_CAPI], [1])
-+ AC_DEFINE([OPAL_CAPI], [1], [CAPI support])
- OPAL_ADD_CFLAGS_LIBS([], [-lcapi20])
- fi
- fi
diff --git a/opal-build.patch b/opal-build.patch
deleted file mode 100644
index 468da57..0000000
--- a/opal-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- opal-3.4.2/samples/simple/Makefile.orig 2008-11-05 17:42:13.403269358 +0100
-+++ opal-3.4.2/samples/simple/Makefile 2008-11-05 17:58:28.336264433 +0100
-@@ -53,13 +53,13 @@
-
- # The -I option allows to build the simple application in the same time as opal
- # (as used by distribution packagers)
--CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --cflags opal) -I../../include
--LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --libs opal)
-+CFLAGS +=
-+LDFLAGS +=
-
-
- # This part is we like to be tidy and put all the build products
- # in a sub-directory of a name specific to platform type.
--OBJDIR = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --variable=objdir opal)
-+OBJDIR = obj
-
- vpath %.o $(OBJDIR)
-
---- opal-3.10.8/plugins/LID/IxJ/Makefile.in~ 2012-10-05 08:19:44.000000000 +0200
-+++ opal-3.10.8/plugins/LID/IxJ/Makefile.in 2012-10-16 22:15:37.582438492 +0200
-@@ -31,7 +31,6 @@
- #
- #
-
--STDCCFLAGS =@STDCCFLAGS@
- CXXFLAGS =@CXXFLAGS@
-
- LID_PLUGIN_DIR=@LID_PLUGIN_DIR@
-@@ -65,7 +64,7 @@
-
- $(OBJDIR)/%.o : %.cxx
- @mkdir -p $(OBJDIR) >/dev/null 2>&1
-- $(Q_CC)$(CXX) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS) -c $< -o $@
-+ $(Q_CC)$(CXX) -I../../../include $(OPTCCFLAGS) $(CXXFLAGS) -c $< -o $@
-
- PLUGIN = ./ixj_lid_pwplugin.so
-
diff --git a/opal-exceptions.patch b/opal-exceptions.patch
deleted file mode 100644
index 4bc1aec..0000000
--- a/opal-exceptions.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- opal-3.10.9/plugins/LID/VPB/Makefile.in.orig 2012-11-26 11:48:28.000000000 +0100
-+++ opal-3.10.9/plugins/LID/VPB/Makefile.in 2013-02-02 12:57:10.136151676 +0100
-@@ -47,5 +47,6 @@
- INSTALL_DIR := @LID_PLUGIN_DIR@
- PLUGINDIR := @PLUGINDIR@
- include $(PLUGINDIR)/plugin-inc.mak
-+CFLAGS += -fexceptions
-
- ###########################################
diff --git a/opal-libilbc.patch b/opal-libilbc.patch
deleted file mode 100644
index 824a7d5..0000000
--- a/opal-libilbc.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- opal-3.10.9/opal.m4.orig 2012-11-26 11:49:22.000000000 +0100
-+++ opal-3.10.9/opal.m4 2013-01-24 14:11:21.415599845 +0100
-@@ -969,11 +969,11 @@
-
- saved_LIBS="$LIBS"
- LIBS="$LIBS -lilbc"
-- AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [has_ilbc=no])
-+ AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [AC_CHECK_LIB(ilbc, WebRtcIlbcfix_EncodeImpl, [has_ilbc=yes], [has_ilbc=no])])
- LIBS=$saved_LIBS
-
- if test "x${has_ilbc}" = "xyes"; then
-- AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no])
-+ AC_CHECK_HEADERS([ilbc.h], [has_ilbc=yes], [AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no])])
- fi
-
- if test "x${has_ilbc}" = "xyes"; then
---- opal-3.10.9/plugins/audio/iLBC/ilbccodec.c.orig 2012-11-26 11:48:21.000000000 +0100
-+++ opal-3.10.9/plugins/audio/iLBC/ilbccodec.c 2013-01-24 16:11:10.948783326 +0100
-@@ -37,9 +37,24 @@
-
- #include <codec/opalplugin.h>
-
-+#if defined(HAVE_ILBC_ILBC_DECODE_H) && defined(HAVE_ILBC_ILBC_ENCODE_H) && defined(HAVE_ILBC_ILBC_DEFINE_H)
-+#include <ilbc/iLBC_encode.h>
-+#include <ilbc/iLBC_decode.h>
-+#include <ilbc/iLBC_define.h>
-+#define ILBC_SAMPLE_TYPE float
-+#elif defined(HAVE_ILBC_H)
-+#include <ilbc.h>
-+#define ILBC_SAMPLE_TYPE int16_t
-+#define NO_OF_BYTES_20MS 38
-+#define NO_OF_BYTES_30MS 50
-+#define MIN_SAMPLE -32768
-+#define MAX_SAMPLE 32767
-+#else
-+#define ILBC_SAMPLE_TYPE float
- #include "iLBC/iLBC_encode.h"
- #include "iLBC/iLBC_decode.h"
- #include "iLBC/iLBC_define.h"
-+#endif
-
- #define BITRATE_30MS NO_OF_BYTES_30MS*8*8000/BLOCKL_30MS
- #define BITRATE_20MS NO_OF_BYTES_20MS*8*8000/BLOCKL_20MS
-@@ -91,7 +91,7 @@
- unsigned * toLen,
- unsigned int * flag)
- {
-- float block[BLOCKL_MAX];
-+ ILBC_SAMPLE_TYPE block[BLOCKL_MAX];
- int i;
-
- struct iLBC_Enc_Inst_t_ * encoder = (struct iLBC_Enc_Inst_t_ *)context;
-@@ -102,7 +102,7 @@
-
- /* convert signal to float */
- for (i = 0; i < encoder->blockl; i++)
-- block[i] = (float)sampleBuffer[i];
-+ block[i] = (ILBC_SAMPLE_TYPE)sampleBuffer[i];
-
- /* do the actual encoding */
- iLBC_encode(to, block, encoder);
-@@ -124,7 +124,7 @@
- unsigned int * flag)
- {
- int i;
-- float block[BLOCKL_MAX];
-+ ILBC_SAMPLE_TYPE block[BLOCKL_MAX];
-
- struct iLBC_Dec_Inst_t_ * decoder = (struct iLBC_Dec_Inst_t_ *)context;
- short * sampleBuffer = (short *)to;
diff --git a/opal-ruby.patch b/opal-ruby.patch
deleted file mode 100644
index b857d1c..0000000
--- a/opal-ruby.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- opal-3.10.9/configure.ac.orig 2013-02-02 11:32:55.486257032 +0100
-+++ opal-3.10.9/configure.ac 2013-02-02 12:55:44.492820131 +0100
-@@ -453,7 +453,7 @@
- if test "x$OPAL_RUBY" = "xyes" ; then
- AC_CHECK_PROG(HAS_RUBY,ruby,yes)
- if test "x$HAS_RUBY" = "xyes" ; then
-- RUBY_CFLAGS=-I`ruby -e 'puts $:.join(" -I")'`
-+ RUBY_CFLAGS="$(ruby -r rbconfig -e 'printf("-I%s -I%s/%s", Config::CONFIG[["rubyhdrdir"]], Config::CONFIG[["rubyhdrdir"]], Config::CONFIG[["arch"]])' 2>/dev/null)"
- oldCFLAGS="$CFLAGS"
- oldCPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS $RUBY_CFLAGS"
---- opal-3.10.9/opal_defs.mak.in.orig 2012-11-26 11:49:22.000000000 +0100
-+++ opal-3.10.9/opal_defs.mak.in 2013-02-02 17:03:28.472510316 +0100
-@@ -111,6 +111,7 @@
- OPAL_T38_CAP = @OPAL_T38_CAPABILITY@
- OPAL_FAX = @OPAL_FAX@
- OPAL_JAVA = @OPAL_JAVA@
-+OPAL_RUBY = @OPAL_RUBY@
- SPEEXDSP_SYSTEM = @SPEEXDSP_SYSTEM@
- OPAL_HAS_MSRP = @OPAL_HAS_MSRP@
- OPAL_HAS_SIPIM = @OPAL_HAS_SIPIM@
---- opal-3.10.10/Makefile.in.orig 2013-02-20 03:18:59.000000000 +0100
-+++ opal-3.10.10/Makefile.in 2013-02-24 11:12:25.660369779 +0100
-@@ -386,8 +386,8 @@
-
- ifeq ($(OPAL_RUBY), yes)
-
--RUBY_SRCDIR = $(OPAL_SRCDIR)/ruby
--RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
-+RUBY_SRCDIR = $(OPAL_SRCDIR)/Ruby
-+RUBY_WRAPPER = $(RUBY_SRCDIR)/ruby_swig_wrapper.cxx
-
- VPATH_C += $(RUBY_SRCDIR)
- SOURCES += $(RUBY_WRAPPER)
diff --git a/opal-sh.patch b/opal-sh.patch
deleted file mode 100644
index cf3f379..0000000
--- a/opal-sh.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- opal-3.10.9/plugins/configure.ac.orig 2012-11-26 11:48:31.000000000 +0100
-+++ opal-3.10.9/plugins/configure.ac 2013-01-20 17:38:22.322544339 +0100
-@@ -158,7 +158,7 @@
- fi
- if test "x${HAVE_GSM0610}" = "xyes" ; then
- AC_CONFIG_FILES(audio/GSM0610/Makefile)
-- SUBDIRS+=" audio/GSM0610"
-+ SUBDIRS="$SUBDIRS audio/GSM0610"
-
- AC_ARG_ENABLE([localgsm],
- [AC_HELP_STRING([--enable-localgsm],[Force use local version of GSM library rather than system version])],
-@@ -208,7 +208,7 @@
- fi
- if test "x${HAVE_GSMAMR}" = "xyes" ; then
- AC_CONFIG_FILES(audio/gsm-amr/Makefile)
-- SUBDIRS+=" audio/gsm-amr"
-+ SUBDIRS="$SUBDIRS audio/gsm-amr"
- fi
-
- dnl #########
-@@ -223,7 +223,7 @@
- fi
- if test "x${HAVE_iLBC}" = "xyes" ; then
- AC_CONFIG_FILES(audio/iLBC/Makefile)
-- SUBDIRS+=" audio/iLBC"
-+ SUBDIRS="$SUBDIRS audio/iLBC"
-
- OPAL_DETERMINE_ILBC()
- AC_SUBST(ILBC_SYSTEM)
-@@ -244,7 +244,7 @@
- if test "x${HAVE_SPEEX}" = "xyes" ; then
- AC_OUTPUT(audio/Speex/libspeex/speex_config_types.h)
- AC_CONFIG_FILES(audio/Speex/Makefile)
-- SUBDIRS+=" audio/Speex"
-+ SUBDIRS="$SUBDIRS audio/Speex"
-
- OPAL_SPEEX_TYPES()
- AC_SUBST(SIZE16)
-@@ -267,7 +267,7 @@
- fi
- if test "x${HAVE_G722}" = "xyes" ; then
- AC_CONFIG_FILES(audio/G722/Makefile)
-- SUBDIRS+=" audio/G722"
-+ SUBDIRS="$SUBDIRS audio/G722"
- fi
-
- dnl #########
-@@ -282,7 +282,7 @@
- fi
- if test "x${HAVE_G7221}" = "xyes" ; then
- AC_CONFIG_FILES(audio/G.722.1/Makefile)
-- SUBDIRS+=" audio/G.722.1"
-+ SUBDIRS="$SUBDIRS audio/G.722.1"
- fi
-
- dnl #########
-@@ -297,7 +297,7 @@
- fi
- if test "x${HAVE_G7222}" = "xyes" ; then
- AC_CONFIG_FILES(audio/G.722.2/Makefile)
-- SUBDIRS+=" audio/G.722.2"
-+ SUBDIRS="$SUBDIRS audio/G.722.2"
- fi
-
- dnl #########
-@@ -312,7 +312,7 @@
- fi
- if test "x${HAVE_G726}" = "xyes" ; then
- AC_CONFIG_FILES(audio/G726/Makefile)
-- SUBDIRS+=" audio/G726"
-+ SUBDIRS="$SUBDIRS audio/G726"
- fi
-
- dnl #########
-@@ -327,7 +327,7 @@
- fi
- if test "x${HAVE_LPC10}" = "xyes" ; then
- AC_CONFIG_FILES(audio/LPC_10/Makefile)
-- SUBDIRS+=" audio/LPC_10"
-+ SUBDIRS="$SUBDIRS audio/LPC_10"
- fi
-
- dnl #########
-@@ -342,7 +342,7 @@
- fi
- if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then
- AC_CONFIG_FILES(audio/IMA_ADPCM/Makefile)
-- SUBDIRS+=" audio/IMA_ADPCM"
-+ SUBDIRS="$SUBDIRS audio/IMA_ADPCM"
- fi
-
- dnl #########
-@@ -362,7 +362,7 @@
- fi
- if test "x${HAVE_SBC}" = "xyes" ; then
- AC_CONFIG_FILES(audio/SBC/Makefile)
-- SUBDIRS+=" audio/SBC"
-+ SUBDIRS="$SUBDIRS audio/SBC"
- fi
-
- dnl #########
-@@ -388,7 +388,7 @@
- CELT_CFLAGS="${CELT_CFLAGS} -DCELT_VERSION=\"`pkg-config --modversion celt | \
- sed -e "s/\./*10000+/" -e "s/\./*100+/"`\""
- AC_CONFIG_FILES(audio/celt/Makefile)
-- SUBDIRS+=" audio/celt"
-+ SUBDIRS="$SUBDIRS audio/celt"
- fi
-
- dnl #########
-@@ -403,7 +403,7 @@
- fi
- if test "x${HAVE_SILK}" = "xyes" ; then
- AC_CONFIG_FILES(audio/SILK/Makefile)
-- SUBDIRS+=" audio/SILK"
-+ SUBDIRS="$SUBDIRS audio/SILK"
- fi
-
-
-@@ -421,7 +421,7 @@
- fi
- if test "x${HAVE_H261}" = "xyes" ; then
- AC_CONFIG_FILES(video/H.261-vic/Makefile)
-- SUBDIRS+=" video/H.261-vic"
-+ SUBDIRS="$SUBDIRS video/H.261-vic"
- fi
-
-
-@@ -534,12 +534,12 @@
-
- if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
- 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(video/MPEG4-ffmpeg/Makefile)
-- SUBDIRS+=" video/MPEG4-ffmpeg"
-+ SUBDIRS="$SUBDIRS video/MPEG4-ffmpeg"
- fi
-
-
-@@ -577,7 +577,7 @@
- [AC_HELP_STRING([--enable-x264-licensed],[enable commercially licensed x264 support])],
- [IS_H264_LICENSED=$enableval])
-
-- SUBDIRS+=" video/H.264"
-+ SUBDIRS="$SUBDIRS video/H.264"
- AC_CONFIG_FILES(video/H.264/Makefile)
- AC_CONFIG_FILES(video/H.264/gpl/Makefile)
- fi
-@@ -605,7 +605,7 @@
- fi
- if test "x$HAVE_THEORA" = "xyes" ; then
- AC_CONFIG_FILES(video/THEORA/Makefile)
-- SUBDIRS+=" video/THEORA"
-+ SUBDIRS="$SUBDIRS video/THEORA"
- fi
-
-
-@@ -639,7 +639,7 @@
-
- if test "x$HAVE_IXJ" = "xyes" ; then
- AC_CONFIG_FILES(LID/IxJ/Makefile)
-- SUBDIRS+=" LID/IxJ"
-+ SUBDIRS="$SUBDIRS LID/IxJ"
- fi
-
- dnl ########################
-@@ -650,7 +650,7 @@
- fi
- if test "x$HAVE_VPB" = "xyes" ; then
- AC_CONFIG_FILES(LID/VPB/Makefile)
-- SUBDIRS+=" LID/VPB"
-+ SUBDIRS="$SUBDIRS LID/VPB"
- fi
-
-
-@@ -675,7 +675,7 @@
-
- if test "x$HAVE_SPANDSP" = "xyes" ; then
- AC_CONFIG_FILES(fax/fax_spandsp/Makefile)
-- SUBDIRS+=" fax/fax_spandsp"
-+ SUBDIRS="$SUBDIRS fax/fax_spandsp"
- fi
-
-
diff --git a/srtp.patch b/srtp.patch
deleted file mode 100644
index daf28e3..0000000
--- a/srtp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- opal-3.10.11/opal.m4~ 2018-09-27 11:03:07.000000000 +0200
-+++ opal-3.10.11/opal.m4 2018-09-27 11:04:28.172164490 +0200
-@@ -903,7 +903,7 @@ AC_DEFUN([OPAL_FIND_LIBSRTP],
- [
- AC_LANG(C)
- AC_COMPILE_IFELSE([
-- AC_LANG_PROGRAM([[#include "srtp/srtp.h"]],
-+ AC_LANG_PROGRAM([[#include "srtp2/srtp.h"]],
- [[
- crypto_policy_t p; p.cipher_key_len = SRTP_MASTER_KEY_LEN; return 0;
- ]]
-@@ -913,7 +913,7 @@ AC_DEFUN([OPAL_FIND_LIBSRTP],
- [opal_libsrtp=no])
-
- if test "x${opal_libsrtp}" = "xyes" ; then
-- SRTP_LIBS="-lsrtp"
-+ SRTP_LIBS="-lsrtp2"
- fi
- AS_IF([test AS_VAR_GET([opal_libsrtp]) = yes], [$1], [$2])[]
- ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opal.git/commitdiff/c9789360b67d64e0ab737210e7296c2b05d2d908
More information about the pld-cvs-commit
mailing list