git » projectm.git » commit 27738ef

diff --git a/PKGBUILD b/PKGBUILD
index ba1d736..566b286 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,19 @@
 pkgbase=projectm
 pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=14
+pkgrel=15
 arch=('x86_64' 'i686')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack' 'ninja')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
 source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
         'projectm-test-opengl.patch'
-        'projectm-install-vera-ttf.patch')
+        'projectm-install-vera-ttf.patch'
+        'projectm-gcc6.patch')
 sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
             'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
-            '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110')
+            '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110'
+            '5f7cd6baef1c90d2a22772c0352a40645c3554c6d75bde41a2b6ec3ebdaa6128')
 
 prepare() {
   cd "projectM-complete-$pkgver-Source"
@@ -24,6 +26,7 @@ prepare() {
   patch -p1 -i ../projectm-test-opengl.patch
   patch -p1 -i ../projectm-install-vera-ttf.patch
   sed 's/projectM_isnan/std::isnan/g' -i src/libprojectM/Renderer/BeatDetect.cpp 
+  patch -p1 -i ../projectm-gcc6.patch
 }
 
 build() {
@@ -34,16 +37,15 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DINCLUDE-PROJECTM-JACK=ON \
-    -GNinja \
     "../projectM-complete-$pkgver-Source"
-  ninja
+  make
 }
 
 package_projectm() {
   pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
   depends=('ftgl' 'glew' 'libgl')
-  DESTDIR="$pkgdir" ninja -C "build/src/NativePresets" install
-  DESTDIR="$pkgdir" ninja -C "build/src/libprojectM" install
+  DESTDIR="$pkgdir" make -C "build/src/NativePresets" install
+  DESTDIR="$pkgdir" make -C "build/src/libprojectM" install
 }
 
 package_projectm-libvisual() {
@@ -51,31 +53,29 @@ package_projectm-libvisual() {
   depends=('projectm' 'libvisual' 'gcc-libs')
   replaces=('libvisual-projectm')
   provides=('libvisual-projectm')
-  DESTDIR="$pkgdir" ninja -C "build/src/projectM-libvisual" install
+  DESTDIR="$pkgdir" make -C "build/src/projectM-libvisual" install
 }
 
 package_projectm-pulseaudio() {
   pkgdesc='ProjectM support for Pulseaudio'
   depends=('projectm-qt' 'pulseaudio')
-  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-pulseaudio" install
+  DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-pulseaudio" install
 }
 
 package_projectm-jack() {
   pkgdesc='ProjectM support for Jack'
   depends=('projectm-qt' 'jack')
-  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-jack" install
+  DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-jack" install
 }
 
 package_projectm-qt() {
   pkgdesc='Qt bindings for ProjectM'
   depends=('projectm' 'qt4' 'libgl')
-  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-qt" install
+  DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-qt" install
 }
 
 package_projectm-test() {
   pkgdesc='ProjectM test applications'
   depends=('projectm' 'sdl' 'libgl')
-  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-test" install
+  DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-test" install
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/projectm-gcc6.patch b/projectm-gcc6.patch
new file mode 100644
index 0000000..f4b5a14
--- /dev/null
+++ b/projectm-gcc6.patch
@@ -0,0 +1,62 @@
+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;