frodovdr/pvr.octonet
1
0
Fork 0
mirror of https://github.com/DigitalDevices/pvr.octonet.git synced 2025-03-01 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: frodovdr:22.0.0-Piers
Branches Tags
frodovdr:Piers frodovdr:Omega frodovdr:Nexus frodovdr:Matrix frodovdr:Leia frodovdr:master frodovdr:Krypton
frodovdr:22.2.0-Piers frodovdr:22.1.0-Piers frodovdr:22.0.0-Piers frodovdr:21.0.1-Omega frodovdr:21.0.0-Omega frodovdr:20.3.0-Nexus frodovdr:20.2.0-Nexus frodovdr:20.1.0-Nexus frodovdr:20.0.0-Nexus frodovdr:19.0.0-Matrix frodovdr:4.1.0-2-Matrix frodovdr:4.0.1-Matrix frodovdr:4.0.0-1-Matrix frodovdr:3.0.0-Matrix frodovdr:2.0.0-Matrix frodovdr:1.2.6-Matrix frodovdr:1.2.5-Matrix frodovdr:1.2.4-Matrix frodovdr:1.2.1-Matrix frodovdr:1.2.0-Matrix frodovdr:1.1.0-1-Matrix frodovdr:1.0.0-4-Matrix frodovdr:1.0.0-2-Matrix frodovdr:4.1.0-1-Matrix frodovdr:1.0.0-Matrix frodovdr:0.7.0-Leia frodovdr:4.1.0-Matrix frodovdr:1.2.3-Matrix frodovdr:1.0.0-3-Matrix frodovdr:1.2.2-Matrix frodovdr:4.0.0-Matrix frodovdr:1.0.0-1-Matrix frodovdr:0.3.7 frodovdr:0.3.6 frodovdr:0.3.5 frodovdr:0.3.4 frodovdr:0.3.3 frodovdr:0.3.2 frodovdr:0.1
...
compare: frodovdr:19.0.0-Matrix
Branches Tags
frodovdr:Omega frodovdr:Piers frodovdr:Nexus frodovdr:Matrix frodovdr:Leia frodovdr:master frodovdr:Krypton
frodovdr:22.2.0-Piers frodovdr:22.1.0-Piers frodovdr:22.0.0-Piers frodovdr:21.0.1-Omega frodovdr:21.0.0-Omega frodovdr:20.3.0-Nexus frodovdr:20.2.0-Nexus frodovdr:20.1.0-Nexus frodovdr:20.0.0-Nexus frodovdr:19.0.0-Matrix frodovdr:4.1.0-2-Matrix frodovdr:4.0.1-Matrix frodovdr:4.0.0-1-Matrix frodovdr:3.0.0-Matrix frodovdr:2.0.0-Matrix frodovdr:1.2.6-Matrix frodovdr:1.2.5-Matrix frodovdr:1.2.4-Matrix frodovdr:1.2.1-Matrix frodovdr:1.2.0-Matrix frodovdr:1.1.0-1-Matrix frodovdr:1.0.0-4-Matrix frodovdr:1.0.0-2-Matrix frodovdr:4.1.0-1-Matrix frodovdr:1.0.0-Matrix frodovdr:0.7.0-Leia frodovdr:4.1.0-Matrix frodovdr:1.2.3-Matrix frodovdr:1.0.0-3-Matrix frodovdr:1.2.2-Matrix frodovdr:4.0.0-Matrix frodovdr:1.0.0-1-Matrix frodovdr:0.3.7 frodovdr:0.3.6 frodovdr:0.3.5 frodovdr:0.3.4 frodovdr:0.3.3 frodovdr:0.3.2 frodovdr:0.1

3 Commits
22.0.0-Pie ... 19.0.0-Mat

Author SHA1 Message Date
Kai Sommerfeld
80ea2539ec Merge pull request #53 from AlwinEsch/Matrix-change 
[Matrix] final Matrix change to correct test builds and take as Version 19.0.0
 2021-09-19 10:33:29 +02:00
Alwin Esch
fcb500b4df increase version to 19.0.0 (see note below) 
With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi.
This done to know easier to which Kodi the addon works.

For here now used by Kodi 19 Matrix.
 2021-09-19 09:52:42 +02:00
Alwin Esch
43b1881487 change test builds to 'Kodi Matrix' 2021-09-19 09:52:19 +02:00
4 changed files with 9 additions and 9 deletions
Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@@ -27,14 +27,14 @@ jobs:
env: env:
DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }} DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
run: | run: |
if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
- name: Checkout Kodi repo - name: Checkout Kodi repo
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: xbmc/xbmc repository: xbmc/xbmc
ref: master ref: Matrix
path: xbmc path: xbmc
- name: Checkout pvr.argustv repo - name: Checkout pvr.argustv repo
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
run: | run: |
if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi 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 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 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 ${{ github.workspace }}/${app_id}; fi if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
- name: Build - name: Build
env: env:

6
.travis.yml
View File

@@ -31,7 +31,7 @@ matrix:
osx_image: xcode10.2 osx_image: xcode10.2
before_install: before_install:
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
@@ -41,12 +41,12 @@ before_install:
# #
before_script: before_script:
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi - 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 cd ${app_id} && mkdir build && cd build; fi
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; 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 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 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 - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
script: script:

4
README.md
View File

@@ -14,13 +14,13 @@ adjusted according to your OS (`/` vs `\`). We use Linux paths here as an exampl
Clone the `pvr.octonet` repository: Clone the `pvr.octonet` repository:
``` ```
$ git clone https://github.com/DigitalDevices/pvr.octonet.git $ git clone --branch Matrix https://github.com/DigitalDevices/pvr.octonet.git
``` ```
Clone the Kodi repository: Clone the Kodi repository:
``` ```
$ git clone --branch master https://github.com/xbmc/xbmc.git $ git clone --branch Matrix https://github.com/xbmc/xbmc.git
``` ```
``` ```

2
pvr.octonet/addon.xml.in
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon <addon
id="pvr.octonet" id="pvr.octonet"
version="4.1.0" version="19.0.0"
name="Digital Devices Octopus NET Client" name="Digital Devices Octopus NET Client"
provider-name="digitaldevices"> provider-name="digitaldevices">
<requires>@ADDON_DEPENDS@</requires> <requires>@ADDON_DEPENDS@</requires>