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 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/appveyor.yml 2022-01-01 11:42:27.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 2021-12-27 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/azure-pipelines.yml 2022-01-01 11:42:27.000000000 +0000 @@ -4,7 +4,7 @@ variables: trigger: branches: include: - - Matrix + - Nexus - releases/* paths: include: @@ -48,7 +48,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:34.000000000 +0000 +++ 20.1.0+ds1-1/debian/changelog 2022-08-04 09:55:22.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-visualization-pictureit (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:22 +0000 + kodi-visualization-pictureit (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:34.000000000 +0000 +++ 20.1.0+ds1-1/debian/control 2022-08-04 09:55:22.000000000 +0000 @@ -5,12 +5,12 @@ Maintainer: Debian Multimedia Maintainer Uploaders: Vasyl Gello Build-Depends: debhelper-compat (= 13) Build-Depends-Arch: cmake, - dh-sequence-kodiaddon (>= 2:19~), + dh-sequence-kodiaddon (>= 2:20~), libgles2-mesa-dev [arm64 armel armhf], libgl1-mesa-dev [!arm64 !armel !armhf], libglm-dev, libkissfft-dev (>= 131.1.0~) -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-pictureit Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-visualization-pictureit.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:11:32.000000000 +0000 +++ 20.1.0+ds1-1/debian/copyright 2022-08-04 09:55:22.000000000 +0000 @@ -4,12 +4,12 @@ Files-Excluded: depends lib Files: * -Copyright: 2018-2021 Team Kodi +Copyright: 2018-2022 Team Kodi 2015-2019 LinuxWhatElse License: GPL-2+ 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:51:39.000000000 +0000 +++ 20.1.0+ds1-1/debian/watch 2022-08-04 09:55:22.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/xbmc/visualization.pictureit/releases \ -/xbmc/visualization.pictureit/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/xbmc/visualization.pictureit/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 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/Jenkinsfile 2022-01-01 11:42:27.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff -pruN 19.0.1+ds1-1/src/pictureit.cpp 20.1.0+ds1-1/src/pictureit.cpp --- 19.0.1+ds1-1/src/pictureit.cpp 2021-12-27 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/src/pictureit.cpp 2022-01-01 11:42:27.000000000 +0000 @@ -64,23 +64,23 @@ CVisPictureIt::~CVisPictureIt() ADDON_STATUS CVisPictureIt::Create() { - m_presetsRootDir = kodi::GetSettingString("presets_root_dir"); + m_presetsRootDir = kodi::addon::GetSettingString("presets_root_dir"); - m_updateOnNewTrack = kodi::GetSettingBoolean("update_on_new_track"); - m_updateByInterval = kodi::GetSettingBoolean("update_by_interval"); - m_imgUpdateInterval = kodi::GetSettingInt("img_update_interval"); - m_fadeTimeMs = kodi::GetSettingInt("fade_time_ms"); - m_visEnabled = kodi::GetSettingBoolean("vis_enabled"); - m_visBgEnabled = kodi::GetSettingBoolean("vis_bg_enabled"); + m_updateOnNewTrack = kodi::addon::GetSettingBoolean("update_on_new_track"); + m_updateByInterval = kodi::addon::GetSettingBoolean("update_by_interval"); + m_imgUpdateInterval = kodi::addon::GetSettingInt("img_update_interval"); + m_fadeTimeMs = kodi::addon::GetSettingInt("fade_time_ms"); + m_visEnabled = kodi::addon::GetSettingBoolean("vis_enabled"); + m_visBgEnabled = kodi::addon::GetSettingBoolean("vis_bg_enabled"); - m_visWidth = kodi::GetSettingInt("vis_half_width"); + m_visWidth = kodi::addon::GetSettingInt("vis_half_width"); m_visWidth = m_visWidth * 1.0f / 100; - m_visAnimationSpeed = kodi::GetSettingInt("vis_animation_speed"); + m_visAnimationSpeed = kodi::addon::GetSettingInt("vis_animation_speed"); m_visAnimationSpeed = m_visAnimationSpeed * 0.005f / 100; float scale[] = {1.0, 0.98, 0.96, 0.94, 0.92, 0.90, 0.88, 0.86, 0.84, 0.82, 0.80}; - m_visBottomEdge = scale[kodi::GetSettingInt("vis_bottom_edge")]; + m_visBottomEdge = scale[kodi::addon::GetSettingInt("vis_bottom_edge")]; return ADDON_STATUS_OK; } @@ -131,8 +131,8 @@ bool CVisPictureIt::Start(int iChannels, { if (!m_shadersLoaded) { - 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()) return false; m_shadersLoaded = true; diff -pruN 19.0.1+ds1-1/src/pictureit.h 20.1.0+ds1-1/src/pictureit.h --- 19.0.1+ds1-1/src/pictureit.h 2021-12-27 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/src/pictureit.h 2022-01-01 11:42:27.000000000 +0000 @@ -50,9 +50,9 @@ class MRFFT; typedef std::vector td_vec_str; typedef std::map td_map_data; -class ATTRIBUTE_HIDDEN CVisPictureIt : public kodi::addon::CAddonBase, - public kodi::addon::CInstanceVisualization, - public kodi::gui::gl::CShaderProgram +class ATTR_DLL_LOCAL CVisPictureIt : public kodi::addon::CAddonBase, + public kodi::addon::CInstanceVisualization, + public kodi::gui::gl::CShaderProgram { public: CVisPictureIt(); 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 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/.travis.yml 2022-01-01 11:42:27.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 [[ "$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 ]]; then sudo apt-get install fakeroot; fi @@ -42,12 +42,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.pictureit/addon.xml.in 20.1.0+ds1-1/visualization.pictureit/addon.xml.in --- 19.0.1+ds1-1/visualization.pictureit/addon.xml.in 2021-12-27 17:44:37.000000000 +0000 +++ 20.1.0+ds1-1/visualization.pictureit/addon.xml.in 2022-01-01 11:42:27.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@