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 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/azure-pipelines.yml 2022-01-01 11:07:35.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:38.000000000 +0000 +++ 20.1.0+ds1-1/debian/changelog 2022-08-04 09:55:27.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-peripheral-joystick (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:27 +0000 + kodi-peripheral-joystick (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:38.000000000 +0000 +++ 20.1.0+ds1-1/debian/control 2022-08-04 09:55:27.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, libudev-dev, libtinyxml-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-peripheral-joystick Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-peripheral-joystick.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 07:12:28.000000000 +0000 +++ 20.1.0+ds1-1/debian/copyright 2022-08-04 09:55:27.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/xbmc/peripher Files-Excluded: depends Files: * -Copyright: 2005-2021 Team Kodi +Copyright: 2005-2022 Team Kodi 2010-2015 Hans-Kristian Arntzen 2011-2016 Daniel De Matteis 2013-2014 Lars Op den Kamp @@ -14,7 +14,7 @@ License: GPL-2+ Files: debian/* Copyright: 2017-2020 Christian Marillat - 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:21:26.000000000 +0000 +++ 20.1.0+ds1-1/debian/watch 2022-08-04 09:55:27.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/xbmc/peripheral.joystick/releases \ -/xbmc/peripheral.joystick/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/xbmc/peripheral.joystick/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 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/Jenkinsfile 2022-01-01 11:07:35.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix", deploy: ['ubuntu-ppa']) +buildPlugin(version: "Nexus", deploy: ['ubuntu-ppa']) diff -pruN 19.0.1+ds1-1/peripheral.joystick/addon.xml.in 20.1.0+ds1-1/peripheral.joystick/addon.xml.in --- 19.0.1+ds1-1/peripheral.joystick/addon.xml.in 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/peripheral.joystick/addon.xml.in 2022-01-01 11:07:35.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ 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 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/README.md 2022-01-01 11:07:35.000000000 +0000 @@ -1,6 +1,6 @@ [![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.peripheral.joystick?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=50&branchName=Matrix) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/peripheral.joystick/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fperipheral.joystick/branches/) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.peripheral.joystick?branchName=Nexus)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=50&branchName=Nexus) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/peripheral.joystick/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fperipheral.joystick/branches/) # Joystick support for Kodi diff -pruN 19.0.1+ds1-1/src/addon.cpp 20.1.0+ds1-1/src/addon.cpp --- 19.0.1+ds1-1/src/addon.cpp 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/addon.cpp 2022-01-01 11:07:35.000000000 +0000 @@ -47,21 +47,12 @@ ADDON_STATUS CPeripheralJoystick::Create return ADDON_STATUS_NEED_SETTINGS; } -ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) +ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) { CSettings::Get().SetSetting(settingName, settingValue); return ADDON_STATUS_OK; } - -ADDON_STATUS CPeripheralJoystick::GetStatus() -{ - if (!CSettings::Get().IsInitialized()) - return ADDON_STATUS_NEED_SETTINGS; - - return ADDON_STATUS_OK; -} - CPeripheralJoystick::~CPeripheralJoystick() { CStorageManager::Get().Deinitialize(); diff -pruN 19.0.1+ds1-1/src/addon.h 20.1.0+ds1-1/src/addon.h --- 19.0.1+ds1-1/src/addon.h 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/addon.h 2022-01-01 11:07:35.000000000 +0000 @@ -26,8 +26,7 @@ public: virtual ~CPeripheralJoystick(); ADDON_STATUS Create() override; - ADDON_STATUS GetStatus() 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 GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override; PERIPHERAL_ERROR PerformDeviceScan(std::vector>& scan_results) override; diff -pruN 19.0.1+ds1-1/src/filesystem/DirectoryCache.h 20.1.0+ds1-1/src/filesystem/DirectoryCache.h --- 19.0.1+ds1-1/src/filesystem/DirectoryCache.h 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/filesystem/DirectoryCache.h 2022-01-01 11:07:35.000000000 +0000 @@ -8,6 +8,8 @@ #pragma once +#include "utils/CommonMacros.h" + #include #include @@ -27,7 +29,7 @@ namespace JOYSTICK virtual void OnRemove(const kodi::vfs::CDirEntry& item) = 0; }; - class CDirectoryCache + class DLL_PRIVATE CDirectoryCache { public: void Initialize(IDirectoryCacheCallback* callbacks); diff -pruN 19.0.1+ds1-1/src/log/LogAddon.cpp 20.1.0+ds1-1/src/log/LogAddon.cpp --- 19.0.1+ds1-1/src/log/LogAddon.cpp 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/log/LogAddon.cpp 2022-01-01 11:07:35.000000000 +0000 @@ -20,7 +20,7 @@ CLogAddon::CLogAddon() void CLogAddon::Log(SYS_LOG_LEVEL level, const char* logline) { - AddonLog loglevel; + ADDON_LOG loglevel; switch (level) { diff -pruN 19.0.1+ds1-1/src/settings/Settings.cpp 20.1.0+ds1-1/src/settings/Settings.cpp --- 19.0.1+ds1-1/src/settings/Settings.cpp 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/settings/Settings.cpp 2022-01-01 11:07:35.000000000 +0000 @@ -33,7 +33,7 @@ CSettings& CSettings::Get(void) return _instance; } -void CSettings::SetSetting(const std::string& strName, const kodi::CSettingValue& value) +void CSettings::SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value) { if (strName == SETTING_RETROARCH_CONFIG) { diff -pruN 19.0.1+ds1-1/src/settings/Settings.h 20.1.0+ds1-1/src/settings/Settings.h --- 19.0.1+ds1-1/src/settings/Settings.h 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/settings/Settings.h 2022-01-01 11:07:35.000000000 +0000 @@ -24,7 +24,7 @@ namespace JOYSTICK /*! * \brief Set the value of a setting. Called by the frontend. */ - void SetSetting(const std::string& strName, const kodi::CSettingValue& value); + void SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value); /*! * \brief Check if the settings have been initialized diff -pruN 19.0.1+ds1-1/src/storage/JustABunchOfFiles.h 20.1.0+ds1-1/src/storage/JustABunchOfFiles.h --- 19.0.1+ds1-1/src/storage/JustABunchOfFiles.h 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/storage/JustABunchOfFiles.h 2022-01-01 11:07:35.000000000 +0000 @@ -25,7 +25,7 @@ namespace JOYSTICK /*! * \brief Container class for device records and button maps */ - class CResources + class DLL_PRIVATE CResources { public: CResources(const CJustABunchOfFiles* database); @@ -55,8 +55,8 @@ namespace JOYSTICK ResourceMap m_resources; }; - class CJustABunchOfFiles : public IDatabase, - public IDirectoryCacheCallback + class DLL_PRIVATE CJustABunchOfFiles : public IDatabase, + public IDirectoryCacheCallback { public: CJustABunchOfFiles(const std::string& strResourcePath, diff -pruN 19.0.1+ds1-1/src/storage/xml/DatabaseXml.h 20.1.0+ds1-1/src/storage/xml/DatabaseXml.h --- 19.0.1+ds1-1/src/storage/xml/DatabaseXml.h 2022-01-01 11:33:33.000000000 +0000 +++ 20.1.0+ds1-1/src/storage/xml/DatabaseXml.h 2022-01-01 11:07:35.000000000 +0000 @@ -19,7 +19,7 @@ namespace JOYSTICK { class IControllerHelper; - class CDatabaseXml : public CJustABunchOfFiles + class DLL_PRIVATE CDatabaseXml : public CJustABunchOfFiles { public: CDatabaseXml(const std::string& strBasePath, bool bReadWrite, IDatabaseCallbacks* callbacks, IControllerHelper *controllerHelper);