[SCM] libopenshot-audio/master: merge patched into master

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

Use the system libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75b13fe165bd15deaa06eb6e6b30f5547ad279f2
X-Git-Newrev: 1466bf2c1683aef7264ac3976f4024500331d1d1

The following commit has been merged in the master branch:
commit 18e27f8dd13bed7e28da4cd808b37cc6d43384c7
Merge: 75b13fe165bd15deaa06eb6e6b30f5547ad279f2 a50e6a6ae89cda560282566f8992194809447a85
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Feb 2 16:23:03 2017 +0000

    merge patched into master

diff --combined debian/.git-dpm
index 0add42d,0000000..32e6b9c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 4c40115c8b056af0f791bc934d1cdb87ea44fcd7
- 4c40115c8b056af0f791bc934d1cdb87ea44fcd7
++a50e6a6ae89cda560282566f8992194809447a85
++a50e6a6ae89cda560282566f8992194809447a85
 +0d34cefe6b60bc13c1df4508f5575d0a62dd6088
 +0d34cefe6b60bc13c1df4508f5575d0a62dd6088
 +libopenshot-audio_0.1.2+ds1.orig.tar.gz
 +759a00240420f3d115539f5ab2c694f278b1cc2a
 +1820234
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --combined debian/patches/0004-Use-the-system-libraries.patch
index 0000000,0000000..780a787
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Use-the-system-libraries.patch
@@@ -1,0 -1,0 +1,51 @@@
++From a50e6a6ae89cda560282566f8992194809447a85 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Thu, 2 Feb 2017 16:21:52 +0000
++Subject: Use the system libraries
++
++---
++ CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
++ 1 file changed, 31 insertions(+)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index c6c8f54..b7742f7 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -172,6 +172,37 @@ TARGET_LINK_LIBRARIES(openshot-audio
++ 	${JUCE_PLATFORM_SPECIFIC_LIBRARIES}
++ )
++ 
+++find_package(ZLIB REQUIRED)
+++if(NOT TARGET ZLIB::ZLIB)
+++        add_library(ZLIB::ZLIB SHARED IMPORTED)
+++        set_target_properties(ZLIB::ZLIB PROPERTIES
+++                INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}"
+++                IMPORTED_LOCATION "${ZLIB_LIBRARIES}")
+++endif()
+++target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_ZLIB_CODE=0")
+++target_link_libraries(openshot-audio ZLIB::ZLIB)
+++
+++find_package(JPEG REQUIRED)
+++if(NOT TARGET JPEG::JPEG)
+++        add_library(JPEG::JPEG SHARED IMPORTED)
+++        set_target_properties(JPEG::JPEG PROPERTIES
+++                INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}"
+++                IMPORTED_LOCATION "${JPEG_LIBRARIES}")
+++endif()
+++target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_JPEGLIB_CODE=0")
+++target_link_libraries(openshot-audio JPEG::JPEG)
+++
+++find_package(PNG REQUIRED)
+++if(NOT TARGET PNG::PNG)
+++        add_library(PNG::PNG SHARED IMPORTED)
+++        set_target_properties(PNG::PNG PROPERTIES
+++                INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+++                INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
+++                IMPORTED_LOCATION "${PNG_LIBRARIES}")
+++endif()
+++target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_PNGLIB_CODE=0")
+++target_link_libraries(openshot-audio PNG::PNG)
+++
++ # PROCESS SUB-DIRECTORIES
++ add_subdirectory(src)
++ 
diff --combined debian/patches/series
index 17d3f77,0000000..6b43e00
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-use-non-prefixed-zlib-types.patch
 +0002-fix-build-with-libpng16.patch
 +0003-Do-not-use-Linux-only-prctl.patch
++0004-Use-the-system-libraries.patch

-- 
libopenshot-audio packaging