diff -Nru kodi-audiodecoder-ncsf-2.0.1/appveyor.yml kodi-audiodecoder-ncsf-2.2.0/appveyor.yml --- kodi-audiodecoder-ncsf-2.0.1/appveyor.yml 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/appveyor.yml 2013-05-31 22:59:22.000000000 +0000 @@ -1,6 +1,6 @@ version: BuildNr.{build} -image: Visual Studio 2015 +image: Visual Studio 2017 shallow_clone: true @@ -10,20 +10,20 @@ app_id: audiodecoder.ncsf matrix: - - GENERATOR: "Visual Studio 14" + - GENERATOR: "Visual Studio 15" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" - - GENERATOR: "Visual Studio 14 ARM" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + - GENERATOR: "Visual Studio 15 ARM" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" build_script: - cd .. - - git clone --branch Leia --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 -Nru kodi-audiodecoder-ncsf-2.0.1/audiodecoder.ncsf/addon.xml.in kodi-audiodecoder-ncsf-2.2.0/audiodecoder.ncsf/addon.xml.in --- kodi-audiodecoder-ncsf-2.0.1/audiodecoder.ncsf/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/audiodecoder.ncsf/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-audiodecoder-ncsf-2.0.1/debian/changelog kodi-audiodecoder-ncsf-2.2.0/debian/changelog --- kodi-audiodecoder-ncsf-2.0.1/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-audiodecoder-ncsf (2.0.1-1~bionic) bionic; urgency=low +kodi-audiodecoder-ncsf (2.2.0-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-audiodecoder-ncsf-2.0.1/Jenkinsfile kodi-audiodecoder-ncsf-2.2.0/Jenkinsfile --- kodi-audiodecoder-ncsf-2.0.1/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Leia") +buildPlugin(version: "Matrix") diff -Nru kodi-audiodecoder-ncsf-2.0.1/README.md kodi-audiodecoder-ncsf-2.2.0/README.md --- kodi-audiodecoder-ncsf-2.0.1/README.md 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -1,14 +1,14 @@ # audiodecoder.ncsf addon for Kodi -This is a [Kodi](http://kodi.tv) audio decoder addon for NCSF files. +This is a [Kodi](https://kodi.tv) audio decoder addon for NCSF files. -[![Build Status](https://travis-ci.org/xbmc/audiodecoder.ncsf.svg?branch=master)](https://travis-ci.org/xbmc/audiodecoder.ncsf) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.ncsf?svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-ncsf) +[![Build Status](https://travis-ci.org/xbmc/audiodecoder.ncsf.svg?branch=Matrix)](https://travis-ci.org/xbmc/audiodecoder.ncsf/branches) +[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.ncsf?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-ncsf?branch=Matrix) ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository. +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 @@ -16,7 +16,7 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/xbmc/audiodecoder.ncsf.git` 3. `cd audiodecoder.ncsf && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=audiodecoder.ncsf -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-audiodecoder-ncsf-2.0.1/.travis.yml kodi-audiodecoder-ncsf-2.2.0/.travis.yml --- kodi-audiodecoder-ncsf-2.0.1/.travis.yml 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ncsf-2.2.0/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -22,16 +22,7 @@ sudo: required compiler: clang - os: osx - osx_image: xcode9 - -# -# Some of the OS X images don't have cmake, contrary to what people -# on the Internet say -# -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew upgrade cmake || true; fi + osx_image: xcode10.2 # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, @@ -39,7 +30,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch Leia --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