diff -pruN 19.0.1+ds1-1/appveyor.yml 20.1.0+ds1-1/appveyor.yml --- 19.0.1+ds1-1/appveyor.yml 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/appveyor.yml 2022-01-01 12:21:58.000000000 +0000 @@ -23,7 +23,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 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/azure-pipelines.yml 2022-01-01 12:21:58.000000000 +0000 @@ -4,7 +4,7 @@ variables: trigger: branches: include: - - Matrix + - Nexus - releases/* paths: include: @@ -46,7 +46,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:49:50.000000000 +0000 +++ 20.1.0+ds1-1/debian/changelog 2022-08-04 09:55:41.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-visualization-spectrum (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:55:41 +0000 + kodi-visualization-spectrum (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:49:50.000000000 +0000 +++ 20.1.0+ds1-1/debian/control 2022-08-04 09:55:41.000000000 +0000 @@ -4,11 +4,11 @@ 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, libgl1-mesa-dev, 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-visualization-spectrum Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-visualization-spectrum.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:12:18.000000000 +0000 +++ 20.1.0+ds1-1/debian/copyright 2022-08-04 09:55:41.000000000 +0000 @@ -6,12 +6,12 @@ Files-Excluded: depends Files: * Copyright: 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies 2005-2013 Team XBMC - 2013-2021 Team Kodi + 2013-2022 Team Kodi License: GPL-2+ Files: debian/* Copyright: 2015 Balint Reczey - 2020-2021 Vasyl Gello + 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:52:49.000000000 +0000 +++ 20.1.0+ds1-1/debian/watch 2022-08-04 09:55:41.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/xbmc/visualization.spectrum/releases \ -/xbmc/visualization.spectrum/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/xbmc/visualization.spectrum/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz diff -pruN 19.0.1+ds1-1/Jenkinsfile 20.1.0+ds1-1/Jenkinsfile --- 19.0.1+ds1-1/Jenkinsfile 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/Jenkinsfile 2022-01-01 12:21:58.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 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/README.md 2022-01-01 12:21:58.000000000 +0000 @@ -3,16 +3,16 @@ This is a [Kodi](https://kodi.tv) visualization addon. [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.visualization.spectrum?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=33&branchName=Matrix) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/visualization.spectrum/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvisualization.spectrum/branches/) - +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.visualization.spectrum?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=33&branchName=Nexus) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/visualization.spectrum/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvisualization.spectrum/branches/) + -![screenshot](https://raw.githubusercontent.com/xbmc/visualization.spectrum/Matrix/visualization.spectrum/resources/screenshot-01.jpg) +![screenshot](https://raw.githubusercontent.com/xbmc/visualization.spectrum/Nexus/visualization.spectrum/resources/screenshot-01.jpg) ## 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 @@ -20,8 +20,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/visualization.spectrum.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` +2. `git clone --branch Nexus https://github.com/xbmc/visualization.spectrum.git` 3. `cd visualization.spectrum && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=visualization.spectrum -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/src/directx_spectrum.cpp 20.1.0+ds1-1/src/directx_spectrum.cpp --- 19.0.1+ds1-1/src/directx_spectrum.cpp 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/src/directx_spectrum.cpp 2022-01-01 12:21:58.000000000 +0000 @@ -67,7 +67,7 @@ public: bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override; void Render() override; void AudioData(const float* audioData, int audioDataLength, float *freqData, int freqDataLength) override; - ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) override; + ADDON_STATUS SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) override; private: void SetBarHeightSetting(int settingValue); @@ -118,10 +118,10 @@ CVisualizationSpectrum::CVisualizationSp m_context = (ID3D11DeviceContext*)Device(); m_context->GetDevice(&m_device); - SetBarHeightSetting(kodi::GetSettingInt("bar_height")); - SetSpeedSetting(kodi::GetSettingInt("speed")); - SetModeSetting(kodi::GetSettingInt("mode")); - m_y_fixedAngle = kodi::GetSettingInt("rotation_angle"); + SetBarHeightSetting(kodi::addon::GetSettingInt("bar_height")); + SetSpeedSetting(kodi::addon::GetSettingInt("speed")); + SetModeSetting(kodi::addon::GetSettingInt("mode")); + m_y_fixedAngle = kodi::addon::GetSettingInt("rotation_angle"); if (!init_renderer_objs()) kodi::Log(ADDON_LOG_ERROR, "Failed to init DirectX"); @@ -365,7 +365,7 @@ void CVisualizationSpectrum::SetModeSett // Set a specific Setting value (called from XBMC) // !!! Add-on master function !!! //----------------------------------------------------------------------------- -ADDON_STATUS CVisualizationSpectrum::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) +ADDON_STATUS CVisualizationSpectrum::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) { if (settingName.empty() || settingValue.empty()) return ADDON_STATUS_UNKNOWN; diff -pruN 19.0.1+ds1-1/src/opengl_spectrum.cpp 20.1.0+ds1-1/src/opengl_spectrum.cpp --- 19.0.1+ds1-1/src/opengl_spectrum.cpp 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/src/opengl_spectrum.cpp 2022-01-01 12:21:58.000000000 +0000 @@ -39,7 +39,7 @@ #define NUM_BANDS 16 -class ATTRIBUTE_HIDDEN CVisualizationSpectrum +class ATTR_DLL_LOCAL CVisualizationSpectrum : public kodi::addon::CAddonBase, public kodi::addon::CInstanceVisualization, public kodi::gui::gl::CShaderProgram @@ -52,7 +52,7 @@ public: void Stop() override; void Render() override; void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override; - ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) override; + ADDON_STATUS SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) override; void OnCompiledAndLinked() override; bool OnEnabled() override; @@ -106,10 +106,10 @@ CVisualizationSpectrum::CVisualizationSp { m_scale = 1.0 / log(256.0); - SetBarHeightSetting(kodi::GetSettingInt("bar_height")); - SetSpeedSetting(kodi::GetSettingInt("speed")); - SetModeSetting(kodi::GetSettingInt("mode")); - m_y_fixedAngle = kodi::GetSettingInt("rotation_angle"); + SetBarHeightSetting(kodi::addon::GetSettingInt("bar_height")); + SetSpeedSetting(kodi::addon::GetSettingInt("speed")); + SetModeSetting(kodi::addon::GetSettingInt("mode")); + m_y_fixedAngle = kodi::addon::GetSettingInt("rotation_angle"); m_vertex_buffer_data.resize(48); m_color_buffer_data.resize(48); @@ -122,8 +122,8 @@ bool CVisualizationSpectrum::Start(int c (void)bitsPerSample; (void)songName; - std::string fraqShader = kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/frag.glsl"); - std::string vertShader = kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/vert.glsl"); + std::string fraqShader = kodi::addon::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/frag.glsl"); + std::string vertShader = kodi::addon::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/vert.glsl"); if (!LoadShaderFiles(vertShader, fraqShader) || !CompileAndLink()) { kodi::Log(ADDON_LOG_ERROR, "Failed to create or compile shader"); @@ -548,7 +548,7 @@ void CVisualizationSpectrum::SetModeSett case 2: m_mode = GL_POINTS; - m_pointSize = kodi::GetSettingInt("pointsize"); + m_pointSize = kodi::addon::GetSettingInt("pointsize"); break; case 0: @@ -563,7 +563,7 @@ void CVisualizationSpectrum::SetModeSett // Set a specific Setting value (called from Kodi) // !!! Add-on master function !!! //----------------------------------------------------------------------------- -ADDON_STATUS CVisualizationSpectrum::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) +ADDON_STATUS CVisualizationSpectrum::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) { if (settingName.empty() || settingValue.empty()) return ADDON_STATUS_UNKNOWN; diff -pruN 19.0.1+ds1-1/.travis.yml 20.1.0+ds1-1/.travis.yml --- 19.0.1+ds1-1/.travis.yml 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/.travis.yml 2022-01-01 12:21:58.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: diff -pruN 19.0.1+ds1-1/visualization.spectrum/addon.xml.in 20.1.0+ds1-1/visualization.spectrum/addon.xml.in --- 19.0.1+ds1-1/visualization.spectrum/addon.xml.in 2021-12-27 08:44:50.000000000 +0000 +++ 20.1.0+ds1-1/visualization.spectrum/addon.xml.in 2022-01-01 12:21:58.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@