Skip to content

Commit 1d52ea7

Browse files
authored
Merge pull request #23 from AlwinEsch/Matrix-change
[Matrix] final Matrix change to correct test builds and take as Version 19.0.0
2 parents 18213a0 + bbfcd70 commit 1d52ea7

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix:
2828
env: DEBIAN_BUILD=true
2929

3030
before_install:
31-
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
31+
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
3232
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
3333
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
3434

@@ -38,12 +38,12 @@ before_install:
3838
#
3939
before_script:
4040
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
41-
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
41+
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; fi
4242
- if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
4343
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
4444
- if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
4545
- 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
46-
- 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
46+
- 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
4747
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
4848

4949
script:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ This is a [Kodi](https://kodi.tv) audio decoder addon for midi files.
77
## Build instructions
88

99
When building the addon you have to use the correct branch depending on which version of Kodi you're building against.
10-
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.
10+
If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename.
1111
Also make sure you follow this README from the branch in question.
1212

1313
### Linux
1414

1515
The following instructions assume you will have built Kodi already in the `kodi-build` directory
1616
suggested by the README.
1717

18-
1. `git clone --branch master https://github.com/xbmc/xbmc.git`
18+
1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git`
1919
2. `git clone --branch Matrix https://github.com/xbmc/audiodecoder.fluidsynth.git`
2020
3. `cd audiodecoder.fluidsynth && mkdir build && cd build`
2121
4. `cmake -DADDONS_TO_BUILD=audiodecoder.fluidsynth -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ environment:
2323

2424
build_script:
2525
- cd ..
26-
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
26+
- git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git
2727
- cd %app_id%
2828
- mkdir build
2929
- cd build

audiodecoder.fluidsynth/addon.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="audiodecoder.fluidsynth"
4-
version="3.0.0"
4+
version="19.0.0"
55
name="FluidSynth MIDI Audio Decoder"
66
provider-name="spiff">
77
<requires>@ADDON_DEPENDS@</requires>

0 commit comments

Comments
 (0)