Hello community,
here is the log from the commit of package linphone for openSUSE:Factory
checked in at Tue Jul 19 14:31:27 CEST 2011.
--------
--- linphone/linphone.changes 2011-01-16 15:17:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/linphone/linphone.changes 2011-07-12 15:08:31.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Jul 12 13:08:05 UTC 2011 - cwh@novell.com
+
+- fixing 11.4 build
+
+-------------------------------------------------------------------
+Thu Jul 7 09:54:38 UTC 2011 - idonmez@novell.com
+
+- Add linphone-v4l-2.6.38.patch: use new v4l interface
+
+-------------------------------------------------------------------
+Mon Feb 14 19:49:23 CET 2011 - sbrabec@suse.cz
+
+- Added support for translation-update-upstream.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
linphone-v4l-2.6.38.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linphone.spec ++++++
--- /var/tmp/diff_new_pack.xPIFmO/_old 2011-07-19 14:30:50.000000000 +0200
+++ /var/tmp/diff_new_pack.xPIFmO/_new 2011-07-19 14:30:50.000000000 +0200
@@ -19,7 +19,7 @@
Name: linphone
Version: 3.3.2
-Release: 3
+Release: 99
License: GPLv2+
Summary: Web Phone
Url: http://www.linphone.org
@@ -28,17 +28,23 @@
Source1: %{name}-manual.tar.bz2
Source99: history-orange.png
Patch1: linphone-3.3.x-20100903.diff.bz2
+Patch2: linphone-v4l-2.6.38.patch
BuildRequires: gcc-c++
BuildRequires: gnome-panel-devel
BuildRequires: gnutls-devel
BuildRequires: intltool
BuildRequires: libeXosip2-devel
BuildRequires: libosip2-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires: libv4l-devel >= 0.8.4
+%else
BuildRequires: libv4l-devel
+%endif
BuildRequires: perl-XML-Parser
BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: readline-devel
BuildRequires: speex-devel
+BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#NoSource: 0
@@ -87,18 +93,27 @@
%prep
%setup -q
+# This patch represents upstream, call translation-update-upstream after it:
%patch1 -p1
+%if 0%{?suse_version} >= 1210
+%patch2
+%endif
# patch cannot handle binaries
cp %{S:99} pixmaps/history-orange.png
+translation-update-upstream
find -name "CVS" -type d | xargs rm -rfv
%build
+%if 0%{?suse_version} >= 1140
+autoreconf -fi
+%endif
# needed for linphone-1.3.0:
export CFLAGS="%{optflags} -fno-strict-aliasing"
%configure\
--libexecdir=%{_prefix}/lib/gnome-panel\
--disable-static \
- --disable-video
+ --disable-video \
+ --disable-strict
make %{?_smp_mflags}
%install
@@ -138,6 +153,8 @@
%{_datadir}/images/nowebcamCIF.jpg
%{_datadir}/applications/linphone.desktop
%dir %{_datadir}/images
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
%files applet
%defattr(-,root,root)
++++++ linphone-v4l-2.6.38.patch ++++++
--- mediastreamer2/configure.ac 2010-06-18 09:55:26.000000000 +0200
+++ mediastreamer2configure.ac 2011-07-07 11:53:29.595089325 +0200
@@ -567,8 +567,8 @@
AC_SUBST(PACKAGE_DATA_DIR)
dnl check for video4linux headers
-AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
-if test "${ac_cv_header_linux_videodev_h}" = "yes" || \
+AC_CHECK_HEADERS(libv4l1-videodev.h linux/videodev2.h)
+if test "${ac_cv_header_libv4l1_videodev_h}" = "yes" || \
test "${ac_cv_header_linux_videodev2_h}" = "yes" ; then
found_v4l=yes
else
--- mediastreamer2/src/msv4l.c 2010-06-02 14:33:57.000000000 +0200
+++ mediastreamer2/src/msv4l.c 2011-07-07 11:54:02.283089301 +0200
@@ -30,7 +30,7 @@
#include