From d39befdb8eb3adedfa612e232e88ce5daff7fbaf Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 6 Feb 2008 12:14:31 +0000 Subject: [PATCH] Add patches to fix some compile errors. --- linphone-2.1.0-ni_maxhost_hack.patch | 15 +++++++++++++++ linphone-2.1.0-no_werror.patch | 27 +++++++++++++++++++++++++++ linphone.spec | 4 ++++ 3 files changed, 46 insertions(+) create mode 100644 linphone-2.1.0-ni_maxhost_hack.patch create mode 100644 linphone-2.1.0-no_werror.patch diff --git a/linphone-2.1.0-ni_maxhost_hack.patch b/linphone-2.1.0-ni_maxhost_hack.patch new file mode 100644 index 0000000..41d33eb --- /dev/null +++ b/linphone-2.1.0-ni_maxhost_hack.patch @@ -0,0 +1,15 @@ +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 + #endif + ++#ifndef NI_MAXHOST ++#define NI_MAXHOST 1025 ++#endif ++ + #include "mediastreamer2/ice.h" + #include "mediastreamer2/mscommon.h" + diff --git a/linphone-2.1.0-no_werror.patch b/linphone-2.1.0-no_werror.patch new file mode 100644 index 0000000..6498e47 --- /dev/null +++ b/linphone-2.1.0-no_werror.patch @@ -0,0 +1,27 @@ +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 diff --git a/linphone.spec b/linphone.spec index 330ad30..f76f422 100644 --- a/linphone.spec +++ b/linphone.spec @@ -9,6 +9,8 @@ URL: http://www.linphone.org/ 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-novideo.patch +Patch2: linphone-2.1.0-ni_maxhost_hack.patch +Patch3: linphone-2.1.0-no_werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libosip2-devel >= 3.0.3-2 @@ -66,6 +68,8 @@ Libraries and headers required to develop software with linphone. %setup0 -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 #pushd share/cs #for f in *.1