git » projectm.git » commit fbf8b60

diff --git a/PKGBUILD b/PKGBUILD
index 21178b8..e6fbe5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,37 @@
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
-pkgname=projectm
-pkgver=2.0.1
-pkgrel=6
-pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
+pkgbase=projectm
+pkgname=('projectm' 'libvisual-projectm')
+pkgver=2.1.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
-makedepends=('pkg-config' 'cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz"
-        'libprojectM-2.0.1-pkg-config.patch'
-        'libprojectM-2.0.1-fix-linking.patch')
-md5sums=('f8bf795878cdbbef54784cf2390b4c89'
-         '4f258f4e7c2ab612931936bfd7f1f0fb'
-         '5c178cadf1e00ee4baf32cd9ccbc818c')
+makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
+source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz")
+md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b')
 
 build() {
-  cd "${srcdir}/projectM-${pkgver}-Source"
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
+    -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
+  make
+}
 
-  patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch"
-  patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch"
+package_projectm() {
+  pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
+  depends=('ftgl' 'glew' 'gtkglext')
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM"
+  make DESTDIR="${pkgdir}" install
+  install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf"
 }
 
-package() {
-  cd "${srcdir}/projectM-${pkgver}-Source"
+package_libvisual-projectm() {
+  pkgdesc='ProjectM XMMS plugin.'
+  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
+
+  cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libprojectM-2.0.1-fix-linking.patch b/libprojectM-2.0.1-fix-linking.patch
deleted file mode 100644
index 23d8a7b..0000000
--- a/libprojectM-2.0.1-fix-linking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/CMakeLists.txt	2012-02-23 04:30:51.000000000 +0100
-@@ -177,10 +177,10 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
- 
- if(BUILD_PROJECTM_STATIC)
--		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+		TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
- else(BUILD_PROJECTM_STATIC)
- 
--TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
- 
- endif(BUILD_PROJECTM_STATIC)
- 
---- a/Renderer/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/Renderer/CMakeLists.txt	2012-02-23 04:31:58.000000000 +0100
-@@ -13,4 +13,4 @@
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
- SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
--TARGET_LINK_LIBRARIES(Renderer m)
-+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})
diff --git a/libprojectM-2.0.1-pkg-config.patch b/libprojectM-2.0.1-pkg-config.patch
deleted file mode 100644
index b5e3820..0000000
--- a/libprojectM-2.0.1-pkg-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libprojectM.pc.in	2009-12-06 02:42:51.000000000 +0100
-+++ b/libprojectM.pc.in	2012-02-21 16:48:36.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_PREFIX@/lib
- includedir=@CMAKE_INSTALL_PREFIX@/include
- pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
- sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@