* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/
@ 2020-02-11 15:00 Craig Andrews
0 siblings, 0 replies; 3+ messages in thread
From: Craig Andrews @ 2020-02-11 15:00 UTC (permalink / raw
To: gentoo-commits
commit: 81db23aa7c5f9ac5f145f3cc6cec996be5f5acdf
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 11 14:20:00 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 15:00:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81db23aa
media-libs/libprojectm: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14625
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../files/libprojectm-3.1.0-datadir.patch | 149 ---------------------
1 file changed, 149 deletions(-)
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch b/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch
deleted file mode 100644
index 8968f512bae..00000000000
--- a/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-https://github.com/projectM-visualizer/projectm/pull/112
-diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp
-index 82ae81a..5da27fc 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 f525c7c..7d2c00e 100644
---- a/src/libprojectM/Renderer/Renderer.hpp
-+++ b/src/libprojectM/Renderer/Renderer.hpp
-@@ -67,7 +67,7 @@ public:
- 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 @@ private:
- //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 2905838..b87196a 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 b1a7982..10b68e6 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 00377a5..bb71aa0 100755
---- a/src/libprojectM/projectM.cpp
-+++ b/src/libprojectM/projectM.cpp
-@@ -134,7 +134,7 @@ beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pip
-
- }
-
--projectM::projectM(Settings settings, int flags):
-+projectM::projectM(Settings& settings, int flags):
- beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()), _pipelineContext2(new PipelineContext()),
- timeKeeper(NULL), _matcher(NULL), _merger(NULL)
- {
-@@ -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 7339c8f..de7cd1d 100755
---- a/src/libprojectM/projectM.hpp
-+++ b/src/libprojectM/projectM.hpp
-@@ -128,6 +128,7 @@ public:
- std::string presetURL;
- std::string titleFontURL;
- std::string menuFontURL;
-+ std::string datadir;
- int smoothPresetDuration;
- int presetDuration;
- float beatSensitivity;
-@@ -153,7 +154,7 @@ public:
- };
-
- projectM(std::string config_file, int flags = FLAG_NONE);
-- projectM(Settings settings, int flags = FLAG_NONE);
-+ projectM(Settings& settings, int flags = FLAG_NONE);
-
- //DLLEXPORT projectM(int gx, int gy, int fps, int texsize, int width, int height,std::string preset_url,std::string title_fonturl, std::string title_menuurl);
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/
@ 2020-08-10 23:14 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-08-10 23:14 UTC (permalink / raw
To: gentoo-commits
commit: f01561a0637d7f36bac3cef0a2533ee8dcbc2a37
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Aug 3 17:00:36 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 23:13:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01561a0
media-libs/libprojectm: remove unused patch
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16981
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/libprojectm-3.1.3-bashisms.patch | 47 ----------------------
1 file changed, 47 deletions(-)
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
deleted file mode 100644
index 8d84ece802c..00000000000
--- a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 14 May 2020 11:46:50 +0200
-Subject: [PATCH] configure.ac: Avoid bashisms
-
-or else we end up like this:
-
- ./configure: 18902: ./configure: Syntax error: redirection unexpected
-
-or
-
- ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found
- ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found
-
-Gentoo-bug: https://bugs.gentoo.org/714098
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5fa53eca5..ecf85e076 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local])
-
- AC_PROG_MKDIR_P
-
--AS_IF([grep android <<< ${host}], [],
-+AS_IF([echo ${host} | grep -Fq android], [],
- [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [
- CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
- ])
-@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"])
- AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"])
-
-
--my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
-+my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits"
- #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
--my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" '
--my_CFLAGS+='-I$(top_srcdir)/vendor '
-+my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\""
-+my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor"
- AC_SUBST([my_CFLAGS])
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/
@ 2024-06-30 0:00 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-06-30 0:00 UTC (permalink / raw
To: gentoo-commits
commit: a092a8b6b74d77ba0472b87b9416c49edc1e0145
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun 29 09:19:14 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 23:56:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a092a8b6
media-libs/libprojectm: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch | 13 -------------
.../files/libprojectm-4.1.0-patch-include-dir.patch | 14 --------------
2 files changed, 27 deletions(-)
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch b/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch
deleted file mode 100644
index 874d22aab6d0..000000000000
--- a/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Unable to replicate error myself, but fix for https://bugs.gentoo.org/792204
-from https://github.com/projectM-visualizer/projectm/issues/449
-diff '--color=auto' -ru a/src/projectM-qt/qprojectmwidget.hpp b/src/projectM-qt/qprojectmwidget.hpp
---- a/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:48:30.825008203 -0000
-+++ b/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:49:03.265800570 -0000
-@@ -23,6 +23,7 @@
- #define QPROJECTM_WIDGET_HPP
-
- #include <iostream>
-+#include <GL/gl.h>
- #include "qprojectm.hpp"
- #include <QGLWidget>
- #include <QMutex>
diff --git a/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch b/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch
deleted file mode 100644
index 5bb0ac6507ba..000000000000
--- a/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:13:12.614370496 +0100
-+++ b/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:10:54.700987578 +0100
-@@ -22,8 +22,10 @@
- )
-
- target_include_directories(SOIL2
-- PUBLIC
-+ PRIVATE
- "."
-+ PUBLIC
-+ "${CMAKE_CURRENT_SOURCE_DIR}/.."
- )
-
- target_link_libraries(SOIL2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-30 0:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-11 15:00 [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/ Craig Andrews
-- strict thread matches above, loose matches on Subject: below --
2020-08-10 23:14 Aaron Bauman
2024-06-30 0:00 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox