summaryrefslogtreecommitdiff
path: root/media-libs/libprojectm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-11-18 09:38:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-11-18 09:38:27 +0000
commit536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree697733f5cb713908dcf378e13fd15a798a906a91 /media-libs/libprojectm
parentf65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
gentoo resync : 18.11.2018
Diffstat (limited to 'media-libs/libprojectm')
-rw-r--r--media-libs/libprojectm/Manifest6
-rw-r--r--media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch149
-rw-r--r--media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild55
-rw-r--r--media-libs/libprojectm/libprojectm-9999.ebuild51
-rw-r--r--media-libs/libprojectm/metadata.xml9
5 files changed, 268 insertions, 2 deletions
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 08312215ebc6..cfe1ca230b45 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,6 +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.0.tar.gz 52123464 BLAKE2B 9027adbbbd3458b0ac6c2a822b06d25965ee90f6764095d7f509a578c52127899caf886fd2eea5cec1c3f566580766442faade8f8964fb1cfe2abf8d41ffc547 SHA512 79216b227808d14ca3f897fd33247ead27c48b734475dc507272ba192b8f239683a28cbf89b5c4fb420ed2b90f936c8dfddd545ee000caf2471fb596f867ba66
DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
EBUILD libprojectm-2.1.0-r2.ebuild 1491 BLAKE2B 080aca7bcfebd5b2555803ba5d6482612c564c790dba661cafef7af8414209f5896a5113f9d37719cc9937c3535b4dccffa890f4607e3301899bf7c1573b72d6 SHA512 9cd52fcc3df6926b9ff315c4f077f6fee597c35a75903f136e91c5091e4b37fbed9f6fed341af6d105eb8a857e0a236c3bf20e2b4511e22902d98fca6b361c7d
-MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
+EBUILD libprojectm-3.1.0-r1.ebuild 1123 BLAKE2B 60dc5c75530f3bd25bb46b98ec9915639eae685b256a565cd1fd2a57c220ba0b4e7558addb45793612e8b186a0ae5cd43df835052f8971593551f2ae71cd1a8a SHA512 8f5715322dfb210858949adc0c045e85df98ac7665546ab16db4b3002fd7e4b77232fd51b6ddf338646fa00140130cfbaa2794b4120f83c17e35e6c5398ee982
+EBUILD libprojectm-9999.ebuild 1081 BLAKE2B 1ea51cf766d16945340bb93f297ee726932e99f5c8ab1201871e009109c861f5acc1086404ec2c09dc44d0fcd6031b46d6b38f4195cfec57ef0befe8ad0a87be SHA512 5d744f41a29111f47dbd483c0f0d436b6a9bffb8b1586acee8150292b19865d4a8a9c5a75b9e14de3d6805a65c39909f388a33059819d8619b1f2aa560a5fb68
+MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch b/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch
new file mode 100644
index 000000000000..8968f512baec
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-3.1.0-datadir.patch
@@ -0,0 +1,149 @@
+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-3.1.0-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..bd704657cdc9
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ S=${WORKDIR}/projectm-${PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+ media-libs/glm
+ media-libs/mesa
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtopengl:5
+ media-sound/pulseaudio
+ )
+ sdl? ( >=media-libs/libsdl2-2.0.5 )
+ sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-datadir.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable gles2 gles ) \
+ $(use_enable qt5 qt ) \
+ $(use_enable sdl ) \
+ --enable-emscripten=no
+}
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
new file mode 100644
index 000000000000..26589f453934
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ S=${WORKDIR}/projectm-${PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+ media-libs/glm
+ media-libs/mesa
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtopengl:5
+ media-sound/pulseaudio
+ )
+ sdl? ( >=media-libs/libsdl2-2.0.5 )
+ sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable gles2 gles ) \
+ $(use_enable qt5 qt ) \
+ $(use_enable sdl ) \
+ --enable-emscripten=no
+}
diff --git a/media-libs/libprojectm/metadata.xml b/media-libs/libprojectm/metadata.xml
index 4b7d1d427e51..4e2e1928113d 100644
--- a/media-libs/libprojectm/metadata.xml
+++ b/media-libs/libprojectm/metadata.xml
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
<maintainer type="project">
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
+ <use>
+ <flag name="gles2">Provide support for OpenGL ES 2 and 3</flag>
+ </use>
<upstream>
- <remote-id type="sourceforge">projectm</remote-id>
+ <remote-id type="github">projectM-visualizer/projectm</remote-id>
</upstream>
</pkgmetadata>