- updated to 3.18.8

- added cxx11 patch (fix build as C++11, unique_ptr cannot be used in such context)

diff --git a/opal-cxx11.patch b/opal-cxx11.patch
new file mode 100644 (file)
index 0000000..9650137
--- /dev/null
+++ b/opal-cxx11.patch
@@ -0,0 +1,106 @@
+--- opal-3.18.8/include/opal/connection.h.orig 2022-03-27 16:06:21.000000000 +0200
++++ opal-3.18.8/include/opal/connection.h      2022-04-18 19:11:37.004196964 +0200
+@@ -52,6 +52,7 @@
+ #include <ptclib/script.h>
+ #endif
+ 
++#include <memory>
+ 
+ class OpalEndPoint;
+ class OpalCall;
+@@ -1931,10 +1932,10 @@ class OpalConnection : public PSafeObjec
+     virtual void DisableRecording();
+ 
+     PDECLARE_NOTIFIER(RTP_DataFrame, OpalConnection, OnRecordAudio);
+-    void InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> frame);
++    void InternalOnRecordAudio(PString key, std::shared_ptr<RTP_DataFrame> frame);
+ #if OPAL_VIDEO
+     PDECLARE_NOTIFIER(RTP_DataFrame, OpalConnection, OnRecordVideo);
+-    void InternalOnRecordVideo(PString key, PAutoPtr<RTP_DataFrame> frame);
++    void InternalOnRecordVideo(PString key, std::shared_ptr<RTP_DataFrame> frame);
+ #endif
+ 
+     virtual void OnStartRecording(OpalMediaPatch * patch);
+--- opal-3.18.8/src/opal/connection.cxx.orig   2022-03-27 16:06:21.000000000 +0200
++++ opal-3.18.8/src/opal/connection.cxx        2022-04-18 18:52:42.030345645 +0200
+@@ -1175,13 +1175,13 @@ void OpalConnection::OnRecordAudio(RTP_D
+     return;
+ 
+   const OpalMediaPatch * patch = (const OpalMediaPatch *)param;
+-  PAutoPtr<RTP_DataFrame> copyFrame(new RTP_DataFrame(frame.GetPointer(), frame.GetPacketSize()));
+-  GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, PAutoPtr<RTP_DataFrame> >(
++  std::shared_ptr<RTP_DataFrame> copyFrame(new RTP_DataFrame(frame.GetPointer(), frame.GetPacketSize()));
++  GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, std::shared_ptr<RTP_DataFrame> >(
+                    this, MakeRecordingKey(*patch), copyFrame, &OpalConnection::InternalOnRecordAudio), psprintf("%p", this));
+ }
+ 
+ 
+-void OpalConnection::InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> frame)
++void OpalConnection::InternalOnRecordAudio(PString key, std::shared_ptr<RTP_DataFrame> frame)
+ {
+   m_ownerCall.OnRecordAudio(key, *frame);
+ }
+@@ -1192,13 +1192,13 @@ void OpalConnection::InternalOnRecordAud
+ void OpalConnection::OnRecordVideo(RTP_DataFrame & frame, P_INT_PTR param)
+ {
+   const OpalMediaPatch * patch = (const OpalMediaPatch *)param;
+-  PAutoPtr<RTP_DataFrame> copyFrame(new RTP_DataFrame(frame.GetPointer(), frame.GetPacketSize()));
+-  GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, PAutoPtr<RTP_DataFrame> >(
++  std::shared_ptr<RTP_DataFrame> copyFrame(new RTP_DataFrame(frame.GetPointer(), frame.GetPacketSize()));
++  GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, std::shared_ptr<RTP_DataFrame> >(
+                    this, MakeRecordingKey(*patch), copyFrame, &OpalConnection::InternalOnRecordVideo), psprintf("%p", this));
+ }
+ 
+ 
+-void OpalConnection::InternalOnRecordVideo(PString key, PAutoPtr<RTP_DataFrame> frame)
++void OpalConnection::InternalOnRecordVideo(PString key, std::shared_ptr<RTP_DataFrame> frame)
+ {
+   m_ownerCall.OnRecordVideo(key, *frame);
+ }
+--- opal-3.18.8/include/opal/pres_ent.h.orig   2022-03-27 16:06:21.000000000 +0200
++++ opal-3.18.8/include/opal/pres_ent.h        2022-04-18 19:32:14.790824632 +0200
+@@ -44,6 +44,7 @@
+ #include <im/im.h>
+ 
+ #include <list>
++#include <memory>
+ #include <queue>
+ 
+ class OpalManager;
+@@ -337,10 +338,10 @@ class OpalPresentity : public PSafeObjec
+       const OpalPresenceInfo & info ///< Info on other presentity that changed state
+     );
+ 
+-    typedef PNotifierTemplate< PAutoPtr<OpalPresenceInfo> > PresenceChangeNotifier;
+-    #define PDECLARE_PresenceChangeNotifier(cls, fn) PDECLARE_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>)
+-    #define PDECLARE_ASYNC_PresenceChangeNotifier(cls, fn) PDECLARE_ASYNC_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>)
+-    #define PCREATE_PresenceChangeNotifier(fn) PCREATE_NOTIFIER2(fn, PAutoPtr<OpalPresenceInfo>)
++    typedef PNotifierTemplate< std::shared_ptr<OpalPresenceInfo> > PresenceChangeNotifier;
++    #define PDECLARE_PresenceChangeNotifier(cls, fn) PDECLARE_NOTIFIER2(OpalPresentity, cls, fn, std::shared_ptr<OpalPresenceInfo>)
++    #define PDECLARE_ASYNC_PresenceChangeNotifier(cls, fn) PDECLARE_ASYNC_NOTIFIER2(OpalPresentity, cls, fn, std::shared_ptr<OpalPresenceInfo>)
++    #define PCREATE_PresenceChangeNotifier(fn) PCREATE_NOTIFIER2(fn, std::shared_ptr<OpalPresenceInfo>)
+ 
+     /// Set the notifier for the OnPresenceChange() function.
+     void SetPresenceChangeNotifier(
+--- opal-3.18.8/src/opal/pres_ent.cxx.orig     2022-03-27 16:06:21.000000000 +0200
++++ opal-3.18.8/src/opal/pres_ent.cxx  2022-04-18 19:35:12.363195973 +0200
+@@ -323,7 +323,7 @@ void OpalPresentity::OnPresenceChange(co
+   if (m_onPresenceChangeNotifier.IsNULL())
+     return;
+ 
+-  PAutoPtr<OpalPresenceInfo> pinfo(info.CloneAs<OpalPresenceInfo>());
++  std::shared_ptr<OpalPresenceInfo> pinfo(info.CloneAs<OpalPresenceInfo>());
+   m_onPresenceChangeNotifier(*this, pinfo);
+ }
+ 
+--- opal-3.18.8/src/opal/opal_c.cxx.orig       2022-03-27 16:06:21.000000000 +0200
++++ opal-3.18.8/src/opal/opal_c.cxx    2022-04-18 19:32:26.250762548 +0200
+@@ -2969,7 +2969,7 @@ PString ConvertStringSetWithoutLastNewin
+   return strm.Left(strm.GetLength()-1);
+ }
+ 
+-void OpalManager_C::OnPresenceChange(OpalPresentity &, PAutoPtr<OpalPresenceInfo> info)
++void OpalManager_C::OnPresenceChange(OpalPresentity &, std::shared_ptr<OpalPresenceInfo> info)
+ {
+   OpalMessageBuffer message(OpalIndPresenceChange);
+   SET_MESSAGE_STRING(message, m_param.m_presenceStatus.m_entity,   info->m_entity.AsString());

diff --git a/opal.spec b/opal.spec
index 57a8c35359fbf571aae46f5cb904349588899e0d..314db7b7ec724760892beca24250f4faf5cf98fd 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -30,15 +30,18 @@
 Summary:       Open Phone Abstraction Library (aka OpenH323 v2)
 Summary(pl.UTF-8):     Biblioteka Open Phone Abstraction Library (aka OpenH323 v2)
 Name:          opal
-Version:       3.18.6
-Release:       3
+Version:       3.18.8
+Release:       1
 License:       MPL v1.0
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5: 0b4dfe603834b3cf2252782f1594403d
+# Source0-md5: 1f48ea0bef4b0731b4af19928eb02c36
 Patch0:                celt.patch
 Patch1:                g7221.patch
-URL:           http://www.opalvoip.org/
+Patch2:                %{name}-cxx11.patch
+# domain suspended (2022.04)
+#URL:          http://www.opalvoip.org/
+URL:           https://sourceforge.net/projects/opalvoip/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 %{?with_capi:BuildRequires:    capi4k-utils-devel}
@@ -62,6 +65,7 @@ BuildRequires:        libtheora-devel
 %{?with_vpb:BuildRequires:     vpb-devel}
 # ABI 0.102
 BuildRequires: libx264-devel >= 0.1.3-1.20101031_2245.1
+BuildRequires: openh264-devel
 BuildRequires: openssl-devel
 %{?with_ruby:BuildRequires:    ruby-devel}
 BuildRequires: spandsp-devel
@@ -69,7 +73,6 @@ BuildRequires:        swig
 BuildRequires: unixODBC-devel
 BuildRequires: webrtc-libilbc-devel
 %endif
-BuildConflicts:        dahdi-linux-devel
 %requires_eq   ptlib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -132,6 +135,7 @@ Biblioteki statyczne OPAL.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR
@@ -166,6 +170,7 @@ cd ..
 %endif
        %{!?with_capi:--disable-capi} \
        %{!?with_celt:--disable-celt} \
+       --disable-dahdi \
        %{!?with_java:--disable-java} \
        %{!?with_ruby:--disable-ruby} \
        %{!?with_srtp:--disable-srtp} \
@@ -224,6 +229,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_video_pwplugin_helper
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_x264_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/mpeg4_ffmpeg_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/openh264_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/theora_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/vp8_webm_ptplugin.so
 %dir %{_libdir}/opal-%{version}/fax