[SCM] openmovieeditor/master: Including <machine/soundcard.h> is tried, while it usually is <sys/soundcard.h>, which is the case on GNU/kFreeBSD. Fixes FTBFS on kfreebsd (Closes: #562256).

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 15 18:32:39 UTC 2010


The following commit has been merged in the master branch:
commit 9d6acff7e437712bb024b30f6b320aad34adcf9b
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 15 19:31:37 2010 +0100

    Including <machine/soundcard.h> is tried, while it usually is <sys/soundcard.h>, which is the case on GNU/kFreeBSD. Fixes FTBFS on kfreebsd (Closes: #562256).

diff --git a/debian/patches/06_kfreebsd_ftbfs.dpatch b/debian/patches/06_kfreebsd_ftbfs.dpatch
new file mode 100755
index 0000000..f3b170f
--- /dev/null
+++ b/debian/patches/06_kfreebsd_ftbfs.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_kfreebsd_ftbfs.dpatch by Alessio Treglia <alessio at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Don't include machine/soundcard.h, use sys/soundcard.h instead.
+## DP: Author: Cyril Brulebois <kibi at debian.org>
+## DP: Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562256
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' openmovieeditor~/src/portaudio/pa_unix_oss.c openmovieeditor/src/portaudio/pa_unix_oss.c
+--- openmovieeditor~/src/portaudio/pa_unix_oss.c	2010-11-15 18:50:09.000000000 +0100
++++ openmovieeditor/src/portaudio/pa_unix_oss.c	2010-11-15 19:28:53.971998216 +0100
+@@ -44,7 +44,7 @@
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+ #else
+-#include <machine/soundcard.h> /* JH20010905 */
++#include <sys/soundcard.h> /* JH20010905 */
+ #endif
+ 
+ 

-- 
openmovieeditor packaging



More information about the pkg-multimedia-commits mailing list