[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.0.0-2-2-gd0ec984

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=695310f

The following commit has been merged in the master branch:
commit 695310f81befd0f6114f97c2ded79f3e89d3b910
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Thu Feb 25 10:19:13 2016 +0100

    * Adopt 02-kfreebsd-ftbfs patch from upstream.
      Closes: #815501
---
 debian/changelog                      |  7 +++++++
 debian/patches/02-kfreebsd-ftbfs.diff | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f446e50..5ea5bd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlt (6.0.0-3) UNRELEASED; urgency=high
+
+  * Adopt 02-kfreebsd-ftbfs patch from upstream.
+    Closes: #815501
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 25 Feb 2016 10:18:17 +0100
+
 mlt (6.0.0-2) unstable; urgency=medium
 
   * Enable all hardening flags except of PIE, which produces a FTBFS.
diff --git a/debian/patches/02-kfreebsd-ftbfs.diff b/debian/patches/02-kfreebsd-ftbfs.diff
index c8467b7..6c78f72 100644
--- a/debian/patches/02-kfreebsd-ftbfs.diff
+++ b/debian/patches/02-kfreebsd-ftbfs.diff
@@ -1,14 +1,25 @@
-Experimental patch to fix a FTBFS on kfreebsd.
+commit d643b4abc14301a888295f74da72678788bae88f
+Author: Dan Dennedy <dan at dennedy.org>
+Date:   Mon Feb 22 13:31:03 2016 -0800
+
+    Fix build on Debian kFreeBSD.
 
 diff --git a/src/modules/plusgpl/consumer_cbrts.c b/src/modules/plusgpl/consumer_cbrts.c
-index 634cb56..563a7f9 100644
+index 634cb56..a69098c 100644
 --- a/src/modules/plusgpl/consumer_cbrts.c
 +++ b/src/modules/plusgpl/consumer_cbrts.c
-@@ -43,6 +43,7 @@
+@@ -38,11 +38,14 @@
+ #include <strings.h>
+ // includes for socket IO
+ #if (_POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE) && (_POSIX_TIMERS > 0)
++#if !(defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+ #define CBRTS_BSD_SOCKETS  1
+ #include <sys/types.h>
  #include <sys/socket.h>
  #include <netdb.h>
  #include <net/if.h>
 +#include <netinet/in.h>
++#endif
  #endif
  #include <sys/time.h>
  #include <time.h>

-- 
MLT multimedia framework packaging