diff -Nru kodi-screensaver-greynetic-2.2.3/appveyor.yml kodi-screensaver-greynetic-2.5.0/appveyor.yml --- kodi-screensaver-greynetic-2.2.3/appveyor.yml 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/appveyor.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -version: BuildNr.{build} - -image: Visual Studio 2017 - -shallow_clone: true - -clone_folder: c:\projects\screensaver.greynetic - -environment: - app_id: screensaver.greynetic - - matrix: - - GENERATOR: "Visual Studio 15" - CONFIG: Release - - GENERATOR: "Visual Studio 15 Win64" - CONFIG: Release - - GENERATOR: "Visual Studio 15 Win64" - CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" - -build_script: - - cd .. - - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git - - cd %app_id% - - mkdir build - - cd build - - mkdir -p definition\%app_id% - - echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt - - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons - - cmake --build . --config %CONFIG% --target %app_id% diff -Nru kodi-screensaver-greynetic-2.2.3/azure-pipelines.yml kodi-screensaver-greynetic-2.5.0/azure-pipelines.yml --- kodi-screensaver-greynetic-2.2.3/azure-pipelines.yml 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/azure-pipelines.yml 2013-05-31 22:59:22.000000000 +0000 @@ -4,7 +4,7 @@ trigger: branches: include: - - Leia + - Matrix - releases/* paths: include: @@ -32,12 +32,12 @@ GENERATOR: "Visual Studio 15 2017" ARCHITECTURE: x64 CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" ARM64-UWP: GENERATOR: "Visual Studio 15 2017" ARCHITECTURE: ARM64 CONFIGURATION: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" workspace: clean: all @@ -46,7 +46,7 @@ - script: | cd .. - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build diff -Nru kodi-screensaver-greynetic-2.2.3/debian/changelog kodi-screensaver-greynetic-2.5.0/debian/changelog --- kodi-screensaver-greynetic-2.2.3/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-screensaver-greynetic (2.2.3-1~bionic) bionic; urgency=low +kodi-screensaver-greynetic (2.5.0-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-screensaver-greynetic-2.2.3/debian/control kodi-screensaver-greynetic-2.5.0/debian/control --- kodi-screensaver-greynetic-2.2.3/debian/control 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -6,7 +6,7 @@ libglm-dev Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-screensaver-greynetic Section: libs diff -Nru kodi-screensaver-greynetic-2.2.3/debian/copyright kodi-screensaver-greynetic-2.5.0/debian/copyright --- kodi-screensaver-greynetic-2.2.3/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/xbmc/screensaver.greynetic Files: * -Copyright: 2005-2019 Team Kodi +Copyright: 2005-2020 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 diff -Nru kodi-screensaver-greynetic-2.2.3/debian/rules kodi-screensaver-greynetic-2.5.0/debian/rules --- kodi-screensaver-greynetic-2.2.3/debian/rules 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/debian/rules 2013-05-31 22:59:22.000000000 +0000 @@ -10,13 +10,10 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 - -override_dh_strip: - dh_strip -pkodi-screensaver-greynetic --dbg-package=kodi-screensaver-greynetic-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-screensaver-greynetic diff -Nru kodi-screensaver-greynetic-2.2.3/debian/source/format kodi-screensaver-greynetic-2.5.0/debian/source/format --- kodi-screensaver-greynetic-2.2.3/debian/source/format 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/debian/source/format 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru kodi-screensaver-greynetic-2.2.3/depends/common/glm/glm.sha256 kodi-screensaver-greynetic-2.5.0/depends/common/glm/glm.sha256 --- kodi-screensaver-greynetic-2.2.3/depends/common/glm/glm.sha256 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/depends/common/glm/glm.sha256 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -7f093f11c49877716bab96813c2e834db6839095281c8c0c65c60c8bdb9504a3 +3a073eb8f3be07cee74481db0e1f78eda553b554941e405c863ab64de6a2e954 diff -Nru kodi-screensaver-greynetic-2.2.3/depends/common/glm/glm.txt kodi-screensaver-greynetic-2.5.0/depends/common/glm/glm.txt --- kodi-screensaver-greynetic-2.2.3/depends/common/glm/glm.txt 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/depends/common/glm/glm.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -glm https://github.com/g-truc/glm/archive/47031aa4b7b079716e4cac496819e7f464b6a713.tar.gz +glm https://github.com/g-truc/glm/archive/0.9.9.4.tar.gz diff -Nru kodi-screensaver-greynetic-2.2.3/depends/osx/glm/glm.sha256 kodi-screensaver-greynetic-2.5.0/depends/osx/glm/glm.sha256 --- kodi-screensaver-greynetic-2.2.3/depends/osx/glm/glm.sha256 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/depends/osx/glm/glm.sha256 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -7f093f11c49877716bab96813c2e834db6839095281c8c0c65c60c8bdb9504a3 +3a073eb8f3be07cee74481db0e1f78eda553b554941e405c863ab64de6a2e954 diff -Nru kodi-screensaver-greynetic-2.2.3/depends/osx/glm/glm.txt kodi-screensaver-greynetic-2.5.0/depends/osx/glm/glm.txt --- kodi-screensaver-greynetic-2.2.3/depends/osx/glm/glm.txt 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/depends/osx/glm/glm.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -glm https://github.com/g-truc/glm/archive/47031aa4b7b079716e4cac496819e7f464b6a713.tar.gz +glm https://github.com/g-truc/glm/archive/0.9.9.4.tar.gz diff -Nru kodi-screensaver-greynetic-2.2.3/.gitignore kodi-screensaver-greynetic-2.5.0/.gitignore --- kodi-screensaver-greynetic-2.2.3/.gitignore 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -# build artifacts -build/ -screensaver.*/addon.xml - -# Debian build files -debian/changelog -debian/files -debian/*.log -debian/*.substvars -debian/.debhelper/ -debian/tmp/ -debian/kodi-screensaver-*/ -obj-x86_64-linux-gnu/ - -# commonly used editors -# vim -*.swp - -# Eclipse -*.project -*.cproject -.classpath -*.sublime-* -.settings/ - -# KDevelop 4 -*.kdev4 - -# gedit -*~ - -# CLion -/.idea - -# clion -.idea/ diff -Nru kodi-screensaver-greynetic-2.2.3/Jenkinsfile kodi-screensaver-greynetic-2.5.0/Jenkinsfile --- kodi-screensaver-greynetic-2.2.3/Jenkinsfile 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Leia") +buildPlugin(version: "Matrix") diff -Nru kodi-screensaver-greynetic-2.2.3/lib/kodi/gui/gl/GL.h kodi-screensaver-greynetic-2.5.0/lib/kodi/gui/gl/GL.h --- kodi-screensaver-greynetic-2.2.3/lib/kodi/gui/gl/GL.h 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/lib/kodi/gui/gl/GL.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2005-2019 Team Kodi - * This file is part of Kodi - https://kodi.tv - * - * SPDX-License-Identifier: GPL-2.0-or-later - * See LICENSES/README.md for more information. - */ - -#pragma once - -//============================================================================== -/// -/// \defgroup cpp_kodi_gui_gl Kodi OpenGL helpers -/// \ingroup cpp_kodi_gui -/// \brief Auxiliary functions for Open GL -/// -/// This group includes help for definitions, functions, and classes for -/// OpenGL. -/// -/// To use OpenGL for your system, add the \ref GL.h "#include ". -/// -/// -///----------------------------------------------------------------------------- -/// -/// The \ref HAS_GL is declared if Open GL is required and \ref HAS_GLES if Open GL -/// Embedded Systems (ES) is required, with ES the version is additionally given -/// in the definition, this can be "2" or "3". -/// -/// -///----------------------------------------------------------------------------- -/// -/// Following \ref GL_TYPE_STRING define can be used, for example, to manage -/// different folders for GL and GLES and make the selection easier. -/// This are on OpenGL **"`GL`"** and on Open GL|ES **"`GLES`"**. -/// **Example:** -/// ~~~~~~~~~~~~~~~~~{.cpp} -/// kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/frag.glsl"); -/// ~~~~~~~~~~~~~~~~~ -/// -/// -///---------------------------------------------------------------------------- -/// -/// In addition, \ref BUFFER_OFFSET is declared in it which can be used to give an -/// offset on the array to GL. -/// **Example:** -/// ~~~~~~~~~~~~~~~~~{.cpp} -/// const struct PackedVertex { -/// float position[3]; // Position x, y, z -/// float color[4]; // Color r, g, b, a -/// } vertices[3] = { -/// { { -0.5f, -0.5f, 0.0f }, { 1.0f, 0.0f, 0.0f, 1.0f } }, -/// { { 0.5f, -0.5f, 0.0f }, { 0.0f, 1.0f, 0.0f, 1.0f } }, -/// { { 0.0f, 0.5f, 0.0f }, { 0.0f, 0.0f, 1.0f, 1.0f } } -/// }; -/// -/// glVertexAttribPointer(m_aPosition, 3, GL_FLOAT, GL_FALSE, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, position))); -/// glEnableVertexAttribArray(m_aPosition); -/// -/// glVertexAttribPointer(m_aColor, 4, GL_FLOAT, GL_FALSE, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, color))); -/// glEnableVertexAttribArray(m_aColor); -/// ~~~~~~~~~~~~~~~~~ - -#if HAS_GL - #define GL_TYPE_STRING "GL" - // always define GL_GLEXT_PROTOTYPES before include gl headers - #if !defined(GL_GLEXT_PROTOTYPES) - #define GL_GLEXT_PROTOTYPES - #endif - #if defined(TARGET_LINUX) - #include - #include - #elif defined(TARGET_FREEBSD) - #include - #elif defined(TARGET_DARWIN) - #include - #include - #elif defined(WIN32) - #error Use of GL under Windows is not possible - #endif -#elif HAS_GLES >= 2 - #define GL_TYPE_STRING "GLES" - #if defined(WIN32) - #error Use of GLES under Windows is not possible - #elif defined(TARGET_DARWIN) - #if HAS_GLES == 3 - #include - #include - #else - #include - #include - #endif - #else - #if HAS_GLES == 3 - #include - #include - #else - #include - #include - #endif - #endif -#endif - -#ifndef BUFFER_OFFSET -#define BUFFER_OFFSET(i) ((char *)nullptr + (i)) -#endif diff -Nru kodi-screensaver-greynetic-2.2.3/lib/kodi/gui/gl/Shader.h kodi-screensaver-greynetic-2.5.0/lib/kodi/gui/gl/Shader.h --- kodi-screensaver-greynetic-2.2.3/lib/kodi/gui/gl/Shader.h 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/lib/kodi/gui/gl/Shader.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,353 +0,0 @@ -/* - * Copyright (C) 2005-2019 Team Kodi - * This file is part of Kodi - https://kodi.tv - * - * SPDX-License-Identifier: GPL-2.0-or-later - * See LICENSES/README.md for more information. - */ - -#pragma once - -#include "GL.h" - -#include -#include -#include - -#include -#include - -#define LOG_SIZE 1024 -#define GLchar char - -namespace kodi -{ - namespace gui - { - namespace gl - { - //======================================================================== - /// CShader - base class - class ATTRIBUTE_HIDDEN CShader - { - public: - CShader() = default; - virtual ~CShader() = default; - virtual bool Compile(const std::string& extraBegin = "", - const std::string& extraEnd = "") = 0; - virtual void Free() = 0; - virtual GLuint Handle() = 0; - - bool LoadSource(const std::string& file) - { - char buffer[16384]; - - kodi::vfs::CFile source; - if (!source.OpenFile(file)) - { - kodi::Log(ADDON_LOG_ERROR, "CShader::%s: Failed to open file '%s'", __FUNCTION__, file.c_str()); - return false; - } - size_t len = source.Read(buffer, sizeof(buffer)); - m_source.assign(buffer); - m_source[len] = 0; - source.Close(); - return true; - } - - bool OK() { return m_compiled; } - - protected: - std::string m_source; - std::string m_lastLog; - bool m_compiled = false; - }; - //------------------------------------------------------------------------ - - //======================================================================== - /// CVertexShader - class ATTRIBUTE_HIDDEN CVertexShader : public CShader - { - public: - CVertexShader() = default; - ~CVertexShader() override { Free(); } - - void Free() override - { - if (m_vertexShader) - glDeleteShader(m_vertexShader); - m_vertexShader = 0; - } - - bool Compile(const std::string& extraBegin = "", - const std::string& extraEnd = "") override - { - GLint params[4]; - - Free(); - - m_vertexShader = glCreateShader(GL_VERTEX_SHADER); - - GLsizei count = 0; - const char *sources[3]; - if (!extraBegin.empty()) - sources[count++] = extraBegin.c_str(); - if (!m_source.empty()) - sources[count++] = m_source.c_str(); - if (!extraEnd.empty()) - sources[count++] = extraEnd.c_str(); - - glShaderSource(m_vertexShader, count, sources, nullptr); - glCompileShader(m_vertexShader); - glGetShaderiv(m_vertexShader, GL_COMPILE_STATUS, params); - if (params[0] != GL_TRUE) - { - GLchar log[LOG_SIZE]; - glGetShaderInfoLog(m_vertexShader, LOG_SIZE, nullptr, log); - kodi::Log(ADDON_LOG_ERROR, "CVertexShader::%s: %s", __FUNCTION__, log); - fprintf(stderr, "CVertexShader::%s: %s\n", __FUNCTION__, log); - m_lastLog = log; - m_compiled = false; - } - else - { - GLchar log[LOG_SIZE]; - glGetShaderInfoLog(m_vertexShader, LOG_SIZE, nullptr, log); - m_lastLog = log; - m_compiled = true; - } - return m_compiled; - } - - GLuint Handle() override { return m_vertexShader; } - - protected: - GLuint m_vertexShader = 0; - }; - //------------------------------------------------------------------------ - - //======================================================================== - /// CPixelShader - class ATTRIBUTE_HIDDEN CPixelShader : public CShader - { - public: - CPixelShader() = default; - ~CPixelShader() { Free(); } - void Free() override - { - if (m_pixelShader) - glDeleteShader(m_pixelShader); - m_pixelShader = 0; - } - - bool Compile(const std::string& extraBegin = "", - const std::string& extraEnd = "") override - { - GLint params[4]; - - Free(); - - if (m_source.length()==0) - return true; - - m_pixelShader = glCreateShader(GL_FRAGMENT_SHADER); - - GLsizei count = 0; - const char *sources[3]; - if (!extraBegin.empty()) - sources[count++] = extraBegin.c_str(); - if (!m_source.empty()) - sources[count++] = m_source.c_str(); - if (!extraEnd.empty()) - sources[count++] = extraEnd.c_str(); - - glShaderSource(m_pixelShader, count, sources, 0); - glCompileShader(m_pixelShader); - glGetShaderiv(m_pixelShader, GL_COMPILE_STATUS, params); - if (params[0] != GL_TRUE) - { - GLchar log[LOG_SIZE]; - glGetShaderInfoLog(m_pixelShader, LOG_SIZE, nullptr, log); - kodi::Log(ADDON_LOG_ERROR, "CPixelShader::%s: %s", __FUNCTION__, log); - fprintf(stderr, "CPixelShader::%s: %s\n", __FUNCTION__, log); - m_lastLog = log; - m_compiled = false; - } - else - { - GLchar log[LOG_SIZE]; - glGetShaderInfoLog(m_pixelShader, LOG_SIZE, nullptr, log); - m_lastLog = log; - m_compiled = true; - } - return m_compiled; - } - - GLuint Handle() override { return m_pixelShader; } - - protected: - GLuint m_pixelShader = 0; - }; - //------------------------------------------------------------------------ - - //======================================================================== - /// CShaderProgram - class ATTRIBUTE_HIDDEN CShaderProgram - { - public: - CShaderProgram() = default; - CShaderProgram(const std::string &vert, const std::string &frag) - { - LoadShaderFiles(vert, frag); - } - - virtual ~CShaderProgram() - { - ShaderFree(); - } - - bool LoadShaderFiles(const std::string &vert, const std::string &frag) - { - if (!kodi::vfs::FileExists(vert) || !m_pVP.LoadSource(vert)) - { - kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load '%s'", __func__, vert.c_str()); - return false; - } - - if (!kodi::vfs::FileExists(frag) || !m_pFP.LoadSource(frag)) - { - kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load '%s'", __func__, frag.c_str()); - return false; - } - - return true; - } - - bool CompileAndLink(const std::string& vertexExtraBegin = "", - const std::string& vertexExtraEnd = "", - const std::string& fragmentExtraBegin = "", - const std::string& fragmentExtraEnd = "") - { - GLint params[4]; - - // free resources - ShaderFree(); - m_ok = false; - - // compiled vertex shader - if (!m_pVP.Compile(vertexExtraBegin, vertexExtraEnd)) - { - kodi::Log(ADDON_LOG_ERROR, "GL: Error compiling vertex shader"); - return false; - } - - // compile pixel shader - if (!m_pFP.Compile(fragmentExtraBegin, fragmentExtraEnd)) - { - m_pVP.Free(); - kodi::Log(ADDON_LOG_ERROR, "GL: Error compiling fragment shader"); - return false; - } - - // create program object - if (!(m_shaderProgram = glCreateProgram())) - { - kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: Failed to create GL program", __FUNCTION__); - ShaderFree(); - return false; - } - - // attach the vertex shader - glAttachShader(m_shaderProgram, m_pVP.Handle()); - glAttachShader(m_shaderProgram, m_pFP.Handle()); - - // link the program - glLinkProgram(m_shaderProgram); - glGetProgramiv(m_shaderProgram, GL_LINK_STATUS, params); - if (params[0] != GL_TRUE) - { - GLchar log[LOG_SIZE]; - glGetProgramInfoLog(m_shaderProgram, LOG_SIZE, nullptr, log); - kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: %s", __FUNCTION__, log); - fprintf(stderr, "CShaderProgram::%s: %s\n", __FUNCTION__, log); - ShaderFree(); - return false; - } - - m_validated = false; - m_ok = true; - OnCompiledAndLinked(); - return true; - } - - bool EnableShader() - { - if (ShaderOK()) - { - glUseProgram(m_shaderProgram); - if (OnEnabled()) - { - if (!m_validated) - { - // validate the program - GLint params[4]; - glValidateProgram(m_shaderProgram); - glGetProgramiv(m_shaderProgram, GL_VALIDATE_STATUS, params); - if (params[0] != GL_TRUE) - { - GLchar log[LOG_SIZE]; - glGetProgramInfoLog(m_shaderProgram, LOG_SIZE, nullptr, log); - kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: %s", __FUNCTION__, log); - fprintf(stderr, "CShaderProgram::%s: %s\n", __FUNCTION__, log); - } - m_validated = true; - } - return true; - } - else - { - glUseProgram(0); - return false; - } - return true; - } - return false; - } - - void DisableShader() - { - if (ShaderOK()) - { - glUseProgram(0); - OnDisabled(); - } - } - - ATTRIBUTE_FORCEINLINE bool ShaderOK() { return m_ok; } - ATTRIBUTE_FORCEINLINE CVertexShader& VertexShader() { return m_pVP; } - ATTRIBUTE_FORCEINLINE CPixelShader& PixelShader() { return m_pFP; } - ATTRIBUTE_FORCEINLINE GLuint ProgramHandle() { return m_shaderProgram; } - - virtual void OnCompiledAndLinked() {}; - virtual bool OnEnabled() { return false; }; - virtual void OnDisabled() {}; - - private: - void ShaderFree() - { - if (m_shaderProgram) - glDeleteProgram(m_shaderProgram); - m_shaderProgram = 0; - m_ok = false; - } - - CVertexShader m_pVP; - CPixelShader m_pFP; - GLuint m_shaderProgram = 0; - bool m_ok = false; - bool m_validated = false; - }; - //------------------------------------------------------------------------ - } /* namespace gl */ - } /* namespace gui */ -} /* namespace kodi */ diff -Nru kodi-screensaver-greynetic-2.2.3/lib/kodi/utils/Time.h kodi-screensaver-greynetic-2.5.0/lib/kodi/utils/Time.h --- kodi-screensaver-greynetic-2.2.3/lib/kodi/utils/Time.h 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/lib/kodi/utils/Time.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -#pragma once -/* - * Copyright (C) 2005-2019 Team Kodi - * Copyright (C) 2011-2012 Pulse-Eight Limited. - * This file is part of Kodi - https://kodi.tv - * - * SPDX-License-Identifier: GPL-2.0-or-later - * See LICENSES/README.md for more information. - */ - -#if defined(TARGET_DARWIN) -#include -#include -#elif defined(TARGET_WINDOWS) -#include -#include -#else -#include -#endif - -namespace kodi -{ - namespace time - { - - //========================================================================== - /// @brief Function to get current time in milliseconds - /// - /// @return Current time in milliseconds as a double value - /// - /// - /// ------------------------------------------------------------------------ - /// - /// **Example:** - /// ~~~~~~~~~~~~~{.cpp} - /// - /// #include - /// - /// ... - /// double time = kodi::time::GetTimeMs(); - /// ... - /// ~~~~~~~~~~~~~ - /// - inline double GetTimeMs() - { - #if defined(TARGET_DARWIN) - return (double) (CVGetCurrentHostTime() / (double)(CVGetHostClockFrequency() * 0.001)); - #elif defined(TARGET_WINDOWS) - LARGE_INTEGER tickPerSecond; - LARGE_INTEGER tick; - if (QueryPerformanceFrequency(&tickPerSecond)) - { - QueryPerformanceCounter(&tick); - return (double) (tick.QuadPart / (tickPerSecond.QuadPart / 1000.)); - } - return -1; - #else - timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); - return (double)time.tv_sec * 1000.0 + time.tv_nsec / 1000000.0; - #endif - } - //-------------------------------------------------------------------------- - - //========================================================================== - /// @brief Function to get current time in seconds - /// - /// @return Current time in seconds with the value type defined in the template - /// - /// - /// ------------------------------------------------------------------------ - /// - /// **Example:** - /// ~~~~~~~~~~~~~{.cpp} - /// - /// #include - /// - /// ... - /// double time = kodi::time::GetTimeSec(); - /// ... - /// ~~~~~~~~~~~~~ - /// - template - inline T GetTimeSec() - { - return (T)GetTimeMs() / (T)1000.0; - } - //-------------------------------------------------------------------------- - - } /* namespace time */ -} /* namespace kodi */ diff -Nru kodi-screensaver-greynetic-2.2.3/LICENSE.md kodi-screensaver-greynetic-2.5.0/LICENSE.md --- kodi-screensaver-greynetic-2.2.3/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/LICENSE.md 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,264 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff -Nru kodi-screensaver-greynetic-2.2.3/README.md kodi-screensaver-greynetic-2.5.0/README.md --- kodi-screensaver-greynetic-2.2.3/README.md 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -2,9 +2,10 @@ This is a [Kodi](http://kodi.tv) screensaver addon. +[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) [![Build Status](https://travis-ci.org/xbmc/screensaver.greynetic.svg?branch=master)](https://travis-ci.org/xbmc/screensaver.greynetic) -[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.greynetic?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=44&branchName=Leia) - +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.greynetic?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=44&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/screensaver.greynetic/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fscreensaver.greynetic/branches/) ## Build instructions @@ -17,7 +18,7 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/xbmc/screensaver.greynetic.git` 3. `cd screensaver.greynetic && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=screensaver.greynetic -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-screensaver-greynetic-2.2.3/screensaver.greynetic/addon.xml.in kodi-screensaver-greynetic-2.5.0/screensaver.greynetic/addon.xml.in --- kodi-screensaver-greynetic-2.2.3/screensaver.greynetic/addon.xml.in 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/screensaver.greynetic/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -9,9 +9,12 @@ point="xbmc.ui.screensaver" library_@PLATFORM@="@LIBRARY_FILENAME@"/> - Draw random color rectangles - Colored and transparent rectangles. + Zeichnet zufällige Farbrechtecke + Draw random color rectangles + Farbige und transparente Rechtecke. + Colored and transparent rectangles. @PLATFORM@ + GPL-2.0-or-later resources/icon.png resources/fanart.png diff -Nru kodi-screensaver-greynetic-2.2.3/screensaver.greynetic/resources/language/resource.language.de_de/strings.po kodi-screensaver-greynetic-2.5.0/screensaver.greynetic/resources/language/resource.language.de_de/strings.po --- kodi-screensaver-greynetic-2.2.3/screensaver.greynetic/resources/language/resource.language.de_de/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/screensaver.greynetic/resources/language/resource.language.de_de/strings.po 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,99 @@ +# Kodi Media Center language file +# Addon Name: Flocks +# Addon id: screensaver.greynetic +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Main\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/screensaver.greynetic/issues/\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/kodi-main/language/de_DE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file. +#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/ +#For example, prefer wording as "This new string" instead of "This New String". +#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used! +#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp" +#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance. +#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word. + +# Following strings used for addon settings dialog + +msgctxt "#30000" +msgid "General" +msgstr "Allgemein" + +msgctxt "#30001" +msgid "Colors" +msgstr "Farben" + +msgctxt "#30010" +msgid "Number of boxes" +msgstr "Anzahl an Boxen" + +msgctxt "#30011" +msgid "Use squares" +msgstr "Verwende Quadrate" + +msgctxt "#30012" +msgid "Maximum width" +msgstr "Maximale Breite" + +msgctxt "#30013" +msgid "Minimum width" +msgstr "Minimale Breite" + +msgctxt "#30014" +msgid "Maximum height" +msgstr "Maximale Höhe" + +msgctxt "#30015" +msgid "Minimum height" +msgstr "Minimale Höhe" + +msgctxt "#30016" +msgid "Maximum size" +msgstr "Maximale Größe" + +msgctxt "#30017" +msgid "Minimum size" +msgstr "Minimale Größe" + +msgctxt "#30018" +msgid "Minimum alpha" +msgstr "Minimales Alpha" + +msgctxt "#30019" +msgid "Maximum alpha" +msgstr "Maximales Alpha" + +msgctxt "#30020" +msgid "Minimum red" +msgstr "Minimales Rot" + +msgctxt "#30021" +msgid "Maximum red" +msgstr "Maximales Rot" + +msgctxt "#30022" +msgid "Minimum green" +msgstr "Minimales Grün" + +msgctxt "#30023" +msgid "Maximum green" +msgstr "Maximales Grün" + +msgctxt "#30024" +msgid "Minimum blue" +msgstr "Minimales Blau" + +msgctxt "#30025" +msgid "Maximum blue" +msgstr "Maximales Blau" Binary files /tmp/tmpD9Vsbp/e2GzXmIj4r/kodi-screensaver-greynetic-2.2.3/screensaver.greynetic/resources/screenshot-02.jpg and /tmp/tmpD9Vsbp/qyCRFVURpF/kodi-screensaver-greynetic-2.5.0/screensaver.greynetic/resources/screenshot-02.jpg differ diff -Nru kodi-screensaver-greynetic-2.2.3/src/GreyNetic.cpp kodi-screensaver-greynetic-2.5.0/src/GreyNetic.cpp --- kodi-screensaver-greynetic-2.2.3/src/GreyNetic.cpp 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/src/GreyNetic.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -1,23 +1,10 @@ /* - * GreyNetic Screensaver for XBox Media Center - * Copyright (c) 2004 Team Kodi + * Copyright (C) 2004-2020 Team Kodi (https://kodi.tv) + * Copyright (C) 2005 Dylan Thurston (Dinomight) * - * Ver 1.0 26 Fed 2005 Dylan Thurston (Dinomight) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. + */ /* * diff -Nru kodi-screensaver-greynetic-2.2.3/.travis.yml kodi-screensaver-greynetic-2.5.0/.travis.yml --- kodi-screensaver-greynetic-2.2.3/.travis.yml 2020-09-06 20:59:50.000000000 +0000 +++ kodi-screensaver-greynetic-2.5.0/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -1,16 +1,12 @@ language: cpp -# -# Define the build matrix -# -# Travis defaults to building on Ubuntu Trusty when building on -# Linux. We need Xenial in order to get up to date versions of -# cmake and g++. -# env: global: - app_id=screensaver.greynetic +# +# Define the build matrix +# matrix: include: - os: linux @@ -21,25 +17,38 @@ dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true + - os: linux + dist: focal + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx - osx_image: xcode9 - - os: osx - osx_image: xcode9.4 + osx_image: xcode10.2 before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgl1-mesa-dev; fi + - if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, # we'll put the Kodi source on the same level # before_script: - - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git - - cd ${app_id} && mkdir build && cd build - - mkdir -p definition/${app_id} - - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt - - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons + - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi + - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi + - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi + - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi + - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi -script: make +script: + - if [[ $DEBIAN_BUILD != true ]]; then make; fi + - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi