rpms/linphone/F-8 linphone-2.1.0-imagedir.patch, NONE, 1.1 linphone-2.1.0-ni_maxhost_hack.patch, NONE, 1.1 linphone-2.1.0-no_werror.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 linphone.spec, 1.34, 1.35 sources, 1.9, 1.10 linphone-1.0.1-desktop.patch, 1.2, NONE linphone-1.4.1-libs.patch, 1.1, NONE linphone-1.5.1-osipcompat.patch, 1.1, NONE linphone-1.7.1-extgsm.patch, 1.1, NONE linphone-1.7.1-gtkosip.patch, 1.1, NONE linphone-1.7.1-imagedir.patch, 1.1, NONE linphone-1.7.1-ortpm4.patch, 1.1, NONE

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Fri Feb 15 04:50:26 UTC 2008 

Author: jcollie

Update of /cvs/pkgs/rpms/linphone/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16368

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-2.1.0-imagedir.patch 
	linphone-2.1.0-ni_maxhost_hack.patch 
	linphone-2.1.0-no_werror.patch 
Removed Files:
	linphone-1.0.1-desktop.patch linphone-1.4.1-libs.patch 
	linphone-1.5.1-osipcompat.patch linphone-1.7.1-extgsm.patch 
	linphone-1.7.1-gtkosip.patch linphone-1.7.1-imagedir.patch 
	linphone-1.7.1-ortpm4.patch 
Log Message:
Update to 2.1.1

linphone-2.1.0-imagedir.patch:

--- NEW FILE linphone-2.1.0-imagedir.patch ---
>From da74486ae265d7736032e4e51602d54449de11b0 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 17 Apr 2007 15:27:06 -0500
Subject: [PATCH] Move nowebcam image to subdir.

---
 mediastreamer2/src/Makefile.am |    2 +-
 mediastreamer2/src/nowebcam.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mediastreamer2/src/Makefile.am b/mediastreamer2/src/Makefile.am
index 9c9050c..8717329 100644
--- a/mediastreamer2/src/Makefile.am
+++ b/mediastreamer2/src/Makefile.am
@@ -121,7 +121,7 @@ if BUILD_VIDEO
 AM_CFLAGS+=$(VIDEO_CFLAGS)
 endif
 
-imgdir=$(datadir)/images/
+imgdir=$(datadir)/images/linphone/
 
 img_DATA=nowebcamCIF.jpg
 
diff --git a/mediastreamer2/src/nowebcam.c b/mediastreamer2/src/nowebcam.c
index 1c694f9..f8eaaf9 100644
--- a/mediastreamer2/src/nowebcam.c
+++ b/mediastreamer2/src/nowebcam.c
@@ -85,8 +85,8 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
 mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
 	char tmp[256];
 	if (idx<0)
-		snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
+		snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
 	else
-		snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
+		snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
 	return ms_load_jpeg_as_yuv(tmp,reqsize);
 }
-- 
1.5.3.8


linphone-2.1.0-ni_maxhost_hack.patch:

--- NEW FILE linphone-2.1.0-ni_maxhost_hack.patch ---
diff --git a/mediastreamer2/src/ice.c b/mediastreamer2/src/ice.c
index c4296c0..615c7ab 100644
--- a/mediastreamer2/src/ice.c
+++ b/mediastreamer2/src/ice.c
@@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <netdb.h>
 #endif
 
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+
 #include "mediastreamer2/ice.h"
 #include "mediastreamer2/mscommon.h"
 

linphone-2.1.0-no_werror.patch:

