[SCM] yoshimi/master: Add patch to fix build on non-linux systems.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Dec 13 00:31:12 UTC 2017


The following commit has been merged in the master branch:
commit c900a983523e3b7d8132110bcd3fd03fe1c74d05
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Dec 13 01:06:31 2017 +0100

    Add patch to fix build on non-linux systems.

diff --git a/debian/patches/02-bsd_build_fix.patch b/debian/patches/02-bsd_build_fix.patch
new file mode 100644
index 0000000..dbd66f2
--- /dev/null
+++ b/debian/patches/02-bsd_build_fix.patch
@@ -0,0 +1,42 @@
+Description: Fix build on non-linux systems
+Author: Will Godfrey <willgodfrey at musically.me.uk>
+Forwarded: not-needed
+
+Index: yoshimi/src/CMakeLists.txt
+===================================================================
+--- yoshimi.orig/src/CMakeLists.txt
++++ yoshimi/src/CMakeLists.txt
+@@ -145,6 +145,7 @@ endif(EXP10F)
+ 
+ check_c_source_compiles (
+     "#include <argp.h>
++     #include <stdlib.h>
+      int main () {
+          int argc=1;
+          char *argv[]={\"test\"};
+Index: yoshimi/src/Misc/Config.cpp
+===================================================================
+--- yoshimi.orig/src/Misc/Config.cpp
++++ yoshimi/src/Misc/Config.cpp
+@@ -1089,7 +1089,7 @@ LinuxSampler src/common/Features.cpp, li
+ **/
+ 
+ 
+-static error_t parse_cmds (int key, char *arg, struct argp_state *state)
++static int parse_cmds (int key, char *arg, struct argp_state *state)
+ {
+     Config *settings = (Config*)state->input;
+     if (arg && arg[0] == 0x3d)
+Index: yoshimi/src/Misc/WaveShapeSamples.h
+===================================================================
+--- yoshimi.orig/src/Misc/WaveShapeSamples.h
++++ yoshimi/src/Misc/WaveShapeSamples.h
+@@ -25,6 +25,8 @@
+ #ifndef WAVESHAPESAMPLES_H
+ #define WAVESHAPESAMPLES_H
+ 
++#include <cmath>
++
+ class WaveShapeSamples
+ {
+     public:
diff --git a/debian/patches/series b/debian/patches/series
index ac0ed64..cfd4e7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-gcc_flags.patch
+02-bsd_build_fix.patch

-- 
yoshimi packaging



More information about the pkg-multimedia-commits mailing list