[arch-commits] Commit in projectm/repos (6 files)
Ike Devolder
idevolder at archlinux.org
Sun Feb 24 21:29:42 UTC 2019
Date: Sunday, February 24, 2019 @ 21:29:41
Author: idevolder
Revision: 435551
archrelease: copy trunk to community-testing-x86_64
Added:
projectm/repos/community-testing-x86_64/
projectm/repos/community-testing-x86_64/112.patch
(from rev 435550, projectm/trunk/112.patch)
projectm/repos/community-testing-x86_64/PKGBUILD
(from rev 435550, projectm/trunk/PKGBUILD)
projectm/repos/community-testing-x86_64/projectm-gcc6.patch
(from rev 435550, projectm/trunk/projectm-gcc6.patch)
projectm/repos/community-testing-x86_64/projectm-install-vera-ttf.patch
(from rev 435550, projectm/trunk/projectm-install-vera-ttf.patch)
projectm/repos/community-testing-x86_64/projectm-test-opengl.patch
(from rev 435550, projectm/trunk/projectm-test-opengl.patch)
---------------------------------+
112.patch | 168 ++++++++++++++++++++++++++++++++++++++
PKGBUILD | 62 ++++++++++++++
projectm-gcc6.patch | 62 ++++++++++++++
projectm-install-vera-ttf.patch | 12 ++
projectm-test-opengl.patch | 19 ++++
5 files changed, 323 insertions(+)
Copied: projectm/repos/community-testing-x86_64/112.patch (from rev 435550, projectm/trunk/112.patch)
===================================================================
--- community-testing-x86_64/112.patch (rev 0)
+++ community-testing-x86_64/112.patch 2019-02-24 21:29:41 UTC (rev 435551)
@@ -0,0 +1,168 @@
+From fa135a027c260bfbf6a0038540cc825a171b2632 Mon Sep 17 00:00:00 2001
+From: Arne Morten Kvarving <spiff at kodi.tv>
+Date: Thu, 4 Oct 2018 16:33:47 +0200
+Subject: [PATCH 1/2] added: allow specifying datadir in settings on runtime
+
+---
+ src/libprojectM/Renderer/Renderer.cpp | 6 +++---
+ src/libprojectM/Renderer/Renderer.hpp | 3 ++-
+ src/libprojectM/Renderer/TextureManager.cpp | 8 +++++---
+ src/libprojectM/Renderer/TextureManager.hpp | 3 ++-
+ src/libprojectM/projectM.cpp | 6 ++++--
+ src/libprojectM/projectM.hpp | 1 +
+ 6 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp
+index 82ae81ac..5da27fcb 100644
+--- a/src/libprojectM/Renderer/Renderer.cpp
++++ b/src/libprojectM/Renderer/Renderer.cpp
+@@ -20,9 +20,9 @@ Pipeline* Renderer::currentPipe;
+ class Preset;
+
+ Renderer::Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string _presetURL,
+- std::string _titlefontURL, std::string _menufontURL) :
++ std::string _titlefontURL, std::string _menufontURL, const std::string& datadir) :
+ title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), presetURL(_presetURL), m_presetName("None"), vw(width),
+- vh(height), mesh(gx, gy)
++ vh(height), mesh(gx, gy), m_datadir(datadir)
+ {
+ this->totalframes = 1;
+ this->noSwitch = false;
+@@ -463,7 +463,7 @@ void Renderer::reset(int w, int h)
+ if (textureManager != NULL) {
+ delete textureManager;
+ }
+- textureManager = new TextureManager(presetURL, texsizeX, texsizeY);
++ textureManager = new TextureManager(presetURL, texsizeX, texsizeY, m_datadir);
+
+ shaderEngine.setParams(texsizeX, texsizeY, beatDetect, textureManager);
+ shaderEngine.reset();
+diff --git a/src/libprojectM/Renderer/Renderer.hpp b/src/libprojectM/Renderer/Renderer.hpp
+index f525c7c4..7d2c00e6 100644
+--- a/src/libprojectM/Renderer/Renderer.hpp
++++ b/src/libprojectM/Renderer/Renderer.hpp
+@@ -67,7 +67,7 @@ class Renderer
+ float m_fInvAspectX;
+ float m_fInvAspectY;
+
+- Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL);
++ Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL, const std::string& datadir = "");
+ ~Renderer();
+
+ void RenderFrame(const Pipeline &pipeline, const PipelineContext &pipelineContext);
+@@ -98,6 +98,7 @@ class Renderer
+ //per pixel equation variables
+ ShaderEngine shaderEngine;
+ std::string m_presetName;
++ std::string m_datadir;
+
+ float* p;
+
+diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
+index 29058382..b87196a4 100644
+--- a/src/libprojectM/Renderer/TextureManager.cpp
++++ b/src/libprojectM/Renderer/TextureManager.cpp
+@@ -29,7 +29,7 @@
+ #define NUM_BLUR_TEX 6
+
+
+-TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX, const int texsizeY):
++TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX, const int texsizeY, std::string datadir):
+ presetsURL(_presetsURL)
+ {
+ extensions.push_back(".jpg");
+@@ -40,9 +40,11 @@ TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX
+ extensions.push_back(".dib");
+
+ Preload();
++ if (datadir.empty())
++ datadir = DATADIR_PATH;
+
+- loadTextureDir(std::string(DATADIR_PATH) + "/presets");
+- loadTextureDir(std::string(DATADIR_PATH) + "/textures");
++ loadTextureDir(datadir + "/presets");
++ loadTextureDir(datadir + "/textures");
+ loadTextureDir(_presetsURL);
+
+ // Create main texture ans associated samplers
+diff --git a/src/libprojectM/Renderer/TextureManager.hpp b/src/libprojectM/Renderer/TextureManager.hpp
+index b1a79824..10b68e67 100644
+--- a/src/libprojectM/Renderer/TextureManager.hpp
++++ b/src/libprojectM/Renderer/TextureManager.hpp
+@@ -23,7 +23,8 @@ class TextureManager
+ std::vector<std::string> extensions;
+
+ public:
+- TextureManager(std::string _presetsURL, const int texsizeX, const int texsizeY);
++ TextureManager(std::string _presetsURL, const int texsizeX, const int texsizeY,
++ std::string datadir = "");
+ ~TextureManager();
+
+ void Clear();
+diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
+index 00377a50..c9645231 100755
+--- a/src/libprojectM/projectM.cpp
++++ b/src/libprojectM/projectM.cpp
+@@ -267,6 +267,7 @@ void projectM::readSettings (const Settings & settings )
+ _settings.titleFontURL = settings.titleFontURL;
+ _settings.menuFontURL = settings.menuFontURL;
+ _settings.shuffleEnabled = settings.shuffleEnabled;
++ _settings.datadir = settings.datadir;
+
+ _settings.easterEgg = settings.easterEgg;
+
+@@ -512,7 +513,7 @@ static void *thread_callback(void *prjm) {
+ mspf= ( int ) ( 1000.0/ ( float ) _settings.fps );
+ else mspf = 0;
+
+- this->renderer = new Renderer ( width, height, gx, gy, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL );
++ this->renderer = new Renderer ( width, height, gx, gy, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL, settings().datadir );
+
+ running = true;
+
+@@ -931,7 +932,8 @@ void projectM::changeTextureSize(int size) {
+ renderer = new Renderer(_settings.windowWidth, _settings.windowHeight,
+ _settings.meshX, _settings.meshY,
+ beatDetect, _settings.presetURL,
+- _settings.titleFontURL, _settings.menuFontURL);
++ _settings.titleFontURL, _settings.menuFontURL,
++ _settings.datadir);
+ }
+
+ void projectM::changePresetDuration(int seconds) {
+diff --git a/src/libprojectM/projectM.hpp b/src/libprojectM/projectM.hpp
+index f9f07835..014c4594 100755
+--- a/src/libprojectM/projectM.hpp
++++ b/src/libprojectM/projectM.hpp
+@@ -128,6 +128,7 @@ class DLLEXPORT projectM
+ std::string presetURL;
+ std::string titleFontURL;
+ std::string menuFontURL;
++ std::string datadir;
+ int smoothPresetDuration;
+ int presetDuration;
+ float beatSensitivity;
+
+From 2301aaabfe377c875821450b1d93cb8abfa1b711 Mon Sep 17 00:00:00 2001
+From: Arne Morten Kvarving <arne.morten.kvarving at sintef.no>
+Date: Mon, 15 Oct 2018 15:24:14 +0200
+Subject: [PATCH 2/2] fixup! added: allow specifying datadir in settings on
+ runtime
+
+---
+ src/libprojectM/Renderer/TextureManager.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
+index b87196a4..146f9318 100644
+--- a/src/libprojectM/Renderer/TextureManager.cpp
++++ b/src/libprojectM/Renderer/TextureManager.cpp
+@@ -40,6 +40,8 @@ TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX
+ extensions.push_back(".dib");
+
+ Preload();
++ // if not data directory specified from user code
++ // we use the built-in default directory (unix prefix based)
+ if (datadir.empty())
+ datadir = DATADIR_PATH;
+
Copied: projectm/repos/community-testing-x86_64/PKGBUILD (from rev 435550, projectm/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2019-02-24 21:29:41 UTC (rev 435551)
@@ -0,0 +1,62 @@
+# Maintainer: Giancarlo Razzolini <grazzolini at archlinux.org>
+# Contributor: 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-sdl' 'projectm-pulseaudio')
+pkgver=3.1.0
+pkgrel=4
+arch=('x86_64')
+url='https://github.com/projectM-visualizer/projectm'
+license=('LGPL')
+makedepends=('mesa-libgl' 'glm' 'qt5-base' 'ftgl' 'glew' 'sdl2' 'libpulse')
+source=("https://github.com/projectM-visualizer/$pkgbase/releases/download/v$pkgver/projectM-$pkgver.tar.gz"
+ '112.patch')
+sha256sums=('36f67c362d5fa405d73f938c183d8c4a27d1ee6058a68b66c11ace2e89f97da8'
+ '063c22113fb4518eba847b3d293b68e0c0ada45b6c9893bd7de17a3416fb0753')
+
+prepare() {
+ cd "projectM-$pkgver"
+ patch -p1 -i "$srcdir/112.patch"
+}
+
+build() {
+ cd "projectM-$pkgver"
+ ./configure --prefix=/usr --enable-sdl --enable-threading --enable-qt
+ make
+}
+
+package_projectm() {
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
+ depends=('libgl' 'glm' 'ftgl' 'glew')
+
+
+ cd "$srcdir/projectM-$pkgver"
+ make DESTDIR="$pkgdir" install-data-am
+ cd "$srcdir/projectM-$pkgver/src"
+ make DESTDIR="$pkgdir" install-am
+ cd "$srcdir/projectM-$pkgver/src/libprojectM"
+ make DESTDIR="$pkgdir" install
+ cd "$srcdir/projectM-$pkgver/src/NativePresets"
+ make DESTDIR="$pkgdir" install
+
+ find "$pkgdir" -iname "\.*" -delete
+}
+
+package_projectm-sdl() {
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering (sdl)'
+ depends=('projectm' 'sdl2')
+
+ cd "$srcdir/projectM-$pkgver/src/projectM-sdl"
+ make DESTDIR="$pkgdir" install
+}
+
+package_projectm-pulseaudio() {
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering (pulseaudio)'
+ depends=('projectm' 'qt5-base' 'libpulse')
+
+ cd "$srcdir/projectM-$pkgver/src/projectM-pulseaudio"
+ make DESTDIR="$pkgdir" install
+}
Copied: projectm/repos/community-testing-x86_64/projectm-gcc6.patch (from rev 435550, projectm/trunk/projectm-gcc6.patch)
===================================================================
--- community-testing-x86_64/projectm-gcc6.patch (rev 0)
+++ community-testing-x86_64/projectm-gcc6.patch 2019-02-24 21:29:41 UTC (rev 435551)
@@ -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-testing-x86_64/projectm-install-vera-ttf.patch (from rev 435550, projectm/trunk/projectm-install-vera-ttf.patch)
===================================================================
--- community-testing-x86_64/projectm-install-vera-ttf.patch (rev 0)
+++ community-testing-x86_64/projectm-install-vera-ttf.patch 2019-02-24 21:29:41 UTC (rev 435551)
@@ -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-testing-x86_64/projectm-test-opengl.patch (from rev 435550, projectm/trunk/projectm-test-opengl.patch)
===================================================================
--- community-testing-x86_64/projectm-test-opengl.patch (rev 0)
+++ community-testing-x86_64/projectm-test-opengl.patch 2019-02-24 21:29:41 UTC (rev 435551)
@@ -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