diff -pruN 19.0.1-1/debian/changelog 20.1.0-1/debian/changelog --- 19.0.1-1/debian/changelog 2022-03-21 17:51:11.000000000 +0000 +++ 20.1.0-1/debian/changelog 2022-08-04 09:57:18.000000000 +0000 @@ -1,3 +1,10 @@ +kodi-peripheral-xarcade (20.1.0-1) unstable; urgency=medium + + * New upstream version 20.1.0 + * Prepare for v20 in unstable + + -- Vasyl Gello Thu, 04 Aug 2022 09:57:18 +0000 + kodi-peripheral-xarcade (19.0.1-1) unstable; urgency=medium * New upstream version 19.0.1 diff -pruN 19.0.1-1/debian/control 20.1.0-1/debian/control --- 19.0.1-1/debian/control 2022-03-21 17:51:11.000000000 +0000 +++ 20.1.0-1/debian/control 2022-08-04 09:57:18.000000000 +0000 @@ -4,10 +4,10 @@ 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, pkg-config -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-xarcade Vcs-Git: https://salsa.debian.org/multimedia-team/kodi-media-center/kodi-peripheral-xarcade.git diff -pruN 19.0.1-1/debian/copyright 20.1.0-1/debian/copyright --- 19.0.1-1/debian/copyright 2021-01-20 07:12:54.000000000 +0000 +++ 20.1.0-1/debian/copyright 2022-08-04 09:57:18.000000000 +0000 @@ -3,12 +3,12 @@ Upstream-Name: peripheral.xarcade Source: https://github.com/xbmc/peripheral.xarcade Files: * -Copyright: 2005-2021 Team Kodi +Copyright: 2005-2022 Team Kodi 2014-2021 Garrett Brown 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-1/debian/watch 20.1.0-1/debian/watch --- 19.0.1-1/debian/watch 2021-08-26 10:22:16.000000000 +0000 +++ 20.1.0-1/debian/watch 2022-08-04 09:57:18.000000000 +0000 @@ -1,3 +1,3 @@ version=4 https://github.com/kodi-game/peripheral.xarcade/releases \ -/kodi-game/peripheral.xarcade/archive/refs/tags/?(\d\S*)-Matrix\.tar\.gz +/kodi-game/peripheral.xarcade/archive/refs/tags/?(\d\S*)-Nexus\.tar\.gz diff -pruN 19.0.1-1/.github/workflows/build.yml 20.1.0-1/.github/workflows/build.yml --- 19.0.1-1/.github/workflows/build.yml 1970-01-01 00:00:00.000000000 +0000 +++ 20.1.0-1/.github/workflows/build.yml 2022-01-01 10:21:15.000000000 +0000 @@ -0,0 +1,61 @@ +name: Build and run tests +on: [push, pull_request] +env: + app_id: peripheral.xarcade + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - name: "Debian package test" + os: ubuntu-18.04 + CC: gcc + CXX: g++ + DEBIAN_BUILD: true + #- os: ubuntu-18.04 + #CC: gcc + #CXX: g++ + #- os: ubuntu-18.04 + #CC: clang + #CXX: clang++ + #- os: macos-10.15 + steps: + - name: Install needed ubuntu depends + env: + DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} + run: | + 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: master + path: xbmc + - name: Checkout audiodecoder.asap repo + uses: actions/checkout@v2 + with: + path: ${{ env.app_id }} + - name: Configure + env: + CC: ${{ matrix.CC }} + CXX: ${{ matrix.CXX }} + DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} + 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/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: + CC: ${{ matrix.CC }} + CXX: ${{ matrix.CXX }} + DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} + run: | + if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi + if [[ $DEBIAN_BUILD != true ]]; then make; fi + if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi diff -pruN 19.0.1-1/Jenkinsfile 20.1.0-1/Jenkinsfile --- 19.0.1-1/Jenkinsfile 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/Jenkinsfile 2022-01-01 10:21:15.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Matrix", platforms: ['ubuntu-ppa']) +buildPlugin(version: "Nexus", platforms: ['ubuntu-ppa']) diff -pruN 19.0.1-1/peripheral.xarcade/addon.xml.in 20.1.0-1/peripheral.xarcade/addon.xml.in --- 19.0.1-1/peripheral.xarcade/addon.xml.in 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/peripheral.xarcade/addon.xml.in 2022-01-01 10:21:15.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -17,7 +17,26 @@ resources/icon.png + X-Arcade Tankstick driver + Treiber für X-Arcade Tankstick X-Arcade Tankstick driver + Controlador X-Arcade Tankstick + Pilote Tankstick X-Arcade + X-Arcade Tankstick 드라이버 + Sterownik X-Arcade Tankstick + Driver X-Arcade Tankstick + Драйвер X-Arcade Tankstick + X-Arcade Tankstick sürücüsü + X-Arcade Tankstick 驱动 + Denne driver muliggør input fra X-Arcade Tankstick.[CR][CR]En udev-regel er nødvendig. Se https://kodi.wiki/view/Tankstick + Dieser Treiber ermöglicht Eingaben mit dem X-Arcade Tankstick.[CR][CR]Eine udev-Regel wird benötigt. Weitere Informationen unter https://kodi.wiki/view/Tankstick This driver enables input from the X-Arcade Tankstick.[CR][CR]A udev rule is needed. See https://kodi.wiki/view/Tankstick + Este controlador habilita la entrada del X-Arcade Tankstick.[CR][CR]Se requiere una regla udev. Consulta https://kodi.wiki/view/Tankstick + 이 드라이버는 X-Arcade Tankstick에서 입력을 활성화합니다.[CR][CR]udev 규칙이 필요합니다. https://kodi.wiki/view/Tankstick 참조 + Ten sterownik umożliwia odczyt danych wejściowych z urządzenia X-Arcade Tankstick.[CR][CR]Potrzebna jest reguła udev. Zobacz https://kodi.wiki/view/Tankstick + Este driver habilita a entrada para X-Arcade Tankstick. [CR][CR]Uma regra udev é necessária. Consulte https://kodi.wiki/view/Tankstick + Этот драйвер позволяет вводить данные с X-Arcade Tankstick.[CR][CR]Необходимо правило udev. См. https://kodi.wiki/view/Tankstick + Bu sürücü, X-Arcade Tankstick'ten giriş yapılmasını sağlar.[CR][CR]Bir udev kuralı gereklidir. https://kodi.wiki/view/Tankstick adresine bakınız + 此驱动程序启用来自 X-Arcade Tankstick 的输入。[CR][CR]需要 udev 规则。参见 https://kodi.wiki/view/Tankstick diff -pruN 19.0.1-1/peripheral.xarcade/resources/language/resource.language.fr_fr/strings.po 20.1.0-1/peripheral.xarcade/resources/language/resource.language.fr_fr/strings.po --- 19.0.1-1/peripheral.xarcade/resources/language/resource.language.fr_fr/strings.po 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/peripheral.xarcade/resources/language/resource.language.fr_fr/strings.po 2022-01-01 10:21:15.000000000 +0000 @@ -17,7 +17,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 4.9\n" -#, fuzzy msgctxt "Addon Summary" msgid "X-Arcade Tankstick driver" msgstr "Pilote Tankstick X-Arcade" @@ -25,3 +24,5 @@ msgstr "Pilote Tankstick X-Arcade" msgctxt "Addon Description" msgid "This driver enables input from the X-Arcade Tankstick.[CR][CR]A udev rule is needed. See https://kodi.wiki/view/Tankstick" msgstr "" + +#, fuzzy diff -pruN 19.0.1-1/README.md 20.1.0-1/README.md --- 19.0.1-1/README.md 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/README.md 2022-01-01 10:21:15.000000000 +0000 @@ -1,5 +1,5 @@ [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-game/job/peripheral.xarcade/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-game%2Fperipheral.xarcade/branches) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-game/job/peripheral.xarcade/job/Nexus/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-game%2Fperipheral.xarcade/branches) # X-Arcade Tankstick driver for Kodi diff -pruN 19.0.1-1/src/addon.cpp 20.1.0-1/src/addon.cpp --- 19.0.1-1/src/addon.cpp 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/src/addon.cpp 2022-01-01 10:21:15.000000000 +0000 @@ -28,17 +28,12 @@ CPeripheralXArcade::CPeripheralXArcade() ADDON_STATUS CPeripheralXArcade::Create() { - return GetStatus(); + return ADDON_STATUS_OK; } CPeripheralXArcade::~CPeripheralXArcade() = default; -ADDON_STATUS CPeripheralXArcade::GetStatus() -{ - return ADDON_STATUS_OK; -} - -ADDON_STATUS CPeripheralXArcade::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) +ADDON_STATUS CPeripheralXArcade::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) { return ADDON_STATUS_OK; } diff -pruN 19.0.1-1/src/addon.h 20.1.0-1/src/addon.h --- 19.0.1-1/src/addon.h 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/src/addon.h 2022-01-01 10:21:15.000000000 +0000 @@ -15,7 +15,7 @@ namespace XARCADE class CXArcadeScanner; } -class ATTRIBUTE_HIDDEN CPeripheralXArcade +class ATTR_DLL_LOCAL CPeripheralXArcade : public kodi::addon::CAddonBase, public kodi::addon::CInstancePeripheral { @@ -24,8 +24,7 @@ public: ~CPeripheralXArcade() override; 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-1/.travis.yml 20.1.0-1/.travis.yml --- 19.0.1-1/.travis.yml 2021-12-24 11:00:00.000000000 +0000 +++ 20.1.0-1/.travis.yml 2022-01-01 10:21:15.000000000 +0000 @@ -23,7 +23,7 @@ matrix: # before_script: - cd $TRAVIS_BUILD_DIR/.. - - 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 - mkdir -p definition/${app_id} - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt