[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-3-25-g352771f

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Fri Aug 21 12:38:50 UTC 2009 

The following commit has been merged in the master branch:
commit 676f33d7a492e92929b67efeccdcd4280b2d842a
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Fri Aug 21 14:37:03 2009 +0200

    Add debian/patches/10-kFreeBSD.patch and debian/patches/20-autoconf.patch to fix FTBFS on GNU/kFreeBSD; thanks to Petr Salinger for the patch (Closes: #542765).

diff --git a/debian/patches/10-kFreeBSD.patch b/debian/patches/10-kFreeBSD.patch
new file mode 100644
index 0000000..7260cfc
--- /dev/null
+++ b/debian/patches/10-kFreeBSD.patch
@@ -0,0 +1,78 @@
+only in patch2:
+unchanged:
+--- audacity-1.3.8.orig/lib-src/portmixer/configure.ac
++++ audacity-1.3.8/lib-src/portmixer/configure.ac
+@@ -90,7 +90,10 @@
+ #
+ # Check which APIs are available
+ #
+-AC_CHECK_HEADER(linux/soundcard.h, have_oss=yes, have_oss=no)
++
++have_oss=no
++AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
++
+ AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
+ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+ 
+only in patch2:
+unchanged:
+--- audacity-1.3.8.orig/lib-src/portmixer/src/px_unix_oss.c
++++ audacity-1.3.8/lib-src/portmixer/src/px_unix_oss.c
+@@ -36,14 +36,6 @@
+  *
+  */
+ 
+-#if defined(__linux__)
+-#include <linux/soundcard.h>
+-#elif defined(__FreeBSD__)
+-#include <sys/soundcard.h>
+-#else
+-#include <machine/soundcard.h> /* JH20010905 */
+-#endif
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -53,6 +45,16 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ 
++#if defined(HAVE_SYS_SOUNDCARD_H)
++# include <sys/soundcard.h>
++#elif defined(HAVE_LINUX_SOUNDCARD_H)
++# include <linux/soundcard.h>
++#elif defined(HAVE_MACHINE_SOUNDCARD_H)
++# include <machine/soundcard.h> /* JH20010905 */
++#else
++# error No sound card header file
++#endif
++
+ #include "portaudio.h"
+ #include "pa_unix_oss.h"
+ 
+only in patch2:
+unchanged:
+--- audacity-1.3.8.orig/lib-src/libnyquist/nyquist/sys/unix/switches.h
++++ audacity-1.3.8/lib-src/libnyquist/nyquist/sys/unix/switches.h
+@@ -76,7 +76,7 @@
+   #define CPU_IS_BIG_ENDIAN 1
+  #endif
+ #else
+- #ifdef __linux__
++ #if defined(__linux__) || defined(__GLIBC__)
+   #include <endian.h>
+   #if __BYTE_ORDER == __LITTLE_ENDIAN
+    /* Target processor is little endian. */
+only in patch2:
+unchanged:
+--- audacity-1.3.8.orig/lib-src/libnyquist/nyquist/xlisp/xlisp.h
++++ audacity-1.3.8/lib-src/libnyquist/nyquist/xlisp/xlisp.h
+@@ -143,7 +143,7 @@
+ #endif
+ 
+ /* Linux on Pentium */
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #include <endian.h>
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define XL_LITTLE_ENDIAN
diff --git a/debian/patches/20-autoconf.patch b/debian/patches/20-autoconf.patch
new file mode 100644
index 0000000..90d9588
--- /dev/null
+++ b/debian/patches/20-autoconf.patch
@@ -0,0 +1,159 @@
+Binärdateien debian.git/.git/index and debian.git.new/.git/index sind verschieden.
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/portmixer/configure debian.git.new/lib-src/portmixer/configure
+--- debian.git/lib-src/portmixer/configure	2009-07-17 21:42:23.965690000 +0200
++++ debian.git.new/lib-src/portmixer/configure	2009-08-21 14:13:21.854724943 +0200
+@@ -3611,6 +3611,8 @@
+ #
+ # Check which APIs are available
+ #
++
++have_oss=no
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ 
+ 
+@@ -3684,18 +3686,26 @@
+ done
+ 
+ 
+-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
+-$as_echo_n "checking for linux/soundcard.h... " >&6; }
+-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
++
++
++
++for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
++do
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   $as_echo_n "(cached) " >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
+-$as_echo "$ac_cv_header_linux_soundcard_h" >&6; }
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5
+-$as_echo_n "checking linux/soundcard.h usability... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3703,7 +3713,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <linux/soundcard.h>
++#include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -3736,15 +3746,15 @@
+ $as_echo "$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5
+-$as_echo_n "checking linux/soundcard.h presence... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <linux/soundcard.h>
++#include <$ac_header>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -3778,25 +3788,25 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## --------------------------------------- ##
+ ## Report this to audacity.sourceforge.net ##
+@@ -3805,23 +3815,30 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
+-$as_echo_n "checking for linux/soundcard.h... " >&6; }
+-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_cv_header_linux_soundcard_h=$ac_header_preproc
++  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
+-$as_echo "$ac_cv_header_linux_soundcard_h" >&6; }
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_linux_soundcard_h" = x""yes; then
+-  have_oss=yes
+-else
+-  have_oss=no
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ have_oss=yes
+ fi
+ 
++done
++
+ 
+ if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
+   { $as_echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5

-- 
Audacity debian packaging

More information about the pkg-multimedia-commits mailing list