gentoo resync : 17.02.2020

3 files changed, 2 insertions, 152 deletions

diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 46949b5ef409..0779a231e501 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,11 +1,10 @@
 AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
-AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
 DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1475 BLAKE2B e5e37491cb53dc2dbf3977b7b3590e5a717ccef46369525faaf48b882043ecfc03b1430e52562dc65ac3b78d39a1d43cf1aad374f7eac42c7d1549ab45987e3c SHA512 80a29679f901daf04261de929e32c8f26233b3fabd8dbb999284040319f16b322071f42d5a8f1f659f6a5a05ceccf4b799a319aef88f370b95137f21baa76169
+EBUILD libprojectm-2.1.0-r2.ebuild 1475 BLAKE2B 03c29d4510f0817b551f2a0b289fc1bb5351cc4005173e3920e9790258b53c735c1e967f53b51238a9f3c76ec08ba9a84a8042eb0e67376397bca74ffd5612e3 SHA512 78b0f4671b2be63a9cb0e95edd43fa6f19b028eba00b73d9618744397150e4af76e9bd533ca9a0b40bef94a83ce2f5ed8d364864a100c94620f12f63ccca0f85
 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 EBUILD libprojectm-3.1.2.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 EBUILD libprojectm-9999.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
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 8968f512baec..000000000000
--- 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);
- 
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 23674c8e38ed..a77d2df57d67 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6