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

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

Add missing linkage with libdl
Add missing linkage with pthread
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 0ee2419a09f6e8f702378a1f73bd3fe16ff205a5
Merge: 67dc90185753adf03700a62872b0a620ca36a29b af0a0c241b14e899a63335c2820e2114abd715a8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Feb 2 16:56:37 2017 +0000

    merge patched into master

diff --combined debian/.git-dpm
index 32e6b9c,0000000..d487954
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
- a50e6a6ae89cda560282566f8992194809447a85
- a50e6a6ae89cda560282566f8992194809447a85
++af0a0c241b14e899a63335c2820e2114abd715a8
++af0a0c241b14e899a63335c2820e2114abd715a8
 +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/0005-Add-missing-linkage-with-pthread.patch
index 0000000,0000000..a805a4c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Add-missing-linkage-with-pthread.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 531cbeb14ead3c1351b62a669b60c312ce545e77 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Thu, 2 Feb 2017 16:55:19 +0000
++Subject: Add missing linkage with pthread
++
++---
++ CMakeLists.txt | 10 ++++++++++
++ 1 file changed, 10 insertions(+)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index b7742f7..9f69545 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -203,6 +203,16 @@ endif()
++ target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_PNGLIB_CODE=0")
++ target_link_libraries(openshot-audio PNG::PNG)
++ 
+++set(CMAKE_THREAD_PREFER_PTHREAD 1)
+++find_package(Threads REQUIRED)
+++if(NOT TARGET Threads::Threads)
+++        add_library(Threads::Threads INTERFACE IMPORTED)
+++        set_target_properties(Threads::Threads PROPERTIES
+++                INTERFACE_COMPILE_OPTIONS "-pthread"
+++                INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
+++endif()
+++target_link_libraries(openshot-audio Threads::Threads)
+++
++ # PROCESS SUB-DIRECTORIES
++ add_subdirectory(src)
++ 
diff --combined debian/patches/0006-Add-missing-linkage-with-libdl.patch
index 0000000,0000000..5c8c061
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Add-missing-linkage-with-libdl.patch
@@@ -1,0 -1,0 +1,22 @@@
++From af0a0c241b14e899a63335c2820e2114abd715a8 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Thu, 2 Feb 2017 16:56:19 +0000
++Subject: Add missing linkage with libdl
++
++---
++ CMakeLists.txt | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index 9f69545..65cda3c 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -213,6 +213,8 @@ if(NOT TARGET Threads::Threads)
++ endif()
++ target_link_libraries(openshot-audio Threads::Threads)
++ 
+++target_link_libraries(openshot-audio ${CMAKE_DL_LIBS})
+++
++ # PROCESS SUB-DIRECTORIES
++ add_subdirectory(src)
++ 
diff --combined debian/patches/series
index 6b43e00,0000000..a60a74c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,6 @@@
 +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
++0005-Add-missing-linkage-with-pthread.patch
++0006-Add-missing-linkage-with-libdl.patch

-- 
libopenshot-audio packaging