[arch-commits] Commit in projectm/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Thu Aug 4 16:56:30 UTC 2016
Date: Thursday, August 4, 2016 @ 16:56:30
Author: arojas
Revision: 185072
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
projectm/repos/community-staging-i686/
projectm/repos/community-staging-i686/PKGBUILD
(from rev 185071, projectm/trunk/PKGBUILD)
projectm/repos/community-staging-i686/projectm-gcc6.patch
(from rev 185071, projectm/trunk/projectm-gcc6.patch)
projectm/repos/community-staging-i686/projectm-install-vera-ttf.patch
(from rev 185071, projectm/trunk/projectm-install-vera-ttf.patch)
projectm/repos/community-staging-i686/projectm-test-opengl.patch
(from rev 185071, projectm/trunk/projectm-test-opengl.patch)
projectm/repos/community-staging-x86_64/
projectm/repos/community-staging-x86_64/PKGBUILD
(from rev 185071, projectm/trunk/PKGBUILD)
projectm/repos/community-staging-x86_64/projectm-gcc6.patch
(from rev 185071, projectm/trunk/projectm-gcc6.patch)
projectm/repos/community-staging-x86_64/projectm-install-vera-ttf.patch
(from rev 185071, projectm/trunk/projectm-install-vera-ttf.patch)
projectm/repos/community-staging-x86_64/projectm-test-opengl.patch
(from rev 185071, projectm/trunk/projectm-test-opengl.patch)
----------------------------------------------------------+
community-staging-i686/PKGBUILD | 82 +++++++++++++
community-staging-i686/projectm-gcc6.patch | 62 +++++++++
community-staging-i686/projectm-install-vera-ttf.patch | 12 +
community-staging-i686/projectm-test-opengl.patch | 19 +++
community-staging-x86_64/PKGBUILD | 82 +++++++++++++
community-staging-x86_64/projectm-gcc6.patch | 62 +++++++++
community-staging-x86_64/projectm-install-vera-ttf.patch | 12 +
community-staging-x86_64/projectm-test-opengl.patch | 19 +++
8 files changed, 350 insertions(+)
Copied: projectm/repos/community-staging-i686/PKGBUILD (from rev 185071, projectm/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-08-04 16:56:30 UTC (rev 185072)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Lukas Fleischer <lfleischer at archlinux.org>
+# 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-jack' 'projectm-qt' 'projectm-test')
+pkgver=2.1.0
+pkgrel=15
+arch=('x86_64' 'i686')
+url='http://projectm.sourceforge.net/'
+license=('LGPL')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
+ 'projectm-test-opengl.patch'
+ 'projectm-install-vera-ttf.patch'
+ 'projectm-gcc6.patch')
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
+ 'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
+ '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110'
+ '5f7cd6baef1c90d2a22772c0352a40645c3554c6d75bde41a2b6ec3ebdaa6128')
+
+prepare() {
+ cd "projectM-complete-$pkgver-Source"
+
+ patch -p1 -i ../projectm-test-opengl.patch
+ patch -p1 -i ../projectm-install-vera-ttf.patch
+ sed 's/projectM_isnan/std::isnan/g' -i src/libprojectM/Renderer/BeatDetect.cpp
+ patch -p1 -i ../projectm-gcc6.patch
+}
+
+build() {
+ mkdir -p build
+ cd build
+ cmake \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DINCLUDE-PROJECTM-JACK=ON \
+ "../projectM-complete-$pkgver-Source"
+ make
+}
+
+package_projectm() {
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
+ depends=('ftgl' 'glew' 'libgl')
+ DESTDIR="$pkgdir" make -C "build/src/NativePresets" install
+ DESTDIR="$pkgdir" make -C "build/src/libprojectM" install
+}
+
+package_projectm-libvisual() {
+ pkgdesc='ProjectM plugin for XMMS'
+ depends=('projectm' 'libvisual' 'gcc-libs')
+ replaces=('libvisual-projectm')
+ provides=('libvisual-projectm')
+ DESTDIR="$pkgdir" make -C "build/src/projectM-libvisual" install
+}
+
+package_projectm-pulseaudio() {
+ pkgdesc='ProjectM support for Pulseaudio'
+ depends=('projectm-qt' 'pulseaudio')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-pulseaudio" install
+}
+
+package_projectm-jack() {
+ pkgdesc='ProjectM support for Jack'
+ depends=('projectm-qt' 'jack')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-jack" install
+}
+
+package_projectm-qt() {
+ pkgdesc='Qt bindings for ProjectM'
+ depends=('projectm' 'qt4' 'libgl')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-qt" install
+}
+
+package_projectm-test() {
+ pkgdesc='ProjectM test applications'
+ depends=('projectm' 'sdl' 'libgl')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-test" install
+}
Copied: projectm/repos/community-staging-i686/projectm-gcc6.patch (from rev 185071, projectm/trunk/projectm-gcc6.patch)
===================================================================
--- community-staging-i686/projectm-gcc6.patch (rev 0)
+++ community-staging-i686/projectm-gcc6.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -0,0 +1,62 @@
+diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp
+--- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp 2012-05-20 04:43:26.000000000 +0100
++++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp 2016-03-17 05:00:14.176905540 +0000
+@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t
+
+ #ifdef LINUX
+ #include <cstdlib>
+-#define projectM_isnan isnan
++#include <cmath>
++#define projectM_isnan std::isnan
+
+ #endif
+
+diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+--- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100
++++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000
+@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per
+ PerFrameEqn * per_frame_eqn;
+ GenExpr * gen_expr;
+
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+ if (param_string == NULL)
+ return NULL;
+@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_
+
+ if (preset == NULL)
+ return NULL;
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+
+ if ((token = parseToken(fs, name)) != tEq)
+@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token
+ /* Null argument checks */
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std
+
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st
+ if (token == NULL)
+
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
Copied: projectm/repos/community-staging-i686/projectm-install-vera-ttf.patch (from rev 185071, projectm/trunk/projectm-install-vera-ttf.patch)
===================================================================
--- community-staging-i686/projectm-install-vera-ttf.patch (rev 0)
+++ community-staging-i686/projectm-install-vera-ttf.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -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-staging-i686/projectm-test-opengl.patch (from rev 185071, projectm/trunk/projectm-test-opengl.patch)
===================================================================
--- community-staging-i686/projectm-test-opengl.patch (rev 0)
+++ community-staging-i686/projectm-test-opengl.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -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 )
Copied: projectm/repos/community-staging-x86_64/PKGBUILD (from rev 185071, projectm/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-08-04 16:56:30 UTC (rev 185072)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Lukas Fleischer <lfleischer at archlinux.org>
+# 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-jack' 'projectm-qt' 'projectm-test')
+pkgver=2.1.0
+pkgrel=15
+arch=('x86_64' 'i686')
+url='http://projectm.sourceforge.net/'
+license=('LGPL')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
+ 'projectm-test-opengl.patch'
+ 'projectm-install-vera-ttf.patch'
+ 'projectm-gcc6.patch')
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
+ 'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
+ '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110'
+ '5f7cd6baef1c90d2a22772c0352a40645c3554c6d75bde41a2b6ec3ebdaa6128')
+
+prepare() {
+ cd "projectM-complete-$pkgver-Source"
+
+ patch -p1 -i ../projectm-test-opengl.patch
+ patch -p1 -i ../projectm-install-vera-ttf.patch
+ sed 's/projectM_isnan/std::isnan/g' -i src/libprojectM/Renderer/BeatDetect.cpp
+ patch -p1 -i ../projectm-gcc6.patch
+}
+
+build() {
+ mkdir -p build
+ cd build
+ cmake \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DINCLUDE-PROJECTM-JACK=ON \
+ "../projectM-complete-$pkgver-Source"
+ make
+}
+
+package_projectm() {
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
+ depends=('ftgl' 'glew' 'libgl')
+ DESTDIR="$pkgdir" make -C "build/src/NativePresets" install
+ DESTDIR="$pkgdir" make -C "build/src/libprojectM" install
+}
+
+package_projectm-libvisual() {
+ pkgdesc='ProjectM plugin for XMMS'
+ depends=('projectm' 'libvisual' 'gcc-libs')
+ replaces=('libvisual-projectm')
+ provides=('libvisual-projectm')
+ DESTDIR="$pkgdir" make -C "build/src/projectM-libvisual" install
+}
+
+package_projectm-pulseaudio() {
+ pkgdesc='ProjectM support for Pulseaudio'
+ depends=('projectm-qt' 'pulseaudio')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-pulseaudio" install
+}
+
+package_projectm-jack() {
+ pkgdesc='ProjectM support for Jack'
+ depends=('projectm-qt' 'jack')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-jack" install
+}
+
+package_projectm-qt() {
+ pkgdesc='Qt bindings for ProjectM'
+ depends=('projectm' 'qt4' 'libgl')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-qt" install
+}
+
+package_projectm-test() {
+ pkgdesc='ProjectM test applications'
+ depends=('projectm' 'sdl' 'libgl')
+ DESTDIR="$pkgdir" make -C "$srcdir/build/src/projectM-test" install
+}
Copied: projectm/repos/community-staging-x86_64/projectm-gcc6.patch (from rev 185071, projectm/trunk/projectm-gcc6.patch)
===================================================================
--- community-staging-x86_64/projectm-gcc6.patch (rev 0)
+++ community-staging-x86_64/projectm-gcc6.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -0,0 +1,62 @@
+diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp
+--- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp 2012-05-20 04:43:26.000000000 +0100
++++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp 2016-03-17 05:00:14.176905540 +0000
+@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t
+
+ #ifdef LINUX
+ #include <cstdlib>
+-#define projectM_isnan isnan
++#include <cmath>
++#define projectM_isnan std::isnan
+
+ #endif
+
+diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+--- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100
++++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000
+@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per
+ PerFrameEqn * per_frame_eqn;
+ GenExpr * gen_expr;
+
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+ if (param_string == NULL)
+ return NULL;
+@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_
+
+ if (preset == NULL)
+ return NULL;
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+
+ if ((token = parseToken(fs, name)) != tEq)
+@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token
+ /* Null argument checks */
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std
+
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st
+ if (token == NULL)
+
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
Copied: projectm/repos/community-staging-x86_64/projectm-install-vera-ttf.patch (from rev 185071, projectm/trunk/projectm-install-vera-ttf.patch)
===================================================================
--- community-staging-x86_64/projectm-install-vera-ttf.patch (rev 0)
+++ community-staging-x86_64/projectm-install-vera-ttf.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -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-staging-x86_64/projectm-test-opengl.patch (from rev 185071, projectm/trunk/projectm-test-opengl.patch)
===================================================================
--- community-staging-x86_64/projectm-test-opengl.patch (rev 0)
+++ community-staging-x86_64/projectm-test-opengl.patch 2016-08-04 16:56:30 UTC (rev 185072)
@@ -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