packages: linphone/linphone.spec, linphone/linphone-nov4l.patch (NEW) - '-j...

[jajcus]

Author: jajcus                       Date: Sat Apr 30 14:40:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- '-j1' removed, this doesn't change anything
- run autotools in subdirectories
- disable Video4Linux1 support – our current linux-libc-headers do not provide
  this API any more

---- Files affected:
packages/linphone:
   linphone.spec (1.56 -> 1.57) , linphone-nov4l.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/linphone/linphone.spec
diff -u packages/linphone/linphone.spec:1.56 packages/linphone/linphone.spec:1.57
--- packages/linphone/linphone.spec:1.56	Sat Apr 30 14:16:07 2011
+++ packages/linphone/linphone.spec	Sat Apr 30 16:40:32 2011
@@ -15,6 +15,7 @@
 # Source0-md5:	66e21f36d62c2094f7b4360262c46f20
 Patch0:		%{name}-chdir.patch
 Patch1:		%{name}-imgdir.patch
+Patch2:		%{name}-nov4l.patch
 URL:		http://www.linphone.org/
 BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	autoconf
@@ -111,28 +112,43 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-# requires .po file fixes
-#%%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd oRTP
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+cd mediastreamer2
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+
 %configure \
 	LIBS="-lXext" \
 	--with-html-dir=%{_gtkdocdir} \
 	--enable-alsa \
+	--disable-strict \
 	--enable-ipv6
-%{__make} -j 1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT%{_pixmapsdir}
 
-%{__make} -j 1 install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install pixmaps/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -199,6 +215,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2011/04/30 14:40:32  jajcus
+- '-j1' removed, this doesn't change anything
+- run autotools in subdirectories
+- disable Video4Linux1 support – our current linux-libc-headers do not provide
+  this API any more
+
 Revision 1.56  2011/04/30 12:16:07  jajcus
 - parallel  make workaround
 

================================================================
Index: packages/linphone/linphone-nov4l.patch
diff -u /dev/null packages/linphone/linphone-nov4l.patch:1.1
--- /dev/null	Sat Apr 30 16:40:37 2011
+++ packages/linphone/linphone-nov4l.patch	Sat Apr 30 16:40:32 2011
@@ -0,0 +1,11 @@
+--- linphone-3.4.3/mediastreamer2/src/Makefile.am~	2011-04-30 16:30:24.987955429 +0200
++++ linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-04-30 16:33:01.948504997 +0200
+@@ -117,7 +117,7 @@
+ endif
+ 
+ if BUILD_V4L
+-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
++libmediastreamer_la_SOURCES+=msv4l2.c
+ endif
+ 
+ if BUILD_WIN32
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.56&r2=1.57&f=u