[Pkg-voip-commits] r2452 - in linphone/trunk/debian: . patches

[Samuel Mimram]

Author: smimram
Date: 2006-09-30 18:23:09 +0000 (Sat, 30 Sep 2006)
New Revision: 2452

Added:
   linphone/trunk/debian/patches/ice.dpatch
   linphone/trunk/debian/patches/stun_sparc.dpatch
Modified:
   linphone/trunk/debian/changelog
   linphone/trunk/debian/patches/00list
Log:
Fix the FTBFS.

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2006-09-29 12:27:10 UTC (rev 2451)
+++ linphone/trunk/debian/changelog	2006-09-30 18:23:09 UTC (rev 2452)
@@ -1,3 +1,10 @@
+linphone (1.4.1-2) unstable; urgency=low
+
+  * Added ice.dpatch to fix the FTBFS on amd64 (thanks Jérémy Bobio)
+    and stun_sparc.dpatch to fix the FTBFS on sparc, closes: #390009.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 30 Sep 2006 17:16:37 +0000
+
 linphone (1.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2006-09-29 12:27:10 UTC (rev 2451)
+++ linphone/trunk/debian/patches/00list	2006-09-30 18:23:09 UTC (rev 2452)
@@ -1,2 +1,4 @@
 desktop_icon
 gnome_applet_dir
+ice
+stun_sparc

Added: linphone/trunk/debian/patches/ice.dpatch
===================================================================
--- linphone/trunk/debian/patches/ice.dpatch	                        (rev 0)
+++ linphone/trunk/debian/patches/ice.dpatch	2006-09-30 18:23:09 UTC (rev 2452)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ice.dpatch by Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct type for addr_len. See #390009.
+
+ at DPATCH@
+diff -urNad linphone-1.4.1~/mediastreamer2/src/ice.c linphone-1.4.1/mediastreamer2/src/ice.c
+--- linphone-1.4.1~/mediastreamer2/src/ice.c	2006-08-22 14:34:26.000000000 +0000
++++ linphone-1.4.1/mediastreamer2/src/ice.c	2006-09-30 10:35:29.000000000 +0000
+@@ -173,7 +173,7 @@
+   int err, tmp;
+   int sock;
+   struct sockaddr_storage addr;
+-  size_t addr_len;
++  socklen_t addr_len;
+ 
+   strcpy (loc, "127.0.0.1");    /* always fallback to local loopback */
+ 


Property changes on: linphone/trunk/debian/patches/ice.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: linphone/trunk/debian/patches/stun_sparc.dpatch
===================================================================
--- linphone/trunk/debian/patches/stun_sparc.dpatch	                        (rev 0)
+++ linphone/trunk/debian/patches/stun_sparc.dpatch	2006-09-30 18:23:09 UTC (rev 2452)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stun_sparc.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't use code for SUN on linux sparcs. See #390009.
+
+ at DPATCH@
+diff -urNad linphone-1.4.1~/oRTP/src/stun.c linphone-1.4.1/oRTP/src/stun.c
+--- linphone-1.4.1~/oRTP/src/stun.c	2006-09-12 19:21:29.000000000 +0000
++++ linphone-1.4.1/oRTP/src/stun.c	2006-09-30 17:13:06.000000000 +0000
+@@ -758,7 +758,7 @@
+       asm("rdtsc" : "=A" (tick));
+ #elif defined(__GNUC__) && defined(__amd64__)
+       asm("rdtsc" : "=A" (tick));
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )	
++#elif defined (__SUNPRO_CC) && defined( __sparc__ )	
+       tick = gethrtime();
+ #elif defined(__MACH__) 
+       {


Property changes on: linphone/trunk/debian/patches/stun_sparc.dpatch
___________________________________________________________________
Name: svn:executable
   + *