Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/linux-tools/PKGBUILD
	community/projectm/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	libre/linux-libre-tools/PKGBUILD

3 files changed, 90 insertions, 18 deletions

diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index d6226ccf0..73552a51e 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,41 +1,82 @@
-# $Id: PKGBUILD 78939 2012-10-27 23:45:21Z ebelanger $
+# $Id: PKGBUILD 84566 2013-02-19 22:29:25Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Denis A. Altoe Falqueto <denisfalqueto@gmail.com>
 
 pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
-source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz")
-sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee')
+makedepends=('mesa' 'qt' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
+        'projectm-test-opengl.patch'
+        'projectm-install-vera-ttf.patch')
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
+            'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
+            '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110')
+_projectmdir="projectM-complete-$pkgver-Source"
 
 build() {
-  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
+  cd "$srcdir/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"
+  cd "$srcdir/build"
+
+  cmake \
+    -Wno-dev \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    "../projectM-complete-$pkgver-Source"
   make
 }
 
 package_projectm() {
   pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
-  depends=('ftgl' 'glew' 'gtkglext')
+  depends=('ftgl' 'glew')
+
+  cd "$srcdir/build"
+  
+  for dirs in src/{NativePresets,libprojectM}; do
+    make -C "$dirs" DESTDIR="$pkgdir" install
+  done
+}
 
-  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_projectm-libvisual() {
+  pkgdesc='ProjectM plugin for XMMS'
+  depends=('projectm' 'libvisual')
+  
+  cd "$srcdir/build/src/projectM-libvisual"
+  make DESTDIR="$pkgdir" install
 }
 
-package_libvisual-projectm() {
-  pkgdesc='ProjectM XMMS plugin'
-  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
+package_projectm-pulseaudio() {
+  pkgdesc='ProjectM support for Pulseaudio'
+  depends=('projectm' 'projectm-qt' 'pulseaudio')
+  
+  cd "$srcdir/build/src/projectM-pulseaudio"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-qt() {
+  pkgdesc='Qt bindings for ProjectM'
+  depends=('projectm' 'qt')
+  
+  cd "$srcdir/build/src/projectM-qt"
+  make DESTDIR="$pkgdir" install
+}
 
-  cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
-  make DESTDIR=$pkgdir install
+package_projectm-test() {
+  pkgdesc='ProjectM test applications'
+  depends=('projectm' 'sdl')
+  
+  cd "$srcdir/build/src/projectM-test"
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/projectm/projectm-install-vera-ttf.patch b/community/projectm/projectm-install-vera-ttf.patch
new file mode 100644
index 000000000..ee7a5e943
--- /dev/null
+++ b/community/projectm/projectm-install-vera-ttf.patch
@@ -0,0 +1,12 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt	2012-06-30 02:21:45.134586637 -0300
++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt	2012-06-30 02:24:58.476872545 -0300
+@@ -224,7 +224,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/Vera.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf")
diff --git a/community/projectm/projectm-test-opengl.patch b/community/projectm/projectm-test-opengl.patch
new file mode 100644
index 000000000..b9211ea0c
--- /dev/null
+++ b/community/projectm/projectm-test-opengl.patch
@@ -0,0 +1,19 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt	2012-05-20 00:43:26.000000000 -0300
++++ projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt	2012-06-30 01:01:55.947058502 -0300
+@@ -35,11 +35,11 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${
+    set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
+ endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
+ 
+-INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ LINK_DIRECTORIES(${PROJECTM_LINK})
+ 
+-TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY})
+-TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} )
+-TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
+ 
+ INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )