[Pkg-voip-commits] r5143 - in /srtp/trunk/debian: changelog patches/1003_fix_mips_namespace_collision.patch patches/series

[js at alioth.debian.org]

Author: js
Date: Sat Dec 29 17:35:56 2007
New Revision: 5143

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5143
Log:
* Add patch 1003 to avoid the symbol "mips" clashing with builtin
  symbol on MIPS GCC compiler. Closes: bug#439976.

Added:
    srtp/trunk/debian/patches/1003_fix_mips_namespace_collision.patch
Modified:
    srtp/trunk/debian/changelog
    srtp/trunk/debian/patches/series

Modified: srtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk/debian/changelog?rev=5143&op=diff
==============================================================================
--- srtp/trunk/debian/changelog (original)
+++ srtp/trunk/debian/changelog Sat Dec 29 17:35:56 2007
@@ -1,3 +1,10 @@
+srtp (1.4.4~dfsg-2) UNRELEASED; urgency=low
+
+  * Add patch 1003 to avoid the symbol "mips" clashing with builtin
+    symbol on MIPS GCC compiler. Closes: bug#439976.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 29 Dec 2007 18:02:07 +0100
+
 srtp (1.4.4~dfsg-1) unstable; urgency=low
 
   * New upstream release.

Added: srtp/trunk/debian/patches/1003_fix_mips_namespace_collision.patch
URL: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk/debian/patches/1003_fix_mips_namespace_collision.patch?rev=5143&op=file
==============================================================================
--- srtp/trunk/debian/patches/1003_fix_mips_namespace_collision.patch (added)
+++ srtp/trunk/debian/patches/1003_fix_mips_namespace_collision.patch Sat Dec 29 17:35:56 2007
@@ -1,0 +1,54 @@
+--- srtp-1.4.2.dfsg/test/srtp_driver.c.old	2007-11-03 22:46:45.000000000 +0000
++++ srtp-1.4.2.dfsg/test/srtp_driver.c	2007-11-03 22:47:35.000000000 +0000
+@@ -314,7 +314,7 @@ main (int argc, char *argv[]) {
+   if (do_codec_timing) {
+     srtp_policy_t policy;
+     int ignore;
+-    double mips = mips_estimate(1000000000, &ignore);
++    double mips_est = mips_estimate(1000000000, &ignore);
+ 
+     crypto_policy_set_rtp_default(&policy.rtp);
+     crypto_policy_set_rtcp_default(&policy.rtcp);
+@@ -323,33 +323,33 @@ main (int argc, char *argv[]) {
+     policy.key  = test_key;
+     policy.next = NULL;
+ 
+-    printf("mips estimate: %e\n", mips);
++    printf("mips estimate: %e\n", mips_est);
+ 
+     printf("testing srtp processing time for voice codecs:\n");
+     printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n");
+     printf("G.711\t\t%d\t\t\t%e\n", 80, 
+-           (double) mips * (80 * 8) / 
++           (double) mips_est * (80 * 8) / 
+ 	   srtp_bits_per_second(80, &policy) / .01 );
+     printf("G.711\t\t%d\t\t\t%e\n", 160, 
+-           (double) mips * (160 * 8) / 
++           (double) mips_est * (160 * 8) / 
+ 	   srtp_bits_per_second(160, &policy) / .02);
+     printf("G.726-32\t%d\t\t\t%e\n", 40, 
+-           (double) mips * (40 * 8) / 
++           (double) mips_est * (40 * 8) / 
+ 	   srtp_bits_per_second(40, &policy) / .01 );
+     printf("G.726-32\t%d\t\t\t%e\n", 80, 
+-           (double) mips * (80 * 8) / 
++           (double) mips_est * (80 * 8) / 
+ 	   srtp_bits_per_second(80, &policy) / .02);
+     printf("G.729\t\t%d\t\t\t%e\n", 10, 
+-           (double) mips * (10 * 8) / 
++           (double) mips_est * (10 * 8) / 
+ 	   srtp_bits_per_second(10, &policy) / .01 );
+     printf("G.729\t\t%d\t\t\t%e\n", 20, 
+-           (double) mips * (20 * 8) /
++           (double) mips_est * (20 * 8) /
+ 	   srtp_bits_per_second(20, &policy) / .02 );
+     printf("Wideband\t%d\t\t\t%e\n", 320, 
+-           (double) mips * (320 * 8) /
++           (double) mips_est * (320 * 8) /
+ 	   srtp_bits_per_second(320, &policy) / .01 );
+     printf("Wideband\t%d\t\t\t%e\n", 640, 
+-           (double) mips * (640 * 8) /
++           (double) mips_est * (640 * 8) /
+ 	   srtp_bits_per_second(640, &policy) / .02 );
+   }
+ 

Modified: srtp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk/debian/patches/series?rev=5143&op=diff
==============================================================================
--- srtp/trunk/debian/patches/series (original)
+++ srtp/trunk/debian/patches/series Sat Dec 29 17:35:56 2007
@@ -1,2 +1,3 @@
 #1001_negative_valued_char_must_be_signed.patch
 1002_add_explicit_path_in_test_script.patch
+1003_fix_mips_namespace_collision.patch