[Pkg-voip-commits] r9093 - in /opal/trunk/debian: changelog patches/spandsp_autoconf_cppflags.patch

[kilian at alioth.debian.org]

Author: kilian
Date: Sun Jul  3 08:21:32 2011
New Revision: 9093

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9093
Log:
Patch spandsp_autoconf_cppflags backported from upstream 3.10.2

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=9093&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun Jul  3 08:21:32 2011
@@ -25,11 +25,9 @@
     g++ versions emit a bit different symbol sets so ftbfs'es happen)
   * Add libavcodec-dev to enable H.263
   * Register API documentation with doc-base
-
-  [ Tzafrir Cohen ]
-  * Patch spandsp_autoconf_cppflags: fix detection of spandsp
-
- -- Kilian Krause <kilian at debian.org>  Fri, 01 Jul 2011 20:31:21 +0200
+  * Patch spandsp_autoconf_cppflags backported from upstream 3.10.2
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 03 Jul 2011 10:21:00 +0200
 
 opal (3.8.4~dfsg-1) experimental; urgency=low
 

Modified: opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch?rev=9093&op=diff
==============================================================================
--- opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch (original)
+++ opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch Sun Jul  3 08:21:32 2011
@@ -1,18 +1,16 @@
-Description: SpanDSP needs __STDC_LIMIT_MACROS define
-Author: Tzafrir Cohen <tzafrir at debian.org>
+Description: SpanDSP needs stdint.h
+Author: Robert Jongbloed / Craig Southeren
 
-SpanDSP needs __STDC_LIMIT_MACROS defined. Add it in autoconf.
-
+backported from upstream revision 26087
 --- a/opal.m4
 +++ b/opal.m4
-@@ -917,7 +917,10 @@ AC_DEFUN([OPAL_FIND_SPANDSP],
+@@ -917,7 +917,7 @@
            LIBS=$saved_LIBS
            if test "x${opal_spandsp}" = "xyes"; then
                SPANDSP_LIBS="-lspandsp"
-+	      spandsp_saved_CPPFLAGS="$CFLAGS"
-+	      CPPFLAGS="$CPPFLAGS -D__STDC_LIMIT_MACROS"
-               AC_CHECK_HEADERS([spandsp.h], [opal_spandsp=yes], [opal_spandsp=no])
-+	      CPPFLAGS="$spandsp_saved_CPPFLAGS"
+-              AC_CHECK_HEADERS([spandsp.h], [opal_spandsp=yes], [opal_spandsp=no])
++              AC_CHECK_HEADERS([spandsp.h], [opal_spandsp=yes], [opal_spandsp=no], [#include <stdint.h>])
            fi
            AS_IF([test AS_VAR_GET([opal_spandsp]) = yes], [$1], [$2])[]
           ])
+