- added exceptions patch and (bconditional) vpb support

- completed zrtp bcond, but sources are inconsistent and don't build in this case

diff --git a/opal-exceptions.patch b/opal-exceptions.patch
new file mode 100644 (file)
index 0000000..8e81415
--- /dev/null
+++ b/opal-exceptions.patch
@@ -0,0 +1,19 @@
+--- opal-3.10.9/opal.m4.orig   2013-02-01 20:14:24.184072390 +0100
++++ opal-3.10.9/opal.m4        2013-02-01 20:53:31.337356800 +0100
+@@ -292,7 +292,7 @@
+           OSTYPE=`$PKG_CONFIG ptlib --variable=ostype`
+ 
+             PTLIB_VERSION=`$PKG_CONFIG ptlib --modversion`
+-            PTLIB_CFLAGS=`$PKG_CONFIG ptlib --cflags`
++            PTLIB_CFLAGS=`$PKG_CONFIG ptlib --cflags | sed -e 's, *-fno-exceptions,,'`
+             PTLIB_CXXFLAGS=`$PKG_CONFIG ptlib --variable=cxxflags`
+             PTLIB_LIBS=`$PKG_CONFIG ptlib --libs`
+ 
+@@ -311,6 +311,7 @@
+           OSTYPE=`$PKG_CONFIG ptlib --variable=ostype`
+ 
+             PTLIB_VERSION=`$PKG_CONFIG ptlib --modversion`
++            PTLIB_CFLAGS=`$PKG_CONFIG ptlib --cflags | sed -e 's, *-fno-exceptions,,'`
+             PTLIB_CXXFLAGS=`$PKG_CONFIG ptlib --variable=cxxflags` 
+             DEBUG_LIBS=`$PKG_CONFIG ptlib --define-variable=suffix=_d --libs`
+             RELEASE_LIBS="$PTLIB_LIBS"

diff --git a/opal.spec b/opal.spec
index 4eaede39dd5a1973ef76d3711fad925b07b76c8a..9a5a1098486dfd656e9b9a4e65c86a8d8f7f667b 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -2,7 +2,6 @@
 #      SBC plugin is missing bluez_sbc subdir
 #      fix static libname (libopal_s.a)
 #      MPEG4 rate control correction requires libavcodec sources
-#      VPB support (--enable-libvpb, needs exceptions enabled in ptlib, BR: libvpb)
 # NOTE: IPv6 support requires IPv6 support in ptlib
 #
 # WARNING: opal version should match Ekiga and ptlib versions
@@ -12,7 +11,7 @@
 %bcond_with    sip_fax_only    # minimal build for t38modem + SIP
 %bcond_without celt            # CELT codec support
 %bcond_without srtp            # SRTP protocol support (mutually exclusive with zrtp)
-%bcond_with    zrtp            # ZRTP protocol support [TODO: libzrtp[3]]
+%bcond_with    zrtp            # ZRTP protocol support (mutually exclusive with zrtp; broken as of 3.10.9)
 %bcond_without capi            # CAPI support
 %bcond_with    vpb             # Voicetronix VPB support
 %bcond_with    java            # Java JNI support
@@ -39,6 +38,7 @@ Patch1:               %{name}-ffmpeg10.patch
 Patch2:                %{name}-sh.patch
 Patch3:                %{name}-libilbc.patch
 Patch4:                %{name}-ah.patch
+Patch5:                %{name}-exceptions.patch
 URL:           http://www.opalvoip.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -46,6 +46,7 @@ BuildRequires:        automake
 %{?with_celt:BuildRequires:    celt-devel}
 BuildRequires: expat-devel
 BuildRequires: libstdc++-devel
+%{?with_zrtp:BuildRequires:    libzrtp-devel}
 BuildRequires: pkgconfig
 BuildRequires: ptlib-devel >= 1:2.10.9
 BuildRequires: sed >= 4.0
@@ -59,7 +60,7 @@ BuildRequires:        ffmpeg-devel
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libgsm-devel
 BuildRequires: libtheora-devel
-%{?with_vpb:BuildRequires:     libvpb-devel}
+%{?with_vpb:BuildRequires:     vpb-devel}
 # ABI 0.102
 BuildRequires: libx264-devel >= 0.1.3-1.20101031_2245.1
 BuildRequires: webrtc-libilbc-devel
@@ -91,6 +92,7 @@ Group:                Development/Libraries
 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:      speex-devel >= 1:1.2
 %{?with_srtp:Requires: srtp-devel}
@@ -121,6 +123,7 @@ Biblioteki statyczne OPAL.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%{?with_vpb:%patch5 -p1}
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR
@@ -162,7 +165,13 @@ cd ..
        %{?with_ruby:--enable-ruby} \
        %{!?with_srtp:--disable-srtp} \
        %{?with_vpb:--enable-vpb} \
-       %{?with_zrtp:--enable-zrtp}
+%if %{with zrtp}
+       --enable-zrtp \
+       --with-bn-includedir=/usr/include \
+       --with-bn-libdir=%{_libdir} \
+       --with-zrtp-includedir=/usr/include/libzrtp \
+       --with-zrtp-libdir=%{_libdir}
+%endif
 %endif
 
 %{__make} %{?debug:debug}%{!?debug:opt} \
@@ -235,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/opal-%{version}/fax/spandsp_ptplugin.so
 %dir %{_libdir}/opal-%{version}/lid
 %attr(755,root,root) %{_libdir}/opal-%{version}/lid/ixj_lid_pwplugin.so
-#%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_lid_pwplugin.so
+%{?with_vpb:%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_ptplugin.so}
 %endif
 
 %files devel