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

[Samuel Mimram]

Author: smimram
Date: 2006-03-21 18:21:47 +0000 (Tue, 21 Mar 2006)
New Revision: 1476

Added:
   linphone/trunk/debian/patches/gcc-4.1.dpatch
Modified:
   linphone/trunk/debian/changelog
   linphone/trunk/debian/patches/00list
   linphone/trunk/debian/rules
Log:
Make linphone build with gcc 4.1.

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2006-03-21 17:44:14 UTC (rev 1475)
+++ linphone/trunk/debian/changelog	2006-03-21 18:21:47 UTC (rev 1476)
@@ -1,9 +1,10 @@
 linphone (1.3.2-1) UNRELEASED; urgency=low
 
-  * NOT YET RELEASED.
-  * New upstream version.
+  * New upstream release.
+  * Enabling video support.
+  * Added gcc-4.1.dpatch in order to compile with gcc 4.1, closes: #358068.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 17 Mar 2006 00:14:13 +0100
+ -- Samuel Mimram <smimram at debian.org>  Tue, 21 Mar 2006 10:46:37 +0000
 
 linphone (1.3.1-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2006-03-21 17:44:14 UTC (rev 1475)
+++ linphone/trunk/debian/patches/00list	2006-03-21 18:21:47 UTC (rev 1476)
@@ -3,3 +3,4 @@
 00mscodec_null_name
 10mscodec_null_strcmp
 link_vorbis
+gcc-4.1

Added: linphone/trunk/debian/patches/gcc-4.1.dpatch
===================================================================
--- linphone/trunk/debian/patches/gcc-4.1.dpatch	2006-03-21 17:44:14 UTC (rev 1475)
+++ linphone/trunk/debian/patches/gcc-4.1.dpatch	2006-03-21 18:21:47 UTC (rev 1476)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc-4.1.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make linphone compile with gcc 4.1.
+
+ at DPATCH@
+diff -urNad linphone-1.3.2~/oRTP/src/sessionset.c linphone-1.3.2/oRTP/src/sessionset.c
+--- linphone-1.3.2~/oRTP/src/sessionset.c	2006-02-01 16:30:04.000000000 +0000
++++ linphone-1.3.2/oRTP/src/sessionset.c	2006-03-21 10:44:44.000000000 +0000
+@@ -60,19 +60,19 @@
+ 
+ int session_set_and(SessionSet *sched_set, int maxs, SessionSet *user_set, SessionSet *result_set)
+ {
+-	uint32_t *mask1,*mask2,*mask3;
++	ortp_fd_set *mask1,*mask2,*mask3;
+ 	int i=0;
+ 	int j,ret=0;
+-	mask1=(uint32_t*)&sched_set->rtpset;
+-	mask2=(uint32_t*)&user_set->rtpset;
+-	mask3=(uint32_t*)&result_set->rtpset;
++	mask1=&sched_set->rtpset;
++	mask2=&user_set->rtpset;
++	mask3=&result_set->rtpset;
+ 	while(i<maxs+1){
+-		*mask3=(*mask1) & (*mask2);	/* computes the AND between the two masks*/
++		*(uint32_t*)mask3=(*(uint32_t*)mask1) & (*(uint32_t*)mask2);	/* computes the AND between the two masks*/
+ 		/* and unset the sessions that have been found from the sched_set */
+-		*mask1=(*mask1) & (~(*mask3));
+-		if ((*mask3)!=0){
++		*(uint32_t*)mask1=(*(uint32_t*)mask1) & (~(*(uint32_t*)mask3));
++		if ((*(uint32_t*)mask3)!=0){
+ 			for (j=0;j<32;j++){
+-				if ( ((*mask3)>>j) & 1){
++				if ( ((*(uint32_t*)mask3)>>j) & 1){
+ 					ret++;
+ 				}
+ 			}


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

Modified: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules	2006-03-21 17:44:14 UTC (rev 1475)
+++ linphone/trunk/debian/rules	2006-03-21 18:21:47 UTC (rev 1476)
@@ -45,8 +45,7 @@
 
 configure-stamp: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-static --sysconfdir=/etc --with-osip=/usr --with-speex=/usr --enable-ipv6
-	#--enable-video
+	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-static --sysconfdir=/etc --with-osip=/usr --with-speex=/usr --enable-ipv6 --enable-video
 	touch configure-stamp
 
 build: patch-stamp build-stamp