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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 68a24cdf7ebaccc82acf7165830571279e1e2c20
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Feb 22 10:32:59 2017 +0100

    * Add patch 03-use-external-libebur and build depend on libebur128-dev to use
      the system version of libebur128.
      Closes: #762341
---
 debian/changelog                            |  8 +++
 debian/control                              |  1 +
 debian/patches/03-use-external-libebur.diff | 94 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 4 files changed, 104 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 378dc92..47cd972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mlt (6.4.1-3) UNRELEASED; urgency=low
+
+  * Add patch 03-use-external-libebur and build depend on libebur128-dev to use
+    the system version of libebur128.
+    Closes: #762341
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 22 Feb 2017 10:21:05 +0100
+
 mlt (6.4.1-2) unstable; urgency=low
 
   * Add upstream patch 01-crash-affine to fix a crash in affine due to relaxed
diff --git a/debian/control b/debian/control
index 1030280..79d8d21 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends: debhelper (>= 9),
  imagemagick,
  frei0r-plugins-dev,
  swig,
+ libebur128-dev (>= 1.2.0-2),
  dh-python,
  python-all-dev (>= 2.6.6-3~)
 Standards-Version: 3.9.8
diff --git a/debian/patches/03-use-external-libebur.diff b/debian/patches/03-use-external-libebur.diff
new file mode 100644
index 0000000..c435ed8
--- /dev/null
+++ b/debian/patches/03-use-external-libebur.diff
@@ -0,0 +1,94 @@
+# Use external libebur128 version.
+
+diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
+index 90067a5..366bca1 100644
+--- a/src/modules/plus/Makefile
++++ b/src/modules/plus/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -I../.. -Iebur128/queue
++CFLAGS += -I../..
+ 
+ LDFLAGS += -L../../framework -lmlt -lm -lpthread
+ 
+@@ -22,14 +22,17 @@ OBJS = consumer_blipflash.o \
+ 	   filter_sepia.o \
+ 	   producer_blipflash.o \
+ 	   producer_count.o \
+-	   transition_affine.o \
+-	   ebur128/ebur128.o
++	   transition_affine.o
+ 
+ ifdef USE_FFTW
+ 	OBJS += filter_dance.o \
+ 	   filter_fft.o
+ endif
+ 
++ifdef USE_INTERNAL_LIBEBUR128
++	OBJS += ebur128/ebur128.o
++endif
++
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+diff --git a/src/modules/plus/configure b/src/modules/plus/configure
+index fbd4980..59662ca 100755
+--- a/src/modules/plus/configure
++++ b/src/modules/plus/configure
+@@ -16,5 +16,18 @@ then
+ 		echo "- fftw not found: disable fft and dance filters"
+ 	fi
+ 
++	pkg-config libebur128
++	if [ $? -eq 0 ]
++	then
++		echo "- libebur128 found: using external libebur128"
++		echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
++		echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
++	else
++		echo "- libebur128 not found: using internal libebur128"
++		echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
++		echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
++		echo "CFLAGS += -Iebur128 -Iebur128/queue" >> config.mak
++	fi
++
+ 	exit 0
+ fi
+diff --git a/src/modules/plus/filter_dynamic_loudness.c b/src/modules/plus/filter_dynamic_loudness.c
+index 07551f1..99c8305 100644
+--- a/src/modules/plus/filter_dynamic_loudness.c
++++ b/src/modules/plus/filter_dynamic_loudness.c
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#include "ebur128/ebur128.h"
++#include <ebur128.h>
+ 
+ typedef struct
+ {
+diff --git a/src/modules/plus/filter_loudness.c b/src/modules/plus/filter_loudness.c
+index 8b74b5c..0614fec 100644
+--- a/src/modules/plus/filter_loudness.c
++++ b/src/modules/plus/filter_loudness.c
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#include "ebur128/ebur128.h"
++#include <ebur128.h>
+ 
+ #define MAX_RESULT_SIZE 512
+ 
+diff --git a/src/modules/plus/filter_loudness_meter.c b/src/modules/plus/filter_loudness_meter.c
+index 9926f94..6c81d19 100644
+--- a/src/modules/plus/filter_loudness_meter.c
++++ b/src/modules/plus/filter_loudness_meter.c
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#include "ebur128/ebur128.h"
++#include <ebur128.h>
+ 
+ typedef struct
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 5a09da5..97d8162 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-crash-affine.diff
 02-crash-clipinfo-update.diff
+03-use-external-libebur.diff

-- 
MLT multimedia framework packaging