[SCM] libopenshot-audio/debian/sid: Build with system libraries.

[ghisvail-guest at users.alioth.debian.org]

The following commit has been merged in the debian/sid branch:
commit 64d42c35ae1c0657cd607f7ce2ecfea052030f23
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jan 19 14:06:24 2016 +0000

    Build with system libraries.

diff --git a/debian/control b/debian/control
index 93dc67b..efcce0f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,16 @@ Priority: optional
 Build-Depends: cmake,
                debhelper (>= 9),
                libasound2-dev,
+               libflac-dev,
                libfreetype6-dev,
+               libjpeg62-dev,
+               libpng-dev,
+               libvorbis-dev,
                libxcursor-dev,
                libxinerama-dev,
-               libxrandr-dev
+               libxrandr-dev,
+               pkg-config,
+               zlib1g-dev
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.6
 Homepage: http://www.openshot.org/
diff --git a/debian/libopenshot-audio3.lintian-overrides b/debian/libopenshot-audio3.lintian-overrides
deleted file mode 100644
index fc0e253..0000000
--- a/debian/libopenshot-audio3.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# This override is present for the upstream OpenShot PPA, where the packaging
-# is using the embedded JUCE code with vendored copies of flac, oggvorbis,
-# libjpeg and libpng.
-embedded-library usr/lib/x86_64-linux-gnu/libopenshot-audio.so.0.0.6: *
diff --git a/debian/patches/Use-non-z-prefixed-zlib-types.patch b/debian/patches/Use-non-z-prefixed-zlib-types.patch
new file mode 100644
index 0000000..0ff05b4
--- /dev/null
+++ b/debian/patches/Use-non-z-prefixed-zlib-types.patch
@@ -0,0 +1,48 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 19 Jan 2016 16:31:57 +0000
+Subject: Use non z-prefixed zlib types.
+
+---
+ .../modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp       | 4 ++--
+ .../modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp      | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
+index f1db2b4..ee4afcf 100644
+--- a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
++++ b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
+@@ -87,8 +87,8 @@ private:
+         {
+             stream.next_in   = const_cast <uint8*> (data);
+             stream.next_out  = buffer;
+-            stream.avail_in  = (z_uInt) dataSize;
+-            stream.avail_out = (z_uInt) sizeof (buffer);
++            stream.avail_in  = (uInt) dataSize;
++            stream.avail_out = (uInt) sizeof (buffer);
+ 
+             const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy)
+                                               : deflate (&stream, flushMode);
+diff --git a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+index 88d49a3..b929580 100644
+--- a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
++++ b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+@@ -126,8 +126,8 @@ public:
+         {
+             stream.next_in  = data;
+             stream.next_out = dest;
+-            stream.avail_in  = (z_uInt) dataSize;
+-            stream.avail_out = (z_uInt) destSize;
++            stream.avail_in  = (uInt) dataSize;
++            stream.avail_out = (uInt) destSize;
+ 
+             switch (inflate (&stream, Z_PARTIAL_FLUSH))
+             {
+@@ -136,7 +136,7 @@ public:
+                 // deliberate fall-through
+             case Z_OK:
+                 data += dataSize - stream.avail_in;
+-                dataSize = (z_uInt) stream.avail_in;
++                dataSize = (uInt) stream.avail_in;
+                 return (int) (destSize - stream.avail_out);
+ 
+             case Z_NEED_DICT:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33e34ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Use-non-z-prefixed-zlib-types.patch
diff --git a/debian/rules b/debian/rules
index cae41f2..7533d6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,29 @@
 # Uncomment this to turn on verbose mode.
 #DH_VERBOSE = 1
 
+# Additional flags to make the embedded copy of JUCE use system libraries.
+FLAC_CFLAGS = -DJUCE_INCLUDE_FLAC_CODE=0 $(shell pkg-config --cflags flac)
+FLAC_LDFLAGS = $(shell pkg-config --libs flac)
+LIBJPEG_CFLAGS = -DJUCE_INCLUDE_JPEGLIB_CODE=0
+LIBJPEG_LDFLAGS = -ljpeg
+LIBPNG_CFLAGS = -DJUCE_INCLUDE_PNGLIB_CODE=0 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
+LIBPNG_LDFLAGS = $(shell pkg-config --libs libpng)
+VORBIS_CFLAGS = -DJUCE_INCLUDE_OGGVORBIS_CODE=0 $(shell pkg-config --cflags vorbis)
+VORBIS_LDFLAGS = $(shell pkg-config --libs vorbis)
+ZLIB_CFLAGS = -DJUCE_INCLUDE_ZLIB_CODE=0 $(shell pkg-config --cflags zlib)
+ZLIB_LDFLAGS = $(shell pkg-config --libs zlib)
+
 # Hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND = -pthread -Wall -pedantic
-export DEB_CXXFLAGS_MAINT_APPEND = -pthread -Wall -pedantic
-export DEB_LDFLAGS_MAINT_APPEND = -lpthread -ldl -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND = $(FLAC_CFLAGS) $(LIBJPEG_CFLAGS) \
+	$(LIBPNG_CFLAGS) $(VORBIS_CFLAGS) $(ZLIB_CFLAGS) \
+	-pthread -Wall -pedantic
+export DEB_CXXFLAGS_MAINT_APPEND = $(FLAC_CFLAGS) $(LIBJPEG_CFLAGS) \
+	$(LIBPNG_CFLAGS) $(VORBIS_CFLAGS) $(ZLIB_CFLAGS) \
+	-pthread -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = $(FLAC_LDFLAGS) $(LIBJPEG_LDFLAGS) \
+	$(LIBPNG_LDFLAGS) $(VORBIS_LDFLAGS) $(ZLIB_LDFLAGS) \
+	-lpthread -ldl -Wl,--as-needed
 
 # Environment information.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

-- 
libopenshot-audio packaging