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

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

Do not use Linux-only prctl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f83fb0eb1d4569cfafbb7ddaaf0081f4699a37a
X-Git-Newrev: 75b13fe165bd15deaa06eb6e6b30f5547ad279f2

The following commit has been merged in the master branch:
commit d320f81741536acb199910c0855975508c499db0
Merge: 1f83fb0eb1d4569cfafbb7ddaaf0081f4699a37a 4c40115c8b056af0f791bc934d1cdb87ea44fcd7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jan 31 00:08:45 2017 +0000

    merge patched into master

diff --combined debian/.git-dpm
index abb93a7,0000000..0add42d
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
- bec2152c777ebcdb6b499bae04dcce16f3765fcb
- bec2152c777ebcdb6b499bae04dcce16f3765fcb
++4c40115c8b056af0f791bc934d1cdb87ea44fcd7
++4c40115c8b056af0f791bc934d1cdb87ea44fcd7
 +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/0003-Do-not-use-Linux-only-prctl.patch
index 0000000,0000000..3781f41
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Do-not-use-Linux-only-prctl.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 4c40115c8b056af0f791bc934d1cdb87ea44fcd7 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Tue, 31 Jan 2017 00:04:59 +0000
++Subject: Do not use Linux-only prctl
++
++---
++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h | 1 -
++ JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h   | 4 ----
++ 2 files changed, 5 deletions(-)
++
++diff --git a/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h b/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
++index 9cd9799..788b908 100644
++--- a/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
+++++ b/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
++@@ -192,7 +192,6 @@
++  #include <net/if.h>
++  #include <sys/sysinfo.h>
++  #include <sys/file.h>
++- #include <sys/prctl.h>
++  #include <signal.h>
++  #include <stddef.h>
++ 
++diff --git a/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h b/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
++index b6fff48..af189e5 100644
++--- a/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
+++++ b/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
++@@ -903,11 +903,7 @@ void JUCE_CALLTYPE Thread::setCurrentThreadName (const String& name)
++         [[NSThread currentThread] setName: juceStringToNS (name)];
++     }
++    #elif JUCE_LINUX
++-    #if (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012
++      pthread_setname_np (pthread_self(), name.toRawUTF8());
++-    #else
++-     prctl (PR_SET_NAME, name.toRawUTF8(), 0, 0, 0);
++-    #endif
++    #endif
++ }
++ 
diff --combined debian/patches/series
index 89a7144,0000000..17d3f77
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-use-non-prefixed-zlib-types.patch
 +0002-fix-build-with-libpng16.patch
++0003-Do-not-use-Linux-only-prctl.patch

-- 
libopenshot-audio packaging