diff -pruN 19.0.1+ds1-1/appveyor.yml 20.1.0+ds1-1/appveyor.yml --- 19.0.1+ds1-1/appveyor.yml 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/appveyor.yml 2022-01-01 13:43:05.000000000 +0000 @@ -25,7 +25,7 @@ environment: build_script: - cd .. - - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -pruN 19.0.1+ds1-1/azure-pipelines.yml 20.1.0+ds1-1/azure-pipelines.yml --- 19.0.1+ds1-1/azure-pipelines.yml 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/azure-pipelines.yml 2022-01-01 13:43:05.000000000 +0000 @@ -49,7 +49,7 @@ jobs: - script: | cd .. - git clone --branch Matrix --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 -pruN 19.0.1+ds1-1/debian/changelog 20.1.0+ds1-1/debian/changelog --- 19.0.1+ds1-1/debian/changelog 2022-03-21 17:50:27.000000000 +0000 +++ 20.1.0+ds1-1/debian/changelog 2022-08-04 09:56:23.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-screensaver-shadertoy (20.1.0+ds1-1) unstable; urgency=medium + + * New upstream version 20.1.0+ds1 + * Prepare for v20 in unstable + + -- Vasyl Gello Thu, 04 Aug 2022 09:56:23 +0000 + kodi-screensaver-shadertoy (19.0.1+ds1-1) unstable; urgency=medium * New upstream version 19.0.1+ds1 diff -pruN 19.0.1+ds1-1/debian/control 20.1.0+ds1-1/debian/control --- 19.0.1+ds1-1/debian/control 2022-03-21 17:50:27.000000000 +0000 +++ 20.1.0+ds1-1/debian/control 2022-08-04 09:56:23.000000000 +0000 @@ -4,12 +4,12 @@ Section: libs Maintainer: Debian Multimedia Maintainers Uploaders: Vasyl Gello Build-Depends: debhelper-compat (= 13) -Build-Depends-Arch: dh-sequence-kodiaddon (>= 2:19~), +Build-Depends-Arch: dh-sequence-kodiaddon (>= 2:20~), cmake, libgles2-mesa-dev [arm64 armel armhf], libgl1-mesa-dev [!arm64 !armel !armhf], libglm-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-screensaver-shadertoy Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-screensaver-shadertoy.git diff -pruN 19.0.1+ds1-1/debian/copyright 20.1.0+ds1-1/debian/copyright --- 19.0.1+ds1-1/debian/copyright 2021-01-20 08:08:54.000000000 +0000 +++ 20.1.0+ds1-1/debian/copyright 2022-08-04 09:56:23.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/xbmc/screensa Files-Excluded: depends Files: * -Copyright: 2005-2021 Team Kodi +Copyright: 2005-2022 Team Kodi License: GPL-2+ files: src/lodepng.* @@ -31,7 +31,7 @@ License: BSD-3-clause Comment: The license text was retrieved from src/lodepng.cpp Files: debian/* -Copyright: 2020-2021 Vasyl Gello +Copyright: 2020-2022 Vasyl Gello License: GPL-2+ License: GPL-2+ diff -pruN 19.0.1+ds1-1/debian/watch 20.1.0+ds1-1/debian/watch --- 19.0.1+ds1-1/debian/watch 2021-08-26 10:48:41.000000000 +0000 +++ 20.1.0+ds1-1/debian/watch 2022-08-04 09:56:23.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/xbmc/screensaver.shadertoy/releases \ -/xbmc/screensaver.shadertoy/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/xbmc/screensaver.shadertoy/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz diff -pruN 19.0.1+ds1-1/.github/workflows/build.yml 20.1.0+ds1-1/.github/workflows/build.yml --- 19.0.1+ds1-1/.github/workflows/build.yml 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/.github/workflows/build.yml 2022-01-01 13:43:05.000000000 +0000 @@ -27,14 +27,14 @@ jobs: env: DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} run: | - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; 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 update; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - name: Checkout Kodi repo uses: actions/checkout@v2 with: repository: xbmc/xbmc - ref: Matrix + ref: master path: xbmc - name: Checkout screensaver.shadertoy repo uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: run: | if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; 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 ${{ github.workspace }}/${app_id}; fi - name: Build env: diff -pruN 19.0.1+ds1-1/Jenkinsfile 20.1.0+ds1-1/Jenkinsfile --- 19.0.1+ds1-1/Jenkinsfile 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/Jenkinsfile 2022-01-01 13:43:05.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff -pruN 19.0.1+ds1-1/README.md 20.1.0+ds1-1/README.md --- 19.0.1+ds1-1/README.md 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/README.md 2022-01-01 13:43:05.000000000 +0000 @@ -3,15 +3,15 @@ This is a [Kodi](https://kodi.tv) screensaver addon. [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build and run tests](https://github.com/xbmc/screensaver.shadertoy/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/xbmc/screensaver.shadertoy/actions/workflows/build.yml) -[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.shadertoy?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=48&branchName=Matrix) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/screensaver.shadertoy/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fscreensaver.shadertoy/branches/) - +[![Build and run tests](https://github.com/xbmc/screensaver.shadertoy/actions/workflows/build.yml/badge.svg?branch=Nexus)](https://github.com/xbmc/screensaver.shadertoy/actions/workflows/build.yml) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.shadertoy?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=48&branchName=Nexus) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/screensaver.shadertoy/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fscreensaver.shadertoy/branches/) + ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename. +If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -19,8 +19,8 @@ Also make sure you follow this README fr The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git` -2. `git clone --branch Matrix https://github.com/xbmc/screensaver.shadertoy.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` +2. `git clone https://github.com/xbmc/screensaver.shadertoy.git` 3. `cd screensaver.shadertoy && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=screensaver.shadertoy -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff -pruN 19.0.1+ds1-1/screensaver.shadertoy/addon.xml.in 20.1.0+ds1-1/screensaver.shadertoy/addon.xml.in --- 19.0.1+ds1-1/screensaver.shadertoy/addon.xml.in 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/screensaver.shadertoy/addon.xml.in 2022-01-01 13:43:05.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ diff -pruN 19.0.1+ds1-1/src/main.cpp 20.1.0+ds1-1/src/main.cpp --- 19.0.1+ds1-1/src/main.cpp 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/src/main.cpp 2022-01-01 13:43:05.000000000 +0000 @@ -153,21 +153,21 @@ void main(void) CScreensaverShadertoy::CScreensaverShadertoy() { - m_settingsUseOwnshader = kodi::GetSettingBoolean("ownshader"); + m_settingsUseOwnshader = kodi::addon::GetSettingBoolean("ownshader"); if (m_settingsUseOwnshader) { m_currentPreset = -1; - std::string str = kodi::GetSettingString("shader"); + std::string str = kodi::addon::GetSettingString("shader"); if (!kodi::vfs::FileExists(str)) { - kodi::QueueNotification(QUEUE_ERROR, "", kodi::GetLocalizedString(30104)); + kodi::QueueNotification(QUEUE_ERROR, "", kodi::addon::GetLocalizedString(30104)); m_settingsUseOwnshader = false; } } if (!m_settingsUseOwnshader) { - int c = kodi::GetSettingInt("preset"); + int c = kodi::addon::GetSettingInt("preset"); if (c < 0) c = 0; else if (c > g_presets.size()) @@ -318,21 +318,21 @@ void CScreensaverShadertoy::Launch(int p if (preset < 0) { - m_usedShaderFile = kodi::GetSettingString("shader"); - m_shaderTextures[0] = kodi::GetSettingString("texture0"); - m_shaderTextures[1] = kodi::GetSettingString("texture1"); - m_shaderTextures[2] = kodi::GetSettingString("texture2"); - m_shaderTextures[3] = kodi::GetSettingString("texture3"); + m_usedShaderFile = kodi::addon::GetSettingString("shader"); + m_shaderTextures[0] = kodi::addon::GetSettingString("texture0"); + m_shaderTextures[1] = kodi::addon::GetSettingString("texture1"); + m_shaderTextures[2] = kodi::addon::GetSettingString("texture2"); + m_shaderTextures[3] = kodi::addon::GetSettingString("texture3"); } else { - m_usedShaderFile = kodi::GetAddonPath("resources/shaders/" + g_presets[preset].file); + m_usedShaderFile = kodi::addon::GetAddonPath("resources/shaders/" + g_presets[preset].file); - m_usedShaderFile = kodi::GetAddonPath("resources/shaders/" + g_presets[m_currentPreset].file); - m_shaderTextures[0] = !g_presets[m_currentPreset].channel[0].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[0]) : ""; - m_shaderTextures[1] = !g_presets[m_currentPreset].channel[1].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[1]) : ""; - m_shaderTextures[2] = !g_presets[m_currentPreset].channel[2].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[2]) : ""; - m_shaderTextures[3] = !g_presets[m_currentPreset].channel[3].empty() ? kodi::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[3]) : ""; + m_usedShaderFile = kodi::addon::GetAddonPath("resources/shaders/" + g_presets[m_currentPreset].file); + m_shaderTextures[0] = !g_presets[m_currentPreset].channel[0].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[0]) : ""; + m_shaderTextures[1] = !g_presets[m_currentPreset].channel[1].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[1]) : ""; + m_shaderTextures[2] = !g_presets[m_currentPreset].channel[2].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[2]) : ""; + m_shaderTextures[3] = !g_presets[m_currentPreset].channel[3].empty() ? kodi::addon::GetAddonPath("resources/" + g_presets[m_currentPreset].channel[3]) : ""; } for (int i = 0; i < 4; i++) @@ -386,7 +386,7 @@ void CScreensaverShadertoy::UnloadTextur void CScreensaverShadertoy::LoadPreset(const std::string& shaderPath) { UnloadPreset(); - std::string vertShadertoyShader = kodi::GetAddonPath("resources/shaders/main_shadertoy_" GL_TYPE_STRING ".vert.glsl"); + std::string vertShadertoyShader = kodi::addon::GetAddonPath("resources/shaders/main_shadertoy_" GL_TYPE_STRING ".vert.glsl"); if (!m_shadertoyShader.LoadShaderFiles(vertShadertoyShader, shaderPath) || !m_shadertoyShader.CompileAndLink("", "", fsHeader, fsFooter)) { @@ -411,8 +411,8 @@ void CScreensaverShadertoy::LoadPreset(c m_state.uScale = glGetUniformLocation(shadertoyShader, "uScale"); m_state.attr_vertex_e = glGetAttribLocation(shadertoyShader, "vertex"); - std::string vertShader = kodi::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".vert.glsl"); - std::string fraqShader = kodi::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".frag.glsl"); + std::string vertShader = kodi::addon::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".vert.glsl"); + std::string fraqShader = kodi::addon::GetAddonPath("resources/shaders/main_display_" GL_TYPE_STRING ".frag.glsl"); if (!m_displayShader.LoadShaderFiles(vertShader, fraqShader) || !m_displayShader.CompileAndLink()) { @@ -516,7 +516,7 @@ GLuint CScreensaverShadertoy::CreateText int CScreensaverShadertoy::DetermineBitsPrecision() { m_state.fbwidth = 32, m_state.fbheight = 26*10; - LoadPreset(kodi::GetAddonPath("resources/shaders/main_test.frag.glsl")); + LoadPreset(kodi::addon::GetAddonPath("resources/shaders/main_test.frag.glsl")); RenderTo(m_shadertoyShader.ProgramHandle(), m_state.effect_fb); glFinish(); diff -pruN 19.0.1+ds1-1/src/main.h 20.1.0+ds1-1/src/main.h --- 19.0.1+ds1-1/src/main.h 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/src/main.h 2022-01-01 13:43:05.000000000 +0000 @@ -20,7 +20,7 @@ struct Preset std::string channel[4]; }; -class ATTRIBUTE_HIDDEN CScreensaverShadertoy +class ATTR_DLL_LOCAL CScreensaverShadertoy : public kodi::addon::CAddonBase , public kodi::addon::CInstanceScreensaver { diff -pruN 19.0.1+ds1-1/.travis.yml 20.1.0+ds1-1/.travis.yml --- 19.0.1+ds1-1/.travis.yml 2022-01-01 13:42:26.000000000 +0000 +++ 20.1.0+ds1-1/.travis.yml 2022-01-01 13:43:05.000000000 +0000 @@ -31,7 +31,7 @@ matrix: osx_image: xcode10.2 before_install: - - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; 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 - if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev; fi @@ -41,12 +41,12 @@ before_install: # before_script: - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi - - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; 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/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; 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: