Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

6 files changed, 58 insertions, 61 deletions

diff --git a/abs/core/libvisual-plugins/PKGBUILD b/abs/core/libvisual-plugins/PKGBUILD
index e22ff1a..efd92f4 100644
--- a/abs/core/libvisual-plugins/PKGBUILD
+++ b/abs/core/libvisual-plugins/PKGBUILD
@@ -3,8 +3,7 @@
 
 pkgname=libvisual-plugins
 pkgver=0.4.0
-pkgrel=3
-epoch=1
+pkgrel=9
 pkgdesc="plugins for libvisual"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -17,7 +16,8 @@ options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr  --enable-alsa --disable-gstreamer-plugin || return 1
+  ./configure --prefix=/usr  --enable-alsa --disable-gstreamer-plugin \
+  --disable-gdkpixbuf-plugin --disable-nastyfft --disable-madspin --disable-flower --disable-bumpscope --disable-gltest --disable-jakdaw
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/core/libvisual-plugins/__changelog b/abs/core/libvisual-plugins/__changelog
new file mode 100644
index 0000000..bce7c81
--- /dev/null
+++ b/abs/core/libvisual-plugins/__changelog
@@ -0,0 +1,3 @@
+disable plugins that cause mythmusic to oops
+  --disable-gdkpixbuf-plugin   --disable-nastyfft --disable-madspin  --disable-flower --disable-bumpscope --disable-gltest
+
diff --git a/abs/core/libvisual-projectm/PKGBUILD b/abs/core/libvisual-projectm/PKGBUILD
deleted file mode 100644
index ea20118..0000000
--- a/abs/core/libvisual-projectm/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 61634 2009-12-20 18:27:47Z andrea $
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libvisual-projectm
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="ProjectM XMMS plugin"
-arch=('i686' 'x86_64')
-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')
-
-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
-}
diff --git a/abs/core/projectm-complete/PKGBUILD b/abs/core/projectm-complete/PKGBUILD
new file mode 100644
index 0000000..e6a975d
--- /dev/null
+++ b/abs/core/projectm-complete/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Nickolay Stepanenko <nixtrian at gmail dot com>
+
+pkgname=projectm-complete
+pkgver=2.0.1
+pkgrel=2
+pkgdesc="A music visualizer which uses 3D accelerated iterative image based rendering (all components)"
+arch=('i686' 'x86_64')
+url="http://projectm.sourceforge.net/"
+license=('GPL')
+depends=('ftgl' 'glut' 'glew' 'libvisual-plugins')
+provides=('projectm' 'projectm-qt' 'projectm-libvisual' 'projectm-libvisual-alsa')
+conflicts=('projectm' 'projectm-qt' 'projectm-libvisual' 'projectm-libvisual-alsa')
+makedepends=('pkgconfig' 'xproto' 'cmake')
+source=("http://sourceforge.net/projects/projectm/files/2.0.1/projectM-complete-2.0.1-Source.tar.gz/download"
+        "libprojectm-2.0.1-pcfix.patch")
+md5sums=('9d32fa1357622c7a945a2e10620ee945' '9e2d9b03748fd6511181366b8d025425')
+
+build() {
+  cd $srcdir/projectM-complete-$pkgver-Source/ || return 1
+
+  patch -p1 -i ../libprojectm-2.0.1-pcfix.patch
+  cd src
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D USE_FBO=OFF . || return 1
+  make all || return 1
+  make DESTDIR=$pkgdir install || return 1
+  rm -rf $srcdir/projectM-complete-$pkgver-Source
+}
diff --git a/abs/core/projectm-complete/libprojectm-2.0.1-pcfix.patch b/abs/core/projectm-complete/libprojectm-2.0.1-pcfix.patch
new file mode 100644
index 0000000..50097e7
--- /dev/null
+++ b/abs/core/projectm-complete/libprojectm-2.0.1-pcfix.patch
@@ -0,0 +1,25 @@
+--- projectM-2.0.1-Source.orig/src/libprojectM/libprojectM.pc.in
++++ projectM-2.0.1-Source/src/libprojectM/libprojectM.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
++libdir=${exec_prefix}/lib@LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+ sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+
+--- projectM-complete-2.0.1-Source.orig/src/CMakeLists.txt	2009-12-06 02:20:48.000000000 +0100
++++ rojectM-complete-2.0.1-Source/src/CMakeLists.txt	2010-06-28 01:10:27.145943667 +0200
+@@ -3,9 +3,9 @@
+ cmake_minimum_required(VERSION 2.4.0)
+ 
+ OPTION(INCLUDE-PROJECTM-QT "Build the projectM Qt4 user interface extension library (recommended)" ON)
+-OPTION(INCLUDE-PROJECTM-PULSEAUDIO "Build the projectM pulse audio client (recommended for fedora users)" ON)
++OPTION(INCLUDE-PROJECTM-PULSEAUDIO "Build the projectM pulse audio client (recommended for fedora users)" OFF)
+ OPTION(INCLUDE-PROJECTM-LIBVISUAL "Build the projectM libvisual client" ON)
+-OPTION(INCLUDE-PROJECTM-LIBVISUAL-ALSA "Build experimental libvisual / alsa input standalone client (NEW!)" OFF)
++OPTION(INCLUDE-PROJECTM-LIBVISUAL-ALSA "Build experimental libvisual / alsa input standalone client (NEW!)" ON)
+ OPTION(INCLUDE-PROJECTM-JACK "Build the projectM JACK client" OFF)
+ OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" ON)
+ OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF)
diff --git a/abs/core/projectm/PKGBUILD b/abs/core/projectm/PKGBUILD
deleted file mode 100644
index 74bbe88..0000000
--- a/abs/core/projectm/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 78581 2010-04-26 20:01:05Z andrea $
-# Maintainer:
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=projectm
-pkgver=2.0.1
-pkgrel=2
-pkgdesc="A music visualizer which uses 3D accelerated iterative image based rendering"
-arch=('i686' 'x86_64')
-url="http://projectm.sourceforge.net/"
-license=('LGPL')
-depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
-makedepends=('pkgconfig' 'cmake')
-source=(http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz)
-md5sums=('f8bf795878cdbbef54784cf2390b4c89')
-
-build() {
-  cd ${srcdir}
-#  sed -i 's|FTGL/FTGL.h|FTGL/ftgl.h|' Renderer.hpp || return 1
-#  sed -i "s|#include <iostream>|#include <cstdio>\n#include <iostream>|" BuiltinParams.cpp || return 1
-  mkdir build
-  cd build
-  cmake ../projectM-${pkgver}-Source \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
-}