[vlc-commits] contribs: projectM: Fix build C++11 build

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Dec  7 13:38:30 2016 +0100| [9bc7799573de778458778a24862883f568eba74f] | committer: Hugo Beauzée-Luyssen

contribs: projectM: Fix build C++11 build

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9bc7799573de778458778a24862883f568eba74f
---

 contrib/src/projectM/cpp11.patch | 47 ++++++++++++++++++++++++++++++++++++++++
 contrib/src/projectM/rules.mak   |  1 +
 2 files changed, 48 insertions(+)

diff --git a/contrib/src/projectM/cpp11.patch b/contrib/src/projectM/cpp11.patch
new file mode 100644
index 0000000..2823813
--- /dev/null
+++ b/contrib/src/projectM/cpp11.patch
@@ -0,0 +1,47 @@
+--- projectM/MilkdropPresetFactory/Parser.cpp.orig	2016-12-07 13:28:30.846142849 +0100
++++ projectM/MilkdropPresetFactory/Parser.cpp	2016-12-07 13:36:11.389931717 +0100
+@@ -1405,7 +1405,7 @@
+   PerFrameEqn * per_frame_eqn;
+   GenExpr * gen_expr;
+ 
+-  if (fs == NULL)
++  if (!fs)
+     return NULL;
+   if (param_string == NULL)
+     return NULL;
+@@ -1560,7 +1560,7 @@
+ 
+   if (preset == NULL)
+     return NULL;
+-  if (fs == NULL)
++  if (!fs)
+     return NULL;
+ 
+   if ((token = parseToken(fs, name)) != tEq)
+@@ -1874,7 +1874,7 @@
+   /* Null argument checks */
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (!fs)
+     return PROJECTM_FAILURE;
+   if (token == NULL)
+     return PROJECTM_FAILURE;
+@@ -2165,7 +2165,7 @@
+ 
+   if (token == NULL)
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (!fs)
+     return PROJECTM_FAILURE;
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
+@@ -2347,7 +2347,7 @@
+   if (token == NULL)
+ 
+     return PROJECTM_FAILURE;
+-  if (fs == NULL)
++  if (!fs)
+     return PROJECTM_FAILURE;
+   if (preset == NULL)
+     return PROJECTM_FAILURE;
diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index b451d57..bf82d4c 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -22,6 +22,7 @@ endif
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/projectM/win32.patch
 endif
+	$(APPLY) $(SRC)/projectM/cpp11.patch
 	$(MOVE)
 
 DEPS_projectM = glew $(DEPS_glew)