git » projectm.git » commit adc36d8

diff --git a/PKGBUILD b/PKGBUILD
index a56fb69..ba1d736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
 # Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Denis A. Altoe Falqueto <denisfalqueto@gmail.com>
@@ -6,11 +6,11 @@
 pkgbase=projectm
 pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=13
+pkgrel=14
 arch=('x86_64' 'i686')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack' 'ninja')
 source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
         'projectm-test-opengl.patch'
         'projectm-install-vera-ttf.patch')
@@ -21,31 +21,29 @@ sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
 prepare() {
   cd "projectM-complete-$pkgver-Source"
 
-  patch -p1 -i "$srcdir/projectm-test-opengl.patch"
-  patch -p1 -i "$srcdir/projectm-install-vera-ttf.patch"
-  mkdir -p "$srcdir/build"
+  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 
 }
 
 build() {
+  mkdir -p build
   cd build
-
   cmake \
     -Wno-dev \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DINCLUDE-PROJECTM-JACK=ON \
+    -GNinja \
     "../projectM-complete-$pkgver-Source"
-  make
+  ninja
 }
 
 package_projectm() {
   pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
   depends=('ftgl' 'glew' 'libgl')
-
-  cd "$srcdir/build"
-  for dirs in src/{NativePresets,libprojectM}; do
-    make -C "$dirs" DESTDIR="$pkgdir" install
-  done
+  DESTDIR="$pkgdir" ninja -C "build/src/NativePresets" install
+  DESTDIR="$pkgdir" ninja -C "build/src/libprojectM" install
 }
 
 package_projectm-libvisual() {
@@ -53,41 +51,31 @@ package_projectm-libvisual() {
   depends=('projectm' 'libvisual' 'gcc-libs')
   replaces=('libvisual-projectm')
   provides=('libvisual-projectm')
-  
-  cd "$srcdir/build/src/projectM-libvisual"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C "build/src/projectM-libvisual" install
 }
 
 package_projectm-pulseaudio() {
   pkgdesc='ProjectM support for Pulseaudio'
   depends=('projectm-qt' 'pulseaudio')
-  
-  cd "$srcdir/build/src/projectM-pulseaudio"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-pulseaudio" install
 }
 
 package_projectm-jack() {
   pkgdesc='ProjectM support for Jack'
   depends=('projectm-qt' 'jack')
-  
-  cd "$srcdir/build/src/projectM-jack"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-jack" install
 }
 
 package_projectm-qt() {
   pkgdesc='Qt bindings for ProjectM'
   depends=('projectm' 'qt4' 'libgl')
-  
-  cd "$srcdir/build/src/projectM-qt"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-qt" install
 }
 
 package_projectm-test() {
   pkgdesc='ProjectM test applications'
   depends=('projectm' 'sdl' 'libgl')
-  
-  cd "$srcdir/build/src/projectM-test"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C "$srcdir/build/src/projectM-test" install
 }
 
 # vim:set ts=2 sw=2 et: