Skip to content
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
88 changes: 88 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: DontAlign
AlignOperands: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 100
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<[a-z0-9_]+>$'
Priority: 3
- Regex: '^<(assert|complex|ctype|errno|fenv|float|inttypes|iso646|limits|locale|math|setjmp|signal|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|tgmath|threads|time|uchar|wchar|wctype)\.h>$'
Priority: 3
- Regex: '^<'
Priority: 3
- Regex: '^["<](kodi|p8-platform)\/.*\.h[">]$'
Priority: 2
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '$'
IndentCaseLabels: true
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60000
PointerAlignment: Left
ReflowComments: false
SortIncludes: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
...
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.18)
project(visualization.projectm)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
Expand Down Expand Up @@ -27,7 +27,6 @@ include_directories(${includes}

set(PM_SOURCES src/Main.cpp)
set(PM_HEADERS src/Main.h)
set(PM_CUSTOM_DATA ${PROJECTM_PKGDATADIR})

build_addon(visualization.projectm PM DEPLIBS)

Expand Down
5 changes: 3 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: http://dep.debian.net/deps/dep5
Upstream-Name: visualization.projectm

Files: *
Copyright: 2005-2021 Team Kodi
Copyright: 2005-2026 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -22,7 +22,8 @@ License: GPL-2+


Files: debian/*
Copyright: 2013 Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Copyright: 2013-2026 Team Kodi
2013 Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
2013 wsnipex <wsnipex@a1.net>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
Expand Down
25 changes: 25 additions & 0 deletions depends/common/projectm/0003-mac-hack-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From dc764c765c61dcc8feb91834baa2c9ea7bd232d0 Mon Sep 17 00:00:00 2001
From: Alwin Esch <alwin.esch@web.de>
Date: Sun, 24 May 2026 00:31:59 +0200
Subject: [PATCH] Hack fix about macOS, as add-on link GL libs does it work

---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a62e8df..dd0f9fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AS_IF([test "x$enable_emscripten" = "xyes" || test "x$EMSCRIPTEN" = "xyes"], [
enable_sdl=yes
], [
dnl Running in a normal OS (not emscripten)
- AX_CHECK_GL
+ # AX_CHECK_GL

# check OS if mac or linux
AC_CANONICAL_HOST
--
2.39.5 (Apple Git-154)

45 changes: 45 additions & 0 deletions depends/common/projectm/0004-fix-iOS-and-tvOS-GLES-include.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From 3309fc80e5e3dd13e53a714f41ea154234c000e1 Mon Sep 17 00:00:00 2001
From: Alwin Esch <alwin.esch@web.de>
Date: Sun, 24 May 2026 02:08:40 +0200
Subject: [PATCH] fix iOS and tvOS GLES include

---
src/libprojectM/projectM-opengl.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h
index 001008c..9cb6d94 100644
--- a/src/libprojectM/projectM-opengl.h
+++ b/src/libprojectM/projectM-opengl.h
@@ -18,8 +18,13 @@
#define DUMP_SHADERS_ON_ERROR 0

#ifdef __APPLE__
-# include <OpenGL/gl3.h>
-# include <OpenGL/gl3ext.h>
+# ifndef USE_GLES
+# include <OpenGL/gl3.h>
+# include <OpenGL/gl3ext.h>
+# else
+# include <OpenGLES/ES3/gl.h>
+# include <OpenGLES/ES3/glext.h>
+# endif
#elif defined(EYETUNE_WINRT)
#define GL_GLEXT_PROTOTYPES
#define GLM_FORCE_CXX03
@@ -32,8 +37,12 @@
#elif defined(_WIN32)
#define GLM_FORCE_CXX03
# include <windows.h>
+#if defined(HAS_ANGLE)
+#include <angle_gl.h>
+#else
#include "glew.h"
#include "wglew.h"
+#endif
#else /* linux/unix/other */
# ifdef USE_GLES
# include <GLES3/gl3.h>
--
2.53.0

2 changes: 1 addition & 1 deletion depends/common/projectm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.18)
project(projectm)

if (APP_RENDER_SYSTEM STREQUAL "gles")
Expand Down
2 changes: 1 addition & 1 deletion depends/windows/angle/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.18)
project(angle)

message(STATUS "Used CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
Expand Down
25 changes: 25 additions & 0 deletions depends/windows/dirent/0001-change-dirent.h-install-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 5e394b992d95e5a8ca4ba7aa3c3b91a84b8ce839 Mon Sep 17 00:00:00 2001
From: Alwin Esch <alwin.esch@web.de>
Date: Wed, 20 May 2026 10:57:05 +0200
Subject: [PATCH] change dirent.h install path

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bc6205..7b6667b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ install(
FILES
include/dirent.h
DESTINATION
- include/dirent-${DIRENT_VERSION}
+ include
COMPONENT
dev
)
--
2.53.0

2 changes: 1 addition & 1 deletion depends/windows/dirent/dirent.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4bcf07266f336bcd540fec5f75e90f027bd5081d3752f9ea5d408ef6ae30a897
6ffcc318f00be192acb611c58aa58ee0cfd96776010680d7f38cf24f3dd8baf9
2 changes: 1 addition & 1 deletion depends/windows/dirent/dirent.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dirent https://github.com/tronkko/dirent/archive/1.23.2.zip
dirent https://github.com/tronkko/dirent/archive/1.26.zip
1 change: 1 addition & 0 deletions depends/windows/dirent/flags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-DDIRENT_TESTS=OFF -DDIRENT_EXAMPLES=OFF
2 changes: 1 addition & 1 deletion depends/windows/projectm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.18)
project(libprojectM)

find_package(kodi-angle REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion depends/windowsstore/angle/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.18)
project(angle)

message(STATUS "Used CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 5e394b992d95e5a8ca4ba7aa3c3b91a84b8ce839 Mon Sep 17 00:00:00 2001
From: Alwin Esch <alwin.esch@web.de>
Date: Wed, 20 May 2026 10:57:05 +0200
Subject: [PATCH] change dirent.h install path

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bc6205..7b6667b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ install(
FILES
include/dirent.h
DESTINATION
- include/dirent-${DIRENT_VERSION}
+ include
COMPONENT
dev
)
--
2.53.0

2 changes: 1 addition & 1 deletion depends/windowsstore/dirent/dirent.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4bcf07266f336bcd540fec5f75e90f027bd5081d3752f9ea5d408ef6ae30a897
6ffcc318f00be192acb611c58aa58ee0cfd96776010680d7f38cf24f3dd8baf9
2 changes: 1 addition & 1 deletion depends/windowsstore/dirent/dirent.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dirent https://github.com/tronkko/dirent/archive/1.23.2.zip
dirent https://github.com/tronkko/dirent/archive/1.26.zip
1 change: 1 addition & 0 deletions depends/windowsstore/dirent/flags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-DDIRENT_TESTS=OFF -DDIRENT_EXAMPLES=OFF
2 changes: 1 addition & 1 deletion depends/windowsstore/projectm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.18)
project(libprojectM)

find_package(kodi-angle REQUIRED)
Expand Down
Loading