Skip to content

Commit

Permalink
Merge pull request #45 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix] final Matrix change to correct test builds and take as Version 19.0.0
  • Loading branch information
AlwinEsch committed Aug 29, 2021
2 parents 90128e0 + 237cb6b commit a7f8418
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -34,12 +34,12 @@ before_install:
#
before_script:
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --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/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 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 sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi

script:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -13,12 +13,12 @@ This is a [Kodi](https://kodi.tv) VORBIS audio encoder add-on.
## Build instructions

When building the addon you have to use the correct branch depending on which version of Kodi you're building against.
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.
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.
Also make sure you follow this README from the branch in question.

### Linux

1. `git clone --branch master https://github.com/xbmc/xbmc.git`
1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git`
2. `git clone --branch Matrix https://github.com/audioencoder.vorbis/audioencoder.vorbis.git`
3. `cd audioencoder.vorbis && mkdir build && cd build`
4. `cmake -DADDONS_TO_BUILD=audioencoder.vorbis -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons`
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -27,7 +27,7 @@ environment:

build_script:
- cd ..
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
- git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git
- cd %app_id%
- mkdir build
- cd build
Expand Down
2 changes: 1 addition & 1 deletion audioencoder.vorbis/addon.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="audioencoder.vorbis"
version="3.0.1"
version="19.0.0"
name="Vorbis Audio Encoder"
provider-name="spiff">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Expand Up @@ -46,7 +46,7 @@ jobs:

- script: |
cd ..
git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi
cd $(Build.SourcesDirectory)
mkdir build
cd build
Expand Down

0 comments on commit a7f8418

Please sign in to comment.