diff options
| author |   M.Dinslage <daedra1980@gmail.com> | 2017-05-27 23:42:35 +0100 |
|---|---|---|
| committer |   David Spencer <idlemoor@slackbuilds.org> | 2017-05-27 23:43:04 +0100 |
| commit | 2676d3d37b24990a0b60fa0572f476878ae911b5 (patch) | |
| tree | d2b488add05b7096c30d2b434c5acfc31422586f /misc/projectM/projectM-2.1.0_gcc.patch | |
| parent | 7d787155bdcecb1de5947be3ae2d0fb4612352db (diff) | |
| download | slackbuilds-2676d3d37b24990a0b60fa0572f476878ae911b5.tar.gz slackbuilds-2676d3d37b24990a0b60fa0572f476878ae911b5.tar.xz | |
misc/projectM: Patched for gcc 6/7.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'misc/projectM/projectM-2.1.0_gcc.patch')
| -rw-r--r-- | misc/projectM/projectM-2.1.0_gcc.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/misc/projectM/projectM-2.1.0_gcc.patch b/misc/projectM/projectM-2.1.0_gcc.patch new file mode 100644 index 0000000000..c55d1d6f1d --- /dev/null +++ b/misc/projectM/projectM-2.1.0_gcc.patch @@ -0,0 +1,63 @@ +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp +--- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp 2016-03-17 05:00:14.176905540 +0000 +@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t + + #ifdef LINUX + #include <cstdlib> +-#define projectM_isnan isnan ++#include <cmath> ++#define projectM_isnan std::isnan + + #endif + +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp +projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp +--- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000 +@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per + PerFrameEqn * per_frame_eqn; + GenExpr * gen_expr; + +- if (fs == NULL) ++ if (!fs) + return NULL; + if (param_string == NULL) + return NULL; +@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_ + + if (preset == NULL) + return NULL; +- if (fs == NULL) ++ if (!fs) + return NULL; + + if ((token = parseToken(fs, name)) != tEq) +@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token + /* Null argument checks */ + if (preset == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (token == NULL) + return PROJECTM_FAILURE; +@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std + + if (token == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; +@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st + if (token == NULL) + + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; + |