-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from AlwinEsch/Matrix-change
[Matrix] API related update and libprojectm to version 3.7
- Loading branch information
Showing
23 changed files
with
61 additions
and
840 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.0 (quilt) | ||
3.0 (native) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
8709d7bce65c78d56a546820762a6ede6d7c144695fd1d200e972f38740e9db9 | ||
30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
projectm https://github.com/projectM-visualizer/projectm/releases/download/v3.1.2/projectM-src-3.1.2.tar.gz | ||
projectm https://github.com/projectM-visualizer/projectm/releases/download/v3.1.7/projectM-3.1.7.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,3 @@ | ||
From: Alwin Esch <[email protected]> | ||
Date: Fri, 4 Oct 2019 22:29:37 +0200 | ||
Subject: [PATCH] kodi cmake fixes | ||
|
||
--- | ||
config.h | 105 ++++++++++++++++++++++++++++++++++ | ||
src/libprojectM/config.inp.in | 22 +++++++ | ||
2 files changed, 127 insertions(+) | ||
create mode 100644 config.h | ||
create mode 100644 src/libprojectM/config.inp.in | ||
|
||
diff --git a/config.h b/config.h | ||
new file mode 100644 | ||
index 0000000..c54a297 | ||
--- /dev/null | ||
+++ b/config.h | ||
@@ -0,0 +1,105 @@ | ||
|
@@ -91,7 +77,7 @@ index 0000000..c54a297 | |
+#define PACKAGE_NAME "projectM" | ||
+ | ||
+/* Define to the full name and version of this package. */ | ||
+#define PACKAGE_STRING "projectM 3.1.1-rc4" | ||
+#define PACKAGE_STRING "projectM 3.1.7" | ||
+ | ||
+/* Define to the one symbol short name of this package. */ | ||
+#define PACKAGE_TARNAME "projectM" | ||
|
@@ -100,7 +86,7 @@ index 0000000..c54a297 | |
+#define PACKAGE_URL "https://github.com/projectM-visualizer/projectm/" | ||
+ | ||
+/* Define to the version of this package. */ | ||
+#define PACKAGE_VERSION "3.1.1-rc4" | ||
+#define PACKAGE_VERSION "3.1.7" | ||
+ | ||
+/* Define to necessary symbol if this constant uses a non-standard name on | ||
+ your system. */ | ||
|
@@ -116,13 +102,10 @@ index 0000000..c54a297 | |
+#define USE_THREADS 1 | ||
+ | ||
+/* Version number of package */ | ||
+#define VERSION "3.1.1-rc4" | ||
+#define VERSION "3.1.7" | ||
+ | ||
+/* Define to 1 if the X Window System is missing or not being used. */ | ||
+#define X_DISPLAY_MISSING 1 | ||
diff --git a/src/libprojectM/config.inp.in b/src/libprojectM/config.inp.in | ||
new file mode 100644 | ||
index 0000000..d87d9a2 | ||
--- /dev/null | ||
+++ b/src/libprojectM/config.inp.in | ||
@@ -0,0 +1,22 @@ | ||
|
@@ -148,6 +131,3 @@ index 0000000..d87d9a2 | |
+Preset Path = @DATADIR@/projectM/presets # preset location | ||
+Title Font = Vera.ttf | ||
+Menu Font = VeraMono.ttf | ||
-- | ||
2.20.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,6 @@ | ||
From 8fcba9e6cc58d8fc5fac4fa740ecd2b523777a06 Mon Sep 17 00:00:00 2001 | ||
From: Alwin Esch <[email protected]> | ||
Date: Sat, 5 Oct 2019 01:52:11 +0200 | ||
Subject: [PATCH] add angle to GL include and become Win working | ||
|
||
--- | ||
src/libprojectM/Renderer/ShaderEngine.cpp | 2 +- | ||
src/libprojectM/Renderer/TextureManager.cpp | 1 + | ||
src/libprojectM/projectM-opengl.h | 4 ++++ | ||
3 files changed, 6 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp | ||
index b486d14..6abf572 100755 | ||
--- a/src/libprojectM/Renderer/ShaderEngine.cpp | ||
+++ b/src/libprojectM/Renderer/ShaderEngine.cpp | ||
@@ -1224,7 +1224,7 @@ void ShaderEngine::reset() | ||
@@ -1226,7 +1226,7 @@ void ShaderEngine::reset() | ||
|
||
GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode, const std::string & FragmentShaderCode, const std::string & shaderTypeString){ | ||
|
||
|
@@ -22,25 +9,11 @@ index b486d14..6abf572 100755 | |
GLenum err = glewInit(); | ||
#endif /** WIN32 */ | ||
|
||
diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp | ||
index 3d3bb17..940edf2 100755 | ||
--- a/src/libprojectM/Renderer/TextureManager.cpp | ||
+++ b/src/libprojectM/Renderer/TextureManager.cpp | ||
@@ -8,6 +8,7 @@ | ||
|
||
#ifdef WIN32 | ||
#include "dirent.h" | ||
+#include <minmax.h> | ||
#endif | ||
|
||
#ifdef __unix__ | ||
diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h | ||
index 3e565f2..9c34192 100755 | ||
--- a/src/libprojectM/projectM-opengl.h | ||
+++ b/src/libprojectM/projectM-opengl.h | ||
@@ -30,8 +30,12 @@ | ||
#include <EGL/eglext.h> | ||
@@ -32,8 +32,12 @@ | ||
#elif defined(_WIN32) | ||
#define GLM_FORCE_CXX03 | ||
# include <windows.h> | ||
+#if defined(HAS_ANGLE) | ||
+#include <angle_gl.h> | ||
|
@@ -51,6 +24,3 @@ index 3e565f2..9c34192 100755 | |
#else /* linux/unix/other */ | ||
# ifdef USE_GLES | ||
# include <GLES3/gl3.h> | ||
-- | ||
2.21.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,3 @@ | ||
From ae10f96e828797b7e30dbead26d4728b37779047 Mon Sep 17 00:00:00 2001 | ||
From: Alwin Esch <[email protected]> | ||
Date: Sat, 5 Oct 2019 02:10:46 +0200 | ||
Subject: [PATCH] change SOIL2 to use on angle | ||
|
||
--- | ||
src/libprojectM/Renderer/SOIL2/SOIL2.c | 20 ++++++++++++++++++-- | ||
1 file changed, 18 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/libprojectM/Renderer/SOIL2/SOIL2.c b/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
index 64dbf27..00382a9 100755 | ||
--- a/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
+++ b/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
@@ -33,7 +33,7 @@ | ||
|
@@ -65,6 +54,3 @@ index 64dbf27..00382a9 100755 | |
} | ||
/* let the user know if we can do cubemaps or not */ | ||
return has_cubemap_capability; | ||
-- | ||
2.21.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
8709d7bce65c78d56a546820762a6ede6d7c144695fd1d200e972f38740e9db9 | ||
30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
projectm https://github.com/projectM-visualizer/projectm/releases/download/v3.1.2/projectM-src-3.1.2.tar.gz | ||
projectm https://github.com/projectM-visualizer/projectm/releases/download/v3.1.7/projectM-3.1.7.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,3 @@ | ||
From: Alwin Esch <[email protected]> | ||
Date: Fri, 4 Oct 2019 22:29:37 +0200 | ||
Subject: [PATCH] kodi cmake fixes | ||
|
||
--- | ||
config.h | 105 ++++++++++++++++++++++++++++++++++ | ||
src/libprojectM/config.inp.in | 22 +++++++ | ||
2 files changed, 127 insertions(+) | ||
create mode 100644 config.h | ||
create mode 100644 src/libprojectM/config.inp.in | ||
|
||
diff --git a/config.h b/config.h | ||
new file mode 100644 | ||
index 0000000..c54a297 | ||
--- /dev/null | ||
+++ b/config.h | ||
@@ -0,0 +1,105 @@ | ||
|
@@ -91,7 +77,7 @@ index 0000000..c54a297 | |
+#define PACKAGE_NAME "projectM" | ||
+ | ||
+/* Define to the full name and version of this package. */ | ||
+#define PACKAGE_STRING "projectM 3.1.1-rc4" | ||
+#define PACKAGE_STRING "projectM 3.1.7" | ||
+ | ||
+/* Define to the one symbol short name of this package. */ | ||
+#define PACKAGE_TARNAME "projectM" | ||
|
@@ -100,7 +86,7 @@ index 0000000..c54a297 | |
+#define PACKAGE_URL "https://github.com/projectM-visualizer/projectm/" | ||
+ | ||
+/* Define to the version of this package. */ | ||
+#define PACKAGE_VERSION "3.1.1-rc4" | ||
+#define PACKAGE_VERSION "3.1.7" | ||
+ | ||
+/* Define to necessary symbol if this constant uses a non-standard name on | ||
+ your system. */ | ||
|
@@ -116,13 +102,10 @@ index 0000000..c54a297 | |
+#define USE_THREADS 1 | ||
+ | ||
+/* Version number of package */ | ||
+#define VERSION "3.1.1-rc4" | ||
+#define VERSION "3.1.7" | ||
+ | ||
+/* Define to 1 if the X Window System is missing or not being used. */ | ||
+#define X_DISPLAY_MISSING 1 | ||
diff --git a/src/libprojectM/config.inp.in b/src/libprojectM/config.inp.in | ||
new file mode 100644 | ||
index 0000000..d87d9a2 | ||
--- /dev/null | ||
+++ b/src/libprojectM/config.inp.in | ||
@@ -0,0 +1,22 @@ | ||
|
@@ -148,6 +131,3 @@ index 0000000..d87d9a2 | |
+Preset Path = @DATADIR@/projectM/presets # preset location | ||
+Title Font = Vera.ttf | ||
+Menu Font = VeraMono.ttf | ||
-- | ||
2.20.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,6 @@ | ||
From 8fcba9e6cc58d8fc5fac4fa740ecd2b523777a06 Mon Sep 17 00:00:00 2001 | ||
From: Alwin Esch <[email protected]> | ||
Date: Sat, 5 Oct 2019 01:52:11 +0200 | ||
Subject: [PATCH] add angle to GL include and become Win working | ||
|
||
--- | ||
src/libprojectM/Renderer/ShaderEngine.cpp | 2 +- | ||
src/libprojectM/Renderer/TextureManager.cpp | 1 + | ||
src/libprojectM/projectM-opengl.h | 4 ++++ | ||
3 files changed, 6 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp | ||
index b486d14..6abf572 100755 | ||
--- a/src/libprojectM/Renderer/ShaderEngine.cpp | ||
+++ b/src/libprojectM/Renderer/ShaderEngine.cpp | ||
@@ -1224,7 +1224,7 @@ void ShaderEngine::reset() | ||
@@ -1226,7 +1226,7 @@ void ShaderEngine::reset() | ||
|
||
GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode, const std::string & FragmentShaderCode, const std::string & shaderTypeString){ | ||
|
||
|
@@ -22,25 +9,11 @@ index b486d14..6abf572 100755 | |
GLenum err = glewInit(); | ||
#endif /** WIN32 */ | ||
|
||
diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp | ||
index 3d3bb17..940edf2 100755 | ||
--- a/src/libprojectM/Renderer/TextureManager.cpp | ||
+++ b/src/libprojectM/Renderer/TextureManager.cpp | ||
@@ -8,6 +8,7 @@ | ||
|
||
#ifdef WIN32 | ||
#include "dirent.h" | ||
+#include <minmax.h> | ||
#endif | ||
|
||
#ifdef __unix__ | ||
diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h | ||
index 3e565f2..9c34192 100755 | ||
--- a/src/libprojectM/projectM-opengl.h | ||
+++ b/src/libprojectM/projectM-opengl.h | ||
@@ -30,8 +30,12 @@ | ||
#include <EGL/eglext.h> | ||
@@ -32,8 +32,12 @@ | ||
#elif defined(_WIN32) | ||
#define GLM_FORCE_CXX03 | ||
# include <windows.h> | ||
+#if defined(HAS_ANGLE) | ||
+#include <angle_gl.h> | ||
|
@@ -51,6 +24,3 @@ index 3e565f2..9c34192 100755 | |
#else /* linux/unix/other */ | ||
# ifdef USE_GLES | ||
# include <GLES3/gl3.h> | ||
-- | ||
2.21.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,3 @@ | ||
From ae10f96e828797b7e30dbead26d4728b37779047 Mon Sep 17 00:00:00 2001 | ||
From: Alwin Esch <[email protected]> | ||
Date: Sat, 5 Oct 2019 02:10:46 +0200 | ||
Subject: [PATCH] change SOIL2 to use on angle | ||
|
||
--- | ||
src/libprojectM/Renderer/SOIL2/SOIL2.c | 20 ++++++++++++++++++-- | ||
1 file changed, 18 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/libprojectM/Renderer/SOIL2/SOIL2.c b/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
index 64dbf27..00382a9 100755 | ||
--- a/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
+++ b/src/libprojectM/Renderer/SOIL2/SOIL2.c | ||
@@ -33,7 +33,7 @@ | ||
|
@@ -65,6 +54,3 @@ index 64dbf27..00382a9 100755 | |
} | ||
/* let the user know if we can do cubemaps or not */ | ||
return has_cubemap_capability; | ||
-- | ||
2.21.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
8709d7bce65c78d56a546820762a6ede6d7c144695fd1d200e972f38740e9db9 | ||
30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3 |
Oops, something went wrong.