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

[kilian at alioth.debian.org]

Author: kilian
Date: Sun Jul  3 09:02:49 2011
New Revision: 9095

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

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=9095&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun Jul  3 09:02:49 2011
@@ -25,9 +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
-  * Patch spandsp_autoconf_cppflags backported from upstream 3.10.2
-
- -- Kilian Krause <kilian at debian.org>  Sun, 03 Jul 2011 10:21:00 +0200
+  * Patch spandsp_autoconf_cppflags backported from upstream trunk
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 03 Jul 2011 11:02:16 +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=9095&op=diff
==============================================================================
--- opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch (original)
+++ opal/trunk/debian/patches/spandsp_autoconf_cppflags.patch Sun Jul  3 09:02:49 2011
@@ -1,21 +1,28 @@
 Description: SpanDSP needs stdint.h
-Author: Robert Jongbloed / Craig Southeren
+Author: Craig Southeren
 
-backported from upstream revision 26087
+backported from upstream revision 26035 (trunk) - somewhat shortened
 --- a/opal.m4
 +++ b/opal.m4
-@@ -917,7 +917,7 @@
+@@ -915,11 +915,14 @@ AC_DEFUN([OPAL_FIND_SPANDSP],
+               ],
+               [opal_spandsp=no])
            LIBS=$saved_LIBS
++          saved_CXXFLAGS=$CXXFLAGS
++          CXXFLAGS="$CXXFLAGS -D__STDC_LIMIT_MACROS"
            if test "x${opal_spandsp}" = "xyes"; then
                SPANDSP_LIBS="-lspandsp"
 -              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])[]
++          CXXFLAGS=$saved_CXXFLAGS
           ])
---- a/plugins/configure   (revision 26086)
-+++ b/plugins/configure   (revision 26087)
-@@ -2342,6 +2342,37 @@
+ 
+ 
+--- a/plugins/configure
++++ b/plugins/configure
+@@ -2342,6 +2342,37 @@ fi
    eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  
  } # ac_fn_c_check_header_mongrel
@@ -45,7 +52,7 @@
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +eval ac_res=\$$3
-+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 +
@@ -53,7 +60,13 @@
  cat >config.log <<_ACEOF
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
-@@ -10091,7 +10122,8 @@
+@@ -10087,11 +10118,14 @@ else
+ fi
+ 
+           LIBS=$saved_LIBS
++          saved_CXXFLAGS=$CXXFLAGS
++          CXXFLAGS="$CXXFLAGS -D__STDC_LIMIT_MACROS"
+           if test "x${opal_spandsp}" = "xyes"; then
                SPANDSP_LIBS="-lspandsp"
                for ac_header in spandsp.h
  do :
@@ -63,4 +76,11 @@
  if test "x$ac_cv_header_spandsp_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SPANDSP_H 1
-
+@@ -10109,6 +10143,7 @@ done
+ else
+   HAVE_SPANDSP=no
+ fi
++          CXXFLAGS=$saved_CXXFLAGS
+ 
+   fi
+ else