[SCM] zam-plugins/master: Add patch for istalling on Hurd and kfreebsd (Closes: #820150).
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Jun 20 09:26:07 UTC 2016
The following commit has been merged in the master branch:
commit a51d83bd643946b293ca07142a07b1a6db8456b0
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Jun 20 11:20:05 2016 +0200
Add patch for istalling on Hurd and kfreebsd (Closes: #820150).
diff --git a/debian/patches/0020-nonlinux.patch b/debian/patches/0020-nonlinux.patch
new file mode 100644
index 0000000..423f660
--- /dev/null
+++ b/debian/patches/0020-nonlinux.patch
@@ -0,0 +1,48 @@
+Date: Tue, 05 Apr 2016 21:37:17 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: distrho: support GNU platforms other than Linux
+
+Treat all glibc-based platforms as DISTRHO_OS_LINUX, even those not
+based on Linux such as GNU/kFreeBSD or GNU/Hurd.
+
+Also, wrap ifdefs around sa_restorer which really is specific to (some)
+Linux platforms. (A feature-test macro would be better, though it is
+obsolete and maybe should be removed altogether...)
+
+Forwarded: Damien Zammit <damien at zamaudio.com>
+
+Index: zam-plugins/dpf/distrho/src/DistrhoDefines.h
+===================================================================
+--- zam-plugins.orig/dpf/distrho/src/DistrhoDefines.h
++++ zam-plugins/dpf/distrho/src/DistrhoDefines.h
+@@ -37,7 +37,7 @@
+ # define DISTRHO_DLL_EXTENSION "dylib"
+ # elif defined(__HAIKU__)
+ # define DISTRHO_OS_HAIKU 1
+-# elif defined(__linux__) || defined(__linux)
++# elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
+ # define DISTRHO_OS_LINUX 1
+ # define DISTRHO_OS_LINUX_FULL 1
+ # elif defined(__FreeBSD__) || defined(__GNU__)
+Index: zam-plugins/dpf/distrho/src/DistrhoPluginJack.cpp
+===================================================================
+--- zam-plugins.orig/dpf/distrho/src/DistrhoPluginJack.cpp
++++ zam-plugins/dpf/distrho/src/DistrhoPluginJack.cpp
+@@ -75,13 +75,17 @@ static void initSignalHandler()
+
+ sint.sa_handler = closeSignalHandler;
+ sint.sa_flags = SA_RESTART;
++#if defined(__linux__) || defined(__linux)
+ sint.sa_restorer = nullptr;
++#endif
+ sigemptyset(&sint.sa_mask);
+ sigaction(SIGINT, &sint, nullptr);
+
+ sterm.sa_handler = closeSignalHandler;
+ sterm.sa_flags = SA_RESTART;
++#if defined(__linux__) || defined(__linux)
+ sterm.sa_restorer = nullptr;
++#endif
+ sigemptyset(&sterm.sa_mask);
+ sigaction(SIGTERM, &sterm, nullptr);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1f0039f..f3d4bb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0010-remove_some_optimalization.patch
+0020-nonlinux.patch
--
zam-plugins packaging
More information about the pkg-multimedia-commits
mailing list