- libx264 rebuild

[packages/opal.git] / opal.spec

diff --git a/opal.spec b/opal.spec
index 76eed3adcaa832e66106cfe99b18faaeae8f88af..767eca01654e6b735f8efe3f6adee21641d27798 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -6,12 +6,13 @@
 #
 # WARNING: opal version should match Ekiga and ptlib versions
 #      Recommendations: http://wiki.ekiga.org/index.php/Download_Ekiga_sources
+#      (for ekiga 4.0.x it's ptlib 2.10.x + opal 3.10.x)
 #
 # Conditional build:
 %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 (mutually exclusive with zrtp; broken as of 3.10.9)
+%bcond_with    zrtp            # ZRTP protocol support (mutually exclusive with srtp; broken as of 3.10.9)
 %bcond_without capi            # CAPI support
 %bcond_without vpb             # Voicetronix VPB support
 %bcond_with    java            # Java JNI interface (only swig wrapper, Java part not built)
@@ -29,20 +30,20 @@
 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.10
-Release:       3
+Version:       3.10.11
+Release:       6
 License:       MPL v1.0
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5: b923e1c75fe0643bdf7a4ad7b1bc8e20
+# Source0-md5: fc36a30d2cbce0fbf7cb6ef33b8d63c3
 Patch0:                %{name}-build.patch
-Patch1:                %{name}-ffmpeg10.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:                ffmpeg2.patch
+Patch7:                srtp.patch
 URL:           http://www.opalvoip.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -56,7 +57,7 @@ BuildRequires:        ptlib-devel >= 1:2.10.9
 BuildRequires: sed >= 4.0
 BuildRequires: speex-devel >= 1:1.2
 BuildRequires: speexdsp-devel >= 1.2
-%{?with_srtp:BuildRequires:    srtp-devel}
+%{?with_srtp:BuildRequires:    libsrtp2-devel}
 %if %{without sip_fax_only}
 BuildRequires: SDL-devel
 # libavcodec >= 51.11.0 libavutil
@@ -111,7 +112,7 @@ 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}
+%{?with_srtp:Requires: libsrtp2-devel}
 
 %description devel
 Header files and libraries for developing applications that use OPAL.
@@ -157,6 +158,8 @@ cd plugins
 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 \
@@ -260,9 +263,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/theora_ptplugin.so
 %dir %{_libdir}/opal-%{version}/fax
 %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
 %endif
+%dir %{_libdir}/opal-%{version}/lid
 
 %if %{with vpb}
 %files lid-vpb