[arch-commits] Commit in projectm/repos (8 files)
Alexander Rødseth
arodseth at nymeria.archlinux.org
Tue Feb 19 22:29:25 UTC 2013
Date: Tuesday, February 19, 2013 @ 23:29:25
Author: arodseth
Revision: 84566
archrelease: copy trunk to community-x86_64, community-i686
Added:
projectm/repos/community-i686/PKGBUILD
(from rev 84565, projectm/trunk/PKGBUILD)
projectm/repos/community-i686/projectm-install-vera-ttf.patch
(from rev 84565, projectm/trunk/projectm-install-vera-ttf.patch)
projectm/repos/community-i686/projectm-test-opengl.patch
(from rev 84565, projectm/trunk/projectm-test-opengl.patch)
projectm/repos/community-x86_64/PKGBUILD
(from rev 84565, projectm/trunk/PKGBUILD)
projectm/repos/community-x86_64/projectm-install-vera-ttf.patch
(from rev 84565, projectm/trunk/projectm-install-vera-ttf.patch)
projectm/repos/community-x86_64/projectm-test-opengl.patch
(from rev 84565, projectm/trunk/projectm-test-opengl.patch)
Deleted:
projectm/repos/community-i686/PKGBUILD
projectm/repos/community-x86_64/PKGBUILD
--------------------------------------------------+
community-i686/PKGBUILD | 123 ++++++++++++++-------
community-i686/projectm-install-vera-ttf.patch | 12 ++
community-i686/projectm-test-opengl.patch | 19 +++
community-x86_64/PKGBUILD | 123 ++++++++++++++-------
community-x86_64/projectm-install-vera-ttf.patch | 12 ++
community-x86_64/projectm-test-opengl.patch | 19 +++
6 files changed, 226 insertions(+), 82 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-02-19 22:29:08 UTC (rev 84565)
+++ community-i686/PKGBUILD 2013-02-19 22:29:25 UTC (rev 84566)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
-pkgver=2.1.0
-pkgrel=2
-arch=('x86_64' 'i686')
-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')
-
-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
- make
-}
-
-package_projectm() {
- pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
- depends=('ftgl' 'glew' 'gtkglext')
-
- 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_libvisual-projectm() {
- pkgdesc='ProjectM XMMS plugin'
- depends=("projectm>=$pkgver" 'libvisual' 'sdl')
-
- cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
- make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: projectm/repos/community-i686/PKGBUILD (from rev 84565, projectm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-19 22:29:25 UTC (rev 84566)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Denis A. Altoe Falqueto <denisfalqueto at gmail.com>
+
+pkgbase=projectm
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
+pkgver=2.1.0
+pkgrel=3
+arch=('x86_64' 'i686')
+url='http://projectm.sourceforge.net/'
+license=('LGPL')
+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"
+ 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')
+
+ cd "$srcdir/build"
+
+ for dirs in src/{NativePresets,libprojectM}; do
+ make -C "$dirs" DESTDIR="$pkgdir" install
+ done
+}
+
+package_projectm-libvisual() {
+ pkgdesc='ProjectM plugin for XMMS'
+ depends=('projectm' 'libvisual')
+
+ cd "$srcdir/build/src/projectM-libvisual"
+ make DESTDIR="$pkgdir" install
+}
+
+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
+}
+
+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:
Copied: projectm/repos/community-i686/projectm-install-vera-ttf.patch (from rev 84565, projectm/trunk/projectm-install-vera-ttf.patch)
===================================================================
--- community-i686/projectm-install-vera-ttf.patch (rev 0)
+++ community-i686/projectm-install-vera-ttf.patch 2013-02-19 22:29:25 UTC (rev 84566)
@@ -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")
Copied: projectm/repos/community-i686/projectm-test-opengl.patch (from rev 84565, projectm/trunk/projectm-test-opengl.patch)
===================================================================
--- community-i686/projectm-test-opengl.patch (rev 0)
+++ community-i686/projectm-test-opengl.patch 2013-02-19 22:29:25 UTC (rev 84566)
@@ -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 )
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-02-19 22:29:08 UTC (rev 84565)
+++ community-x86_64/PKGBUILD 2013-02-19 22:29:25 UTC (rev 84566)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
-pkgver=2.1.0
-pkgrel=2
-arch=('x86_64' 'i686')
-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')
-
-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
- make
-}
-
-package_projectm() {
- pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
- depends=('ftgl' 'glew' 'gtkglext')
-
- 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_libvisual-projectm() {
- pkgdesc='ProjectM XMMS plugin'
- depends=("projectm>=$pkgver" 'libvisual' 'sdl')
-
- cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
- make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: projectm/repos/community-x86_64/PKGBUILD (from rev 84565, projectm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-02-19 22:29:25 UTC (rev 84566)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Denis A. Altoe Falqueto <denisfalqueto at gmail.com>
+
+pkgbase=projectm
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
+pkgver=2.1.0
+pkgrel=3
+arch=('x86_64' 'i686')
+url='http://projectm.sourceforge.net/'
+license=('LGPL')
+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"
+ 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')
+
+ cd "$srcdir/build"
+
+ for dirs in src/{NativePresets,libprojectM}; do
+ make -C "$dirs" DESTDIR="$pkgdir" install
+ done
+}
+
+package_projectm-libvisual() {
+ pkgdesc='ProjectM plugin for XMMS'
+ depends=('projectm' 'libvisual')
+
+ cd "$srcdir/build/src/projectM-libvisual"
+ make DESTDIR="$pkgdir" install
+}
+
+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
+}
+
+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:
Copied: projectm/repos/community-x86_64/projectm-install-vera-ttf.patch (from rev 84565, projectm/trunk/projectm-install-vera-ttf.patch)
===================================================================
--- community-x86_64/projectm-install-vera-ttf.patch (rev 0)
+++ community-x86_64/projectm-install-vera-ttf.patch 2013-02-19 22:29:25 UTC (rev 84566)
@@ -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")
Copied: projectm/repos/community-x86_64/projectm-test-opengl.patch (from rev 84565, projectm/trunk/projectm-test-opengl.patch)
===================================================================
--- community-x86_64/projectm-test-opengl.patch (rev 0)
+++ community-x86_64/projectm-test-opengl.patch 2013-02-19 22:29:25 UTC (rev 84566)
@@ -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 )
More information about the arch-commits
mailing list