- updated to 3.10.8

diff --git a/opal-3.10.8-svn-revision.patch b/opal-3.10.8-svn-revision.patch
new file mode 100644 (file)
index 0000000..3249ca9
--- /dev/null
+++ b/opal-3.10.8-svn-revision.patch
@@ -0,0 +1,11 @@
+--- opal-3.10.8/revision.h.in~ 2012-10-05 08:20:38.000000000 +0200
++++ opal-3.10.8/revision.h.in  2012-10-16 22:21:39.989092374 +0200
+@@ -22,7 +22,7 @@
+  *
+  * Contributor(s): ______________________________________.
+  *
+- * $Revision$
++ * $Revision: 28475
+  */
+ 
+ #ifndef _OPAL_REVISION_H

diff --git a/opal-build.patch b/opal-build.patch
index 5d49ae5c8d25e53b0e25742a65392703d8689883..468da570cae402f939dda047287a5fc6fd09dc98 100644 (file)
--- a/opal-build.patch
+++ b/opal-build.patch
@@ -17,3 +17,22 @@
  
  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.spec b/opal.spec
index 98f2b61581828b761458a0cb0ca39f56be62ab93..24cd85ae1733fe0afcbf9f67465e7e9e2125ca0e 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -30,15 +30,16 @@ Patch0:             %{name}-libname.patch
 Patch1:                %{name}-mak_files.patch
 Patch2:                %{name}-ac.patch
 Patch3:                %{name}-build.patch
+Patch4:                opal-3.10.8-svn-revision.patch
 BuildRequires: autoconf
 BuildRequires: automake
-%{?with_celt:BuildRequires:    celt-devel <= 0.8.1}
+%{?with_celt:BuildRequires:    celt-devel}
 BuildRequires: expat-devel
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
-BuildRequires: ptlib-devel >= 1:2.8.3
+BuildRequires: ptlib-devel >= 1:2.10.8
 BuildRequires: sed >= 4.0
-%{?with_celt:Requires: celt <= 0.8.1}
+%{?with_celt:Requires: celt}
 %if %{without sip_fax_only}
 BuildRequires: SDL-devel
 BuildRequires: ffmpeg-devel
@@ -99,6 +100,7 @@ Biblioteki statyczne OPAL.
 #patch1 -p1
 #patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR
@@ -139,7 +141,6 @@ cd ..
        --enable-ixj
 %endif
 
-
 %{__make} %{?debug:debug}%{!?debug:opt} \
        CC="%{__cc}" \
        CPLUS="%{__cxx}" \
@@ -189,24 +190,26 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/opal-%{version}/codecs/audio
 %dir %{_libdir}/opal-%{version}/codecs/video
 %dir %{_libdir}/opal-%{version}/lid
-%{?with_celt:%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/celtcodec_pwplugin.so}
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g722_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g726_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/gsm0610_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/gsmamrcodec_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/ilbc_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/ima_adpcm_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/lpc10_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/speex_audio_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h261-vic_video_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h263-1998_video_pwplugin.so
-#%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h263-ffmpeg_video_pwplugin.so
+%{?with_celt:%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/celt_ptplugin.so}
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g722_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g7221_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g7222_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g726_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/gsm0610_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/gsmamrcodec_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/iLBC_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/ima_adpcm_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/lpc10_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/silk_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/speex_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h261_vic_ptplugin.so
+%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h263_ffmpeg_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_video_pwplugin_helper
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_video_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/theora_video_pwplugin.so
+%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/theora_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/lid/ixj_lid_pwplugin.so
-%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_lid_pwplugin.so
+#%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_lid_pwplugin.so
 %endif
 
 %files devel