Version: 2.9.0 (new sonames)

nov4l1 and ffmpeg10 not needed any more

diff --git a/mediastreamer-ffmpeg10.patch b/mediastreamer-ffmpeg10.patch
deleted file mode 100644 (file)
index 3304e9f..0000000
--- a/mediastreamer-ffmpeg10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
-Date:   Tue Jun 5 11:07:48 2012 +0200
-
-    Fixes for new versions of ffmpeg
-
-diff --git a/src/h264dec.c b/src/h264dec.c
-index c4a84ee..5229b5e 100644
---- a/src/h264dec.c
-+++ b/src/h264dec.c
-@@ -45,7 +45,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
-       static bool_t done=FALSE;
-       if (!done){
-+#ifdef FF_API_AVCODEC_INIT
-               avcodec_init();
-+#endif
-               avcodec_register_all();
-               done=TRUE;
-       }
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..fb35760 100644
---- a/src/videoenc.c
-+++ b/src/videoenc.c
-@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- static bool_t avcodec_initialized=FALSE;
- 
-+#ifndef FF_I_TYPE
-+#define FF_I_TYPE AV_PICTURE_TYPE_I
-+#endif
-+
- #ifdef ENABLE_LOG_FFMPEG
- 
- void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- void ms_ffmpeg_check_init(){
-       if(!avcodec_initialized){
-+#ifdef FF_API_AVCODEC_INIT
-               avcodec_init();
-+#endif
-               avcodec_register_all();
-               avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
-       if (s->profile==0){
-               s->codec=CODEC_ID_H263;
-       }else{
-+              /*
-               c->flags|=CODEC_FLAG_H263P_UMV;
-               c->flags|=CODEC_FLAG_AC_PRED;
-               c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
--              /*
-               c->flags|=CODEC_FLAG_OBMC;
-               c->flags|=CODEC_FLAG_AC_PRED;
-               */

diff --git a/mediastreamer-nov4l1.atch b/mediastreamer-nov4l1.atch
deleted file mode 100644 (file)
index 5939dde..0000000
--- a/mediastreamer-nov4l1.atch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mediastreamer-2.8.2/tests/mediastream.c~   2012-02-17 10:16:20.000000000 +0100
-+++ mediastreamer-2.8.2/tests/mediastream.c    2012-06-06 23:14:21.000000000 +0200
-@@ -430,7 +430,6 @@
- #if defined (__ios) && defined (HAVE_X264)
-       libmsx264_init(); /*no plugin on IOS*/
- #endif
--      rtp_profile_set_payload(&av_profile,26,&payload_type_jpeg);
-       rtp_profile_set_payload(&av_profile,98,&payload_type_h263_1998);
-       rtp_profile_set_payload(&av_profile,97,&payload_type_theora);
-       rtp_profile_set_payload(&av_profile,99,&payload_type_mp4v);

diff --git a/mediastreamer.spec b/mediastreamer.spec
index 34d66465f942ce47efb93834897be4961628d8b2..62bc9d31d92c9c42e3207197f41ada1e30a4dea1 100644 (file)
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -1,13 +1,12 @@
 Summary:       Audio/Video real-time streaming
 Name:          mediastreamer
-Version:       2.8.2
-Release:       3
+Version:       2.9.0
+Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://mirror.lihnidos.org/GNU/savannah/linphone/mediastreamer/%{name}-%{version}.tar.gz
-# Source0-md5: e51ea9d5fce1396b374d10473dfbadec
-Patch0:                %{name}-nov4l1.atch
-Patch1:                %{name}-ffmpeg10.patch
+# Source0-md5: f2ea0fe731a363749a81b6eaac22a62c
+Patch0:                %{name}-imagedir.patch
 URL:           http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -20,13 +19,14 @@ BuildRequires:      libgsm-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libtheora-devel
 BuildRequires: libv4l-devel
-BuildRequires: ortp-devel >= 0.17.0
+BuildRequires: ortp-devel >= 0.21.0
 BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
 BuildRequires: spandsp-devel
 BuildRequires: speex-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXv-devel
+BuildRequires: xxd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,8 +53,6 @@ Static mediastreamer library.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{__sed} -i 's,gsm/gsm.h,gsm.h,g' configure.ac src/gsm.c
 
 %build
 %{__libtoolize}
@@ -74,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # Remove duplicated documentation
-rm -fr $RPM_BUILD_ROOT/usr/share/doc/mediastreamer/mediastreamer-2.8.2/html/
+rm -r $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html/
 
 %find_lang %{name}
 
@@ -86,18 +84,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libmediastreamer.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmediastreamer.so.1
+%doc AUTHORS ChangeLog NEWS README help/doc/html
+%attr(755,root,root) %{_libdir}/libmediastreamer_base.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_base.so.3
+%attr(755,root,root) %{_libdir}/libmediastreamer_voip.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_voip.so.3
+%{_pixmapsdir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
 %doc help/doc/html
-%attr(755,root,root) %{_libdir}/libmediastreamer.so
-%{_libdir}/libmediastreamer.la
+%attr(755,root,root) %{_libdir}/libmediastreamer_base.so
+%attr(755,root,root) %{_libdir}/libmediastreamer_voip.so
+%{_libdir}/libmediastreamer_base.la
+%{_libdir}/libmediastreamer_voip.la
 %{_includedir}/mediastreamer2
 %{_pkgconfigdir}/mediastreamer.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libmediastreamer.a
+%{_libdir}/libmediastreamer_base.a
+%{_libdir}/libmediastreamer_voip.a