From 49e5e296d1c3b58fe202079ebd39a2238ecde2a2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 16 Dec 2019 22:31:35 +0100 Subject: [PATCH 1/5] change settings.xml to new style --- screensaver.stars/resources/settings.xml | 70 +++++++++++++++++++++--- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/screensaver.stars/resources/settings.xml b/screensaver.stars/resources/settings.xml index 135e479..8dfcac1 100644 --- a/screensaver.stars/resources/settings.xml +++ b/screensaver.stars/resources/settings.xml @@ -1,8 +1,64 @@ - - - - - - - + + +
+ + + + 8000 + + 1000 + 1000 + 20000 + + + + + 1.0 + + 0.01 + 0.01 + 2.0 + + + + + 0.2 + + 0.01 + 0.01 + 1.0 + + + + + 20.0 + + 1.0 + 0.1 + 50.0 + + + + + 1.0 + + 0.1 + 0.1 + 10.0 + + + + + 1.5 + + 0.1 + 0.1 + 10.0 + + + + + +
+ From 1bf21bfb05b63b8e60c1b70c66dc1ef4875064c2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 16 Dec 2019 22:32:58 +0100 Subject: [PATCH 2/5] remove not needed virtual on class --- src/Stars.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Stars.cpp b/src/Stars.cpp index 3e3ca9d..0c0b2a1 100644 --- a/src/Stars.cpp +++ b/src/Stars.cpp @@ -48,9 +48,9 @@ class ATTRIBUTE_HIDDEN CScreensaverStars public: CScreensaverStars(); - virtual bool Start() override; - virtual void Stop() override; - virtual void Render() override; + bool Start() override; + void Stop() override; + void Render() override; private: ST_SETTINGS m_Settings; From 2bbf50c4133c4a14356ad90961cc99889ca30b2b Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 16 Dec 2019 22:35:05 +0100 Subject: [PATCH 3/5] cleanup description on FindOpenGLES.cmake --- FindOpenGLES.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/FindOpenGLES.cmake b/FindOpenGLES.cmake index f19eb62..75ad596 100644 --- a/FindOpenGLES.cmake +++ b/FindOpenGLES.cmake @@ -1,9 +1,9 @@ #.rst: # FindOpenGLES # ------------ -# Finds the OpenGLES2 library +# Finds the OpenGLES2 and OpenGLES3 library # -# This will define the following variables:: +# This will define the following variables: # # OPENGLES_FOUND - system has OpenGLES # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory @@ -18,7 +18,8 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET) endif() -if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND NOT CORE_SYSTEM_NAME STREQUAL ios) +if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND + NOT CORE_SYSTEM_NAME STREQUAL ios) find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h PATHS ${PC_OPENGLES_INCLUDEDIR}) find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2 From 3cd826b838cf7bb02f89cbfe15c3d927d47e0109 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 16 Dec 2019 22:40:23 +0100 Subject: [PATCH 4/5] add license and source url to addon.xml --- screensaver.stars/addon.xml.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screensaver.stars/addon.xml.in b/screensaver.stars/addon.xml.in index f966a6d..5e57880 100644 --- a/screensaver.stars/addon.xml.in +++ b/screensaver.stars/addon.xml.in @@ -12,6 +12,8 @@ Stars screensaver A screensaver that lets you fly through the stars. @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/visualization.stars resources/icon.png resources/fanart.png From 448c13cf2a0562f34a494f056a21dc1bab8d4301 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 16 Dec 2019 22:44:19 +0100 Subject: [PATCH 5/5] increase version to 2.2.1 --- screensaver.stars/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screensaver.stars/addon.xml.in b/screensaver.stars/addon.xml.in index 5e57880..175a70d 100644 --- a/screensaver.stars/addon.xml.in +++ b/screensaver.stars/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@