[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.6+git20111220-1-2-gd086dff

[Patrick Matthäi]

The following commit has been merged in the master branch:
commit d821c70af2b5a45be4375ed2587c1608c16ea9de
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Thu Dec 22 18:25:03 2011 +0100

    * New upstream git snapshot.
      - Removed all patches, they have been merged in this snapshot.
      - Do not build with RtAudio on hurd and kfreebsd, to avoid FTBFS.
---
 debian/changelog                            |    8 ++++++++
 debian/patches/02-hurd-configure.diff       |   14 --------------
 debian/patches/03-sys-soundcard.diff        |   15 ---------------
 debian/patches/04-mltpp-hurd-configure.diff |   14 --------------
 debian/patches/series                       |    3 ---
 5 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 631071f..b6ca6eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mlt (0.7.6+git20111221-1) UNRELEASED; urgency=low
+
+  * New upstream git snapshot.
+    - Removed all patches, they have been merged in this snapshot.
+    - Do not build with RtAudio on hurd and kfreebsd, to avoid FTBFS.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 22 Dec 2011 18:23:59 +0100
+
 mlt (0.7.6+git20111220-1) unstable; urgency=low
 
   * New upstream git snapshot.
diff --git a/debian/patches/02-hurd-configure.diff b/debian/patches/02-hurd-configure.diff
deleted file mode 100644
index 358579b..0000000
--- a/debian/patches/02-hurd-configure.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Also detect hurd-i386 as Linux flavour.
-
-diff -Naur mlt-0.7.6+git20111213.orig/configure mlt-0.7.6+git20111213/configure
---- mlt-0.7.6+git20111213.orig/configure	2011-12-13 19:28:26.639956316 +0100
-+++ mlt-0.7.6+git20111213/configure	2011-12-13 19:40:41.200797535 +0100
-@@ -88,7 +88,7 @@
- 		echo "SHFLAGS=-dynamiclib"
- 		echo "LDFLAGS+=`sdl-config --libs`"
- 		;;
--		Linux|GNU/kFreeBSD)
-+		Linux|GNU/kFreeBSD|GNU)
- 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
- 		[ "$optimisations" = "true" ] &&
- 			echo "OPTIMISATIONS+=-ffast-math"
diff --git a/debian/patches/03-sys-soundcard.diff b/debian/patches/03-sys-soundcard.diff
deleted file mode 100644
index 148fe55..0000000
--- a/debian/patches/03-sys-soundcard.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/04-mltpp-hurd-configure.diff b/debian/patches/04-mltpp-hurd-configure.diff
deleted file mode 100644
index a47555f..0000000
--- a/debian/patches/04-mltpp-hurd-configure.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Use the same targetos for hurd as for Linux.
-
-diff -Naur mlt-0.7.6+git20111220.orig/src/mlt++/configure mlt-0.7.6+git20111220/src/mlt++/configure
---- mlt-0.7.6+git20111220.orig/src/mlt++/configure	2011-05-26 18:34:35.000000000 +0200
-+++ mlt-0.7.6+git20111220/src/mlt++/configure	2011-12-20 19:33:25.195427389 +0100
-@@ -10,7 +10,7 @@
- 		echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC"
- 		echo "LIBFLAGS=-dynamiclib -single_module"
- 		;;
--	Linux|FreeBSD|NetBSD|GNU/kFreeBSD)
-+	Linux|FreeBSD|NetBSD|GNU/kFreeBSD|GNU)
- 		echo LIBSUF=.so
- 		echo "CXXFLAGS+=-Wall $WARNINGS -fPIC -DPIC"
- 		echo "LIBFLAGS=-shared"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index be2af1f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-02-hurd-configure.diff
-03-sys-soundcard.diff
-04-mltpp-hurd-configure.diff

-- 
MLT multimedia framework packaging