[Demudi-commits] r1066 - in audacity/trunk/debian: . patches

[Free Ekanayaka]

Author: free-guest
Date: 2007-02-12 11:17:16 +0100 (Mon, 12 Feb 2007)
New Revision: 1066

Added:
   audacity/trunk/debian/patches/kfreebsd.patch
Modified:
   audacity/trunk/debian/changelog
   audacity/trunk/debian/control
   audacity/trunk/debian/patches/no_sse_flag.patch
Log:
* FTBFS on GNU/kFreeBSD (Closes: #409260)

Modified: audacity/trunk/debian/changelog
===================================================================
--- audacity/trunk/debian/changelog	2007-02-12 10:16:37 UTC (rev 1065)
+++ audacity/trunk/debian/changelog	2007-02-12 10:17:16 UTC (rev 1066)
@@ -2,8 +2,9 @@
 
   * audacity - FTBFS: error: unrecognized command line option "-msse"
     (Closes: #409255)
+  * FTBFS on GNU/kFreeBSD (Closes: #409260)
 
- -- Free Ekanayaka <freee at debian.org>  Wed,  7 Feb 2007 10:23:35 +0000
+ -- Free Ekanayaka <free at 64studio.com>  Wed,  7 Feb 2007 10:27:34 +0000
 
 audacity (1.3.2-1) unstable; urgency=low
 

Modified: audacity/trunk/debian/control
===================================================================
--- audacity/trunk/debian/control	2007-02-12 10:16:37 UTC (rev 1065)
+++ audacity/trunk/debian/control	2007-02-12 10:17:16 UTC (rev 1066)
@@ -4,7 +4,7 @@
 Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
 Uploaders: Matt Brubeck <mbrubeck at debian.org>, Free Ekanayaka <freee at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: cdbs (>=0.4.4), debhelper (>= 5.0.0), libwxgtk2.6-dev, libvorbis-dev (>=1.0.0-3), libogg-dev (>=1.0.0-1), libmad0-dev, libid3tag0-dev, libsndfile1-dev, gettext, zip, libflac++-dev, libexpat1-dev, libjack-dev, libasound2-dev
+Build-Depends: cdbs (>=0.4.4), debhelper (>= 5.0.0), libwxgtk2.6-dev, libvorbis-dev (>=1.0.0-3), libogg-dev (>=1.0.0-1), libmad0-dev, libid3tag0-dev, libsndfile1-dev, gettext, zip, libflac++-dev, libexpat1-dev, libjack-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 
 Package: audacity
 Architecture: any

Added: audacity/trunk/debian/patches/kfreebsd.patch
===================================================================
--- audacity/trunk/debian/patches/kfreebsd.patch	2007-02-12 10:16:37 UTC (rev 1065)
+++ audacity/trunk/debian/patches/kfreebsd.patch	2007-02-12 10:17:16 UTC (rev 1066)
@@ -0,0 +1,39 @@
+only in patch2:
+unchanged:
+--- lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
++++ lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
+@@ -63,7 +63,7 @@
+ #include <limits.h>
+ #include <semaphore.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # include <sys/soundcard.h>
+ # define DEVICE_NAME_BASE            "/dev/dsp"
+ #elif defined __linux__
+only in patch2:
+unchanged:
+--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
++++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
+@@ -42,7 +42,7 @@
+ 
+ #if defined(__linux__)
+ #include <linux/soundcard.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+only in patch2:
+unchanged:
+--- lib-src/libnyquist/snd/sndconfig.h
++++ lib-src/libnyquist/snd/sndconfig.h
+@@ -60,7 +60,7 @@
+ #elif defined(IRIX)
+   #include "sndirix.h"
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+   #include "sndfreebsd.h"
+ 
+ #elif defined(_WIN32)

Modified: audacity/trunk/debian/patches/no_sse_flag.patch
===================================================================
--- audacity/trunk/debian/patches/no_sse_flag.patch	2007-02-12 10:16:37 UTC (rev 1065)
+++ audacity/trunk/debian/patches/no_sse_flag.patch	2007-02-12 10:17:16 UTC (rev 1066)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-02-06 18:40:29.122955147 +0100
-+++ Makefile.in	2007-02-06 18:40:33.941222659 +0100
+--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig	2007-02-06 18:40:29.122955147 +0100
++++ lib-src/soundtouch/source/SoundTouch/Makefile.in	2007-02-06 18:40:33.941222659 +0100
 @@ -197,7 +197,7 @@
  
  # ??? test for -fcheck-new in configure.ac