Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
cmake_minimum_required(VERSION 3.5)
project(visualization.projectm)
cmake_minimum_required(VERSION 3.21)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
project(visualization.projectm)

find_package(Kodi REQUIRED)
find_package(glm REQUIRED)
find_package(ProjectM REQUIRED)

if(NOT WIN32 AND (APP_RENDER_SYSTEM STREQUAL "gl" OR NOT APP_RENDER_SYSTEM))
find_package(OpenGl REQUIRED)
set(DEPLIBS ${OPENGL_LIBRARIES})
set(includes ${OPENGL_INCLUDE_DIR})
add_definitions(${OPENGL_DEFINITIONS})
else()
find_package(OpenGLES REQUIRED)
set(DEPLIBS ${OPENGLES_LIBRARIES})
set(includes ${OPENGLES_INCLUDE_DIR})
add_definitions(${OPENGLES_DEFINITIONS})
endif()
find_package(projectM4 REQUIRED COMPONENTS Playlist)

list(APPEND DEPLIBS ${PROJECTM_LIBRARIES})
list(APPEND DEPLIBS libprojectM::playlist)

include_directories(${includes}
${PROJECTM_INCLUDE_DIRS}
Expand Down
69 changes: 0 additions & 69 deletions FindOpenGLES.cmake

This file was deleted.

41 changes: 0 additions & 41 deletions FindOpenGl.cmake

This file was deleted.

60 changes: 0 additions & 60 deletions FindProjectM.cmake

This file was deleted.

25 changes: 0 additions & 25 deletions Findglm.cmake

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From aa810def3e6773a5385985e1369b2bfe07ecf913 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Sat, 28 Feb 2026 20:25:36 -0800
Subject: [PATCH] Stop exporting transitive OpenGL/Boost deps in CMake config

---
src/libprojectM/projectM4Config.cmake.in | 16 ----------------
1 file changed, 16 deletions(-)

diff --git a/src/libprojectM/projectM4Config.cmake.in b/src/libprojectM/projectM4Config.cmake.in
index 0b1639b1..af945194 100644
--- a/src/libprojectM/projectM4Config.cmake.in
+++ b/src/libprojectM/projectM4Config.cmake.in
@@ -4,22 +4,6 @@ set(projectM4_VERSION @PROJECT_VERSION@)

include(CMakeFindDependencyMacro)

-if(NOT "@ENABLE_EMSCRIPTEN@") # ENABLE_EMSCRIPTEN
- if("@ENABLE_GLES@") # ENABLE_GLES
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
- find_dependency(OpenGL COMPONENTS GLES3)
- else()
- find_dependency(OpenGL)
- endif()
-endif()
-if("@ENABLE_BOOST_FILESYSTEM@") # ENABLE_BOOST_FILESYSTEM
- if(POLICY CMP0167)
- cmake_policy(SET CMP0167 NEW)
- endif()
-
- find_dependency(Boost CONFIG NO_MODULE COMPONENTS Filesystem)
-endif()
-
set(_projectM4_FIND_PARTS_REQUIRED)
if(projectM4_FIND_REQUIRED)
set(_projectM4_FIND_PARTS_REQUIRED REQUIRED)
--
2.52.0

11 changes: 0 additions & 11 deletions depends/common/projectm/0001-fix-gl-compile-check.patch

This file was deleted.

14 changes: 0 additions & 14 deletions depends/common/projectm/0002-fix-clang-stdlib.patch

This file was deleted.

21 changes: 0 additions & 21 deletions depends/common/projectm/CMakeLists.txt

This file was deleted.

1 change: 1 addition & 0 deletions depends/common/projectm/flags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-DSTD_FILESYSTEM_EXISTS:BOOL=ON
1 change: 0 additions & 1 deletion depends/common/projectm/linux-deps.txt

This file was deleted.

2 changes: 1 addition & 1 deletion depends/common/projectm/projectm.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b6b99dde5c8f0822ae362606a0429628ee478f4ec943a156723841b742954707
8d0206a369f172c7a66eb4acf8291f21a8ac20124a88f2865dc126e211e83a61
2 changes: 1 addition & 1 deletion depends/common/projectm/projectm.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
projectm https://github.com/projectM-visualizer/projectm/releases/download/v3.1.12/projectM-3.1.12.tar.gz
projectm https://github.com/garbear/projectm/archive/e6bda8e744301f6395d4b4c8c5c77bfa9eae2598.tar.gz
1 change: 0 additions & 1 deletion depends/windows/dirent/dirent.sha256

This file was deleted.

1 change: 0 additions & 1 deletion depends/windows/dirent/dirent.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 0dfc2502047990e53d2c9c046184cd06beef7624 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Sat, 28 Feb 2026 19:55:58 -0800
Subject: [PATCH] Fix build with Angle on Windows

Error was:

lib/cmake/projectM4/projectM4Config.cmake:34 (find_dependency)
Could NOT find OpenGL (missing: GLES3)
---
src/libprojectM/projectM4Config.cmake.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libprojectM/projectM4Config.cmake.in b/src/libprojectM/projectM4Config.cmake.in
index 0b1639b1..cdcefe55 100644
--- a/src/libprojectM/projectM4Config.cmake.in
+++ b/src/libprojectM/projectM4Config.cmake.in
@@ -6,8 +6,13 @@ include(CMakeFindDependencyMacro)

if(NOT "@ENABLE_EMSCRIPTEN@") # ENABLE_EMSCRIPTEN
if("@ENABLE_GLES@") # ENABLE_GLES
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
- find_dependency(OpenGL COMPONENTS GLES3)
+ # On Windows desktop we may be using ANGLE/EGL for GLES.
+ # CMake's FindOpenGL(GLES3) generally fails or conflicts, so don't
+ # import an OpenGL dependency from this package config.
+ if(NOT WIN32)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+ find_dependency(OpenGL COMPONENTS GLES3)
+ endif()
else()
find_dependency(OpenGL)
endif()
--
2.52.0

Loading