From c6c657b8bcf062b5d19eff6298b7754c11838080 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 23 Jan 2012 23:15:06 +0000
Subject: Mon Jan 23 23:15:06 UTC 2012

---
 community/libvisual-projectm/PKGBUILD              | 38 ++++++++++++++--------
 .../libvisual-projectm-gcc-4.6.patch               | 11 +++++++
 2 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch

(limited to 'community/libvisual-projectm')

diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD
index ea201188d..76635d757 100644
--- a/community/libvisual-projectm/PKGBUILD
+++ b/community/libvisual-projectm/PKGBUILD
@@ -1,26 +1,36 @@
-# $Id: PKGBUILD 61634 2009-12-20 18:27:47Z andrea $
+# $Id: PKGBUILD 62640 2012-01-23 02:32:15Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libvisual-projectm
 pkgver=2.0.1
-pkgrel=1
-pkgdesc="ProjectM XMMS plugin"
+pkgrel=3
+pkgdesc='ProjectM XMMS plugin.'
 arch=('i686' 'x86_64')
-url="http://projectm.sourceforge.net/"
+url='http://projectm.sourceforge.net/'
 license=('GPL')
 depends=('projectm>=2.0.1' 'libvisual' 'sdl')
 makedepends=('pkgconfig' 'cmake' 'libxext')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz)
-md5sums=('35e09b09210d48b437e3574bd00b15a8')
+source=("http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz"
+        'libvisual-projectm-gcc-4.6.patch')
+md5sums=('35e09b09210d48b437e3574bd00b15a8'
+         'a1fa2fd4fc85b1f27e32d400e17a3196')
 
 build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../projectM_libvisual-${pkgver}-Source \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-  make || return
-  make DESTDIR=${pkgdir} install || return
+  cd "${srcdir}"
+
+  # fix build failure with GCC 4.6 (taken from SVN, revision 1355)
+  (cd "projectM_libvisual-${pkgver}-Source" && patch -p3 -i ../libvisual-projectm-gcc-4.6.patch)
+
+  mkdir build && cd build
+
+  cmake "../projectM_libvisual-${pkgver}-Source" \
+    -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch
new file mode 100644
index 000000000..0e1234f83
--- /dev/null
+++ b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch
@@ -0,0 +1,11 @@
+--- trunk/src/projectM-libvisual/actor_projectM.cpp	2009/02/20 19:07:44	1210
++++ trunk/src/projectM-libvisual/actor_projectM.cpp	2011/05/06 12:04:58	1355
+@@ -209,7 +209,7 @@
+  * we aren't with projectm, so just ignore :) */
+ extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin)
+ {
+-	return NULL;
++	return (VisPalette *) NULL;
+ }
+ 
+ /* This is where the real rendering happens! This function is what we call, many times
-- 
cgit v1.2.3-54-g00ecf