[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.6+git20111213-1-8-g347feda
Patrick Matthäi
pmatthaei at alioth.debian.org
Tue Dec 20 18:54:12 UTC 2011
The following commit has been merged in the master branch:
commit 886a1dd3551e1cdc58c866728070fa405fd313b2
Author: Patrick Matthäi <pmatthaei at debian.org>
Date: Tue Dec 20 19:39:59 2011 +0100
* Add patch 03-sys-soundcard to change the include of soundcard.h to
sys/soundcard.h. This fixes a FTBFS on kfreebsd.
Closes: #652059
---
debian/changelog | 5 ++++-
debian/patches/03-sys-soundcard.diff | 15 +++++++++++++++
debian/patches/series | 1 +
3 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee404e0..53e44a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ mlt (0.7.6+git20111213-2) UNRELEASED; urgency=low
* Remove patch 01-hurd-ftbfs, it still applies but was merged by upstream to
a better location in the source code.
* Add patch 04-mltpp-hurd-configure to detect mlt++ module as Linux flavour.
+ * Add patch 03-sys-soundcard to change the include of soundcard.h to
+ sys/soundcard.h. This fixes a FTBFS on kfreebsd.
+ Closes: #652059
- -- Patrick Matthäi <pmatthaei at debian.org> Tue, 20 Dec 2011 19:36:40 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org> Tue, 20 Dec 2011 19:39:08 +0100
mlt (0.7.6+git20111213-1) unstable; urgency=low
diff --git a/debian/patches/03-sys-soundcard.diff b/debian/patches/03-sys-soundcard.diff
new file mode 100644
index 0000000..148fe55
--- /dev/null
+++ b/debian/patches/03-sys-soundcard.diff
@@ -0,0 +1,15 @@
+# Use sys/soundcard.h as include path, so that mlt does not FTBFS on kfreebsd.
+# Closes: #652059
+
+diff -Naur mlt-0.7.6+git20111220.orig/src/modules/rtaudio/RtAudio.cpp mlt-0.7.6+git20111220/src/modules/rtaudio/RtAudio.cpp
+--- mlt-0.7.6+git20111220.orig/src/modules/rtaudio/RtAudio.cpp 2011-12-20 19:07:09.000000000 +0100
++++ mlt-0.7.6+git20111220/src/modules/rtaudio/RtAudio.cpp 2011-12-20 19:29:00.711420362 +0100
+@@ -6373,7 +6373,7 @@
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include "soundcard.h"
++#include "sys/soundcard.h"
+ #include <errno.h>
+ #include <math.h>
+
diff --git a/debian/patches/series b/debian/patches/series
index c0df481..be2af1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
02-hurd-configure.diff
+03-sys-soundcard.diff
04-mltpp-hurd-configure.diff
--
MLT multimedia framework packaging
More information about the pkg-kde-commits
mailing list