--- NEW FILE linphone-2.1.0-no_werror.patch ---
diff --git a/configure.in b/configure.in
index 3cb7bf7..307679b 100644
--- a/configure.in
+++ b/configure.in
@@ -275,7 +275,6 @@ AC_ARG_ENABLE(strict,
 
 if test "$GCC$strictness" = "yesyes" ; then
 	STRICT_OPTIONS="-Wall -Wp,-D_FORTIFY_SOURCE=2"
-	STRICT_OPTIONS="$STRICT_OPTIONS -Werror"
 	CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 
diff --git a/mediastreamer2/configure.ac b/mediastreamer2/configure.ac
index f663b56..18c1e30 100644
--- a/mediastreamer2/configure.ac
+++ b/mediastreamer2/configure.ac
@@ -109,10 +109,6 @@ if test x$ac_cv_c_bigendian = xyes ; then
 	CFLAGS="$CFLAGS -D_BIGENDIAN "
 fi
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 macosx_found=no
 
 dnl add thread flags


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linphone/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Apr 2007 16:36:34 -0000	1.9
+++ .cvsignore	15 Feb 2008 04:49:47 -0000	1.10
@@ -1 +1 @@
-linphone-1.7.1.tar.gz
+linphone-2.1.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linphone/F-8/linphone.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linphone.spec	29 Aug 2007 05:33:06 -0000	1.34
+++ linphone.spec	15 Feb 2008 04:49:47 -0000	1.35
@@ -1,20 +1,20 @@
 Name:           linphone
-Version:        1.7.1
-Release:        4%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://www.linphone.org/
-Source0:        http://download.savannah.nongnu.org/releases/linphone/1.7.x/sources/%{name}-%{version}.tar.gz
-Patch0:         linphone-1.7.1-ortpm4.patch
-Patch1:         linphone-1.7.1-imagedir.patch
-Patch2:         linphone-1.7.1-gtkosip.patch
-Patch3:         linphone-1.7.1-extgsm.patch
+Source0:        http://download.savannah.nongnu.org/releases/linphone/2.1.x/sources/%{name}-%{version}.tar.gz
+Patch0:         linphone-2.1.0-imagedir.patch
+Patch1:		linphone-2.1.0-ni_maxhost_hack.patch
+Patch2:		linphone-2.1.0-no_werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  compat-libosip2-devel
-BuildRequires:  ortp-devel >= 0.13.1
+BuildRequires:  libosip2-devel >= 3.1.0
+BuildRequires:  libeXosip2-devel >= 3.1.0
+BuildRequires:  ortp-devel >= 0.14.2
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -37,7 +37,7 @@
 BuildRequires:  intltool
 BuildRequires:  gettext
 
-BuildRequires:  popt-devel
+#BuildRequires:  popt-devel
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -65,17 +65,16 @@
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .ortpm4
-%patch1 -p1 -b .imagedir
-%patch2 -p1 -b .gtkosip
-%patch3 -p1 -b .extgsm
-
-pushd share/cs
-for f in *.1
-do
-        /usr/bin/iconv --from-code iso-8859-2 --to-code utf-8 --output $f.new $f && sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new && mv $f.new $f
-done
-popd
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+#pushd share/cs
+#for f in *.1
+#do
+#        /usr/bin/iconv --from-code iso-8859-2 --to-code utf-8 --output $f.new $f && sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new && mv $f.new $f
+#done
+#popd
 
 %build
 
@@ -88,13 +87,23 @@
 
 pushd mediastreamer2
 libtoolize --copy --force
-aclocal -I m4
+aclocal -I ../m4
 autoheader
 automake --force-missing --add-missing --copy
 autoconf
 popd
 
-%configure --disable-static --disable-rpath --disable-video --enable-alsa --enable-strict --enable-external-ortp --with-osip-version=2.2.2 --enable-external-gsm
+%configure --disable-static \
+	   --disable-rpath \
+	   --enable-console_ui=yes \
+	   --enable-gtk_ui=yes \
+	   --enable-ipv6 \
+	   --enable-truespeech \
+	   --disable-video \
+	   --enable-alsa \
+	   --enable-strict \
+	   --enable-external-ortp
+
 make %{?_smp_mflags}
 
 %install
@@ -125,7 +134,6 @@
 %{_bindir}/*
 %{_libdir}/liblinphone.so.*
 %{_libdir}/libmediastreamer.so.*
-%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*
@@ -142,10 +150,15 @@
 %{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
 %{_libdir}/libmediastreamer.so
-%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Feb 14 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.1-1
+- Update to 2.1.1
+
+* Fri Feb  1 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.0-1
+- Update to 2.1.0
+
 * Wed Aug 29 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.1-4
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linphone/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Apr 2007 16:36:34 -0000	1.9
+++ sources	15 Feb 2008 04:49:47 -0000	1.10
@@ -1 +1 @@
-6fe246d072fad2f4a9533317ab7e9060  linphone-1.7.1.tar.gz
+130fb6048f84ee89f7c1a8a010ff1add  linphone-2.1.1.tar.gz


--- linphone-1.0.1-desktop.patch DELETED ---


--- linphone-1.4.1-libs.patch DELETED ---


--- linphone-1.5.1-osipcompat.patch DELETED ---


--- linphone-1.7.1-extgsm.patch DELETED ---


--- linphone-1.7.1-gtkosip.patch DELETED ---


--- linphone-1.7.1-imagedir.patch DELETED ---


--- linphone-1.7.1-ortpm4.patch DELETED ---

More information about the fedora-extras-commits mailing list