diff -pruN 19.1.0+ds1-1/azure-pipelines.yml 20.3.0+ds1-1/azure-pipelines.yml --- 19.1.0+ds1-1/azure-pipelines.yml 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/azure-pipelines.yml 2022-03-03 13:32:28.000000000 +0000 @@ -5,6 +5,7 @@ trigger: branches: include: - Matrix + - Nexus - releases/* paths: include: @@ -46,7 +47,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.1.0+ds1-1/debian/changelog 20.3.0+ds1-1/debian/changelog --- 19.1.0+ds1-1/debian/changelog 2022-03-21 17:46:58.000000000 +0000 +++ 20.3.0+ds1-1/debian/changelog 2022-08-04 09:53:43.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-pvr-hdhomerun (20.3.0+ds1-1) unstable; urgency=medium + + * New upstream version 20.3.0+ds1 + * Prepare for v20 in unstable + + -- Vasyl Gello Thu, 04 Aug 2022 09:53:43 +0000 + kodi-pvr-hdhomerun (19.1.0+ds1-1) unstable; urgency=medium * New upstream version 19.1.0+ds1 diff -pruN 19.1.0+ds1-1/debian/control 20.3.0+ds1-1/debian/control --- 19.1.0+ds1-1/debian/control 2022-03-21 17:46:58.000000000 +0000 +++ 20.3.0+ds1-1/debian/control 2022-08-04 09:53:43.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, libhdhomerun-dev (>= 20200225), libjsoncpp-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-pvr-hdhomerun Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-pvr-hdhomerun.git diff -pruN 19.1.0+ds1-1/debian/copyright 20.3.0+ds1-1/debian/copyright --- 19.1.0+ds1-1/debian/copyright 2021-01-20 07:19:44.000000000 +0000 +++ 20.3.0+ds1-1/debian/copyright 2022-08-04 09:53:43.000000000 +0000 @@ -5,14 +5,14 @@ Files-Excluded: depends Files: * Copyright: 2005-2013, Team XBMC - 2013-2021, Team Kodi + 2013-2022, Team Kodi 2011, Pulse-Eight 2015, Zoltan Csizmadia License: GPL-2+ Files: debian/* Copyright: 2015 Balint Reczey - 2020-2021 Vasyl Gello + 2020-2022 Vasyl Gello License: GPL-2+ diff -pruN 19.1.0+ds1-1/debian/watch 20.3.0+ds1-1/debian/watch --- 19.1.0+ds1-1/debian/watch 2021-08-26 10:27:44.000000000 +0000 +++ 20.3.0+ds1-1/debian/watch 2022-08-04 09:53:43.000000000 +0000 @@ -5,4 +5,4 @@ opts="repack, \ repacksuffix=+ds1, \ dversionmangle=auto" \ https://github.com/kodi-pvr/pvr.hdhomerun/releases \ -/kodi-pvr/pvr.hdhomerun/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/kodi-pvr/pvr.hdhomerun/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz diff -pruN 19.1.0+ds1-1/.github/workflows/build.yml 20.3.0+ds1-1/.github/workflows/build.yml --- 19.1.0+ds1-1/.github/workflows/build.yml 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/.github/workflows/build.yml 2022-03-03 13:32:28.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 pvr.hdhomerun 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.1.0+ds1-1/.github/workflows/changelog-and-release.yml 20.3.0+ds1-1/.github/workflows/changelog-and-release.yml --- 19.1.0+ds1-1/.github/workflows/changelog-and-release.yml 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/.github/workflows/changelog-and-release.yml 2022-03-03 13:32:28.000000000 +0000 @@ -133,7 +133,7 @@ jobs: shell: bash # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 1.0.0-Matrix + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff -pruN 19.1.0+ds1-1/.github/workflows/release.yml 20.3.0+ds1-1/.github/workflows/release.yml --- 19.1.0+ds1-1/.github/workflows/release.yml 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/.github/workflows/release.yml 2022-03-03 13:32:28.000000000 +0000 @@ -50,7 +50,7 @@ jobs: working-directory: ${{ github.event.repository.name }} # Create a release at {steps.required-variables.outputs.branch} - # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 1.0.0-Matrix + # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus # - release body: {steps.required-variables.outputs.changes} - name: Create Release id: create-release diff -pruN 19.1.0+ds1-1/Jenkinsfile 20.3.0+ds1-1/Jenkinsfile --- 19.1.0+ds1-1/Jenkinsfile 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/Jenkinsfile 2022-03-03 13:32:28.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix") +buildPlugin(version: "Nexus") diff -pruN 19.1.0+ds1-1/pvr.hdhomerun/addon.xml.in 20.3.0+ds1-1/pvr.hdhomerun/addon.xml.in --- 19.1.0+ds1-1/pvr.hdhomerun/addon.xml.in 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/pvr.hdhomerun/addon.xml.in 2022-03-03 13:32:28.000000000 +0000 @@ -1,8 +1,8 @@ @ADDON_DEPENDS@ #include -class ATTRIBUTE_HIDDEN HDHomeRunTuners +class ATTR_DLL_LOCAL HDHomeRunTuners : public kodi::addon::CAddonBase, public kodi::addon::CInstancePVRClient { @@ -60,7 +60,7 @@ public: void Unlock() { m_Lock.unlock(); } ADDON_STATUS Create() 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; PVR_ERROR GetCapabilities(kodi::addon::PVRCapabilities& capabilities) override; PVR_ERROR GetBackendName(std::string& name) override; diff -pruN 19.1.0+ds1-1/src/Settings.cpp 20.3.0+ds1-1/src/Settings.cpp --- 19.1.0+ds1-1/src/Settings.cpp 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/src/Settings.cpp 2022-03-03 13:32:28.000000000 +0000 @@ -17,17 +17,17 @@ SettingsType& SettingsType::Get() bool SettingsType::ReadSettings() { - bHideProtected = kodi::GetSettingBoolean("hide_protected", true); - bHideDuplicateChannels = kodi::GetSettingBoolean("hide_duplicate", true); - bMarkNew = kodi::GetSettingBoolean("mark_new", true); - bDebug = kodi::GetSettingBoolean("debug", false); - bHttpDiscovery = kodi::GetSettingBoolean("http_discovery", false); + bHideProtected = kodi::addon::GetSettingBoolean("hide_protected", true); + bHideDuplicateChannels = kodi::addon::GetSettingBoolean("hide_duplicate", true); + bMarkNew = kodi::addon::GetSettingBoolean("mark_new", true); + bDebug = kodi::addon::GetSettingBoolean("debug", false); + bHttpDiscovery = kodi::addon::GetSettingBoolean("http_discovery", false); return true; } ADDON_STATUS SettingsType::SetSetting(const std::string& settingName, - const kodi::CSettingValue& settingValue) + const kodi::addon::CSettingValue& settingValue) { if (settingName == "hide_protected") { diff -pruN 19.1.0+ds1-1/src/Settings.h 20.3.0+ds1-1/src/Settings.h --- 19.1.0+ds1-1/src/Settings.h 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/src/Settings.h 2022-03-03 13:32:28.000000000 +0000 @@ -11,13 +11,13 @@ #include -class ATTRIBUTE_HIDDEN SettingsType +class ATTR_DLL_LOCAL SettingsType { public: static SettingsType& Get(); bool ReadSettings(); - ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue); + ADDON_STATUS SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue); bool GetHideProtected() const { return bHideProtected; } bool GetHideDuplicateChannels() const { return bHideDuplicateChannels; } diff -pruN 19.1.0+ds1-1/.travis.yml 20.3.0+ds1-1/.travis.yml --- 19.1.0+ds1-1/.travis.yml 2022-03-04 20:08:51.000000000 +0000 +++ 20.3.0+ds1-1/.travis.yml 2022-03-03 13:32:28.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 update; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; 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: