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

Merge pull request #52 from AlwinEsch/Matrix-change

Browse Source 
[Matrix/Nexus] some cleanup
This commit is contained in:
Kai Sommerfeld
2021-09-18 20:18:43 +02:00
committed by GitHub
parent 2325d7ff2d 07ef28ed18
commit 94d6b5fce7
15 changed files with 239 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,61 @@
name: Build and run tests
on: [push, pull_request]
env:
app_id: pvr.octonet
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 pvr.argustv 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

62
.github/workflows/increment-version.yml vendored Normal file
View File

@@ -0,0 +1,62 @@
name: Increment version when languages are updated
on:
push:
branches: [ Matrix, Nexus ]
paths:
- '**resource.language.**strings.po'
jobs:
default:
if: github.repository == 'DigitalDevices/pvr.octonet'
runs-on: ubuntu-latest
name: Increment add-on version when languages are updated
steps:
- name: Checkout Repository
uses: actions/checkout@v2
with:
fetch-depth: 0
path: ${{ github.event.repository.name }}
- name: Checkout Scripts
uses: actions/checkout@v2
with:
fetch-depth: 0
repository: xbmc/weblate-supplementary-scripts
path: scripts
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.9'
- name: Get changed files
uses: trilom/file-changes-action@v1.2.4
- name: Increment add-on version
run: |
python3 ../scripts/binary/increment_version.py $HOME/files.json -c -n
working-directory: ${{ github.event.repository.name }}
- name: Install dependencies
run: |
sudo apt-get install libxml2-utils xmlstarlet
- name: Get required variables
id: required-variables
run: |
version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)')
echo ::set-output name=version::$version
working-directory: ${{ github.event.repository.name }}
- name: Create PR for incrementing add-on versions
uses: peter-evans/create-pull-request@v3.10.0
with:
commit-message: Add-on version incremented to ${{ steps.required-variables.outputs.version }} from Weblate
title: Add-on version incremented to ${{ steps.required-variables.outputs.version }} from Weblate
body: Add-on version incremented triggered by ${{ github.sha }}
branch: inc-ver
delete-branch: true
path: ./${{ github.event.repository.name }}

57
.github/workflows/sync-addon-metadata-translations.yml vendored Normal file
View File

@@ -0,0 +1,57 @@
name: Sync addon metadata translations
on:
push:
branches: [ Matrix, Nexus ]
paths:
- '**addon.xml.in'
- '**resource.language.**strings.po'
jobs:
default:
if: github.repository == 'DigitalDevices/pvr.octonet'
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [ 3.9 ]
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
path: project
- name: Checkout sync_addon_metadata_translations repository
uses: actions/checkout@v2
with:
repository: xbmc/sync_addon_metadata_translations
path: sync_addon_metadata_translations
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install sync_addon_metadata_translations/
- name: Run sync-addon-metadata-translations
run: |
sync-addon-metadata-translations
working-directory: ./project
- name: Create PR for sync-addon-metadata-translations changes
uses: peter-evans/create-pull-request@v3.10.0
with:
commit-message: Sync of addon metadata translations
title: Sync of addon metadata translations
body: Sync of addon metadata translations triggered by ${{ github.sha }}
branch: amt-sync
delete-branch: true
path: ./project

2
README.md
View File

@@ -3,7 +3,7 @@ Digital Devices [Octonet](http://www.digital-devices.eu/shop/de/netzwerk-tv/) PV
| Platform | Status |
|----------|--------|
| Linux + OS X (Travis) | [![Build Status](https://travis-ci.org/julianscheel/pvr.octonet.svg?branch=master)](https://travis-ci.org/julianscheel/pvr.octonet) |
| Linux + OS X (github) | [![Build and run tests](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/kodi-pvr/pvr.octonet/actions/workflows/build.yml) |
| Windows (AppVeyor) | [![Build status](https://ci.appveyor.com/api/projects/status/m7dhmpmuf5coir5h?svg=true)](https://ci.appveyor.com/project/julianscheel/pvr-octonet) |
# Building

45
appveyor.yml
View File

@@ -1,40 +1,33 @@
version: BuildNr.{build}
init:
- ps: $commit = $env:appveyor_repo_commit.SubString(0,7)
- ps: $timestamp = $env:appveyor_repo_commit_timestamp.SubString(0,10)
- ps: Update-AppveyorBuild -Version ("{0}-{1}-{2}" -f $env:appveyor_repo_branch, $commit, $timestamp)
image: Visual Studio 2017
shallow_clone: true
# clone directory
clone_folder: c:\projects\pvr.octonet
# fetch repository as zip archive
shallow_clone: true # default is "false"
environment:
ADDON: pvr.octonet
app_id: pvr.octonet
matrix:
#- GENERATOR: "Visual Studio 14"
# CONFIG: Debug
- GENERATOR: "Visual Studio 14"
- GENERATOR: "Visual Studio 15"
CONFIG: Release
artifacts:
- path: build/install/
name: pvr.octonet
type: zip
- GENERATOR: "Visual Studio 15 Win64"
CONFIG: Release
- GENERATOR: "Visual Studio 15 Win64"
CONFIG: Release
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.17763.0"
build_script:
- cd ..
- set ROOT=%cd%
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
- mkdir xbmc\cmake\addons\addons\pvr.octonet
- echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
- cd %ADDON%
- git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git
- cd %app_id%
- mkdir build
- cd build
# Must use absolute path for cmake to build depends correctly
- cmake -G "%GENERATOR%" -DADDONS_TO_BUILD=%ADDON% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDON_SRC_PREFIX=%ROOT% -DCMAKE_INSTALL_PREFIX=install -DPACKAGE_ZIP=1 %ROOT%\xbmc\cmake\addons
- cmake --build . --config %CONFIG%
- mkdir -p definition\%app_id%
- echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
- cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
- cmake --build . --config %CONFIG% --target %app_id%

4
debian/copyright vendored
View File

@@ -5,7 +5,7 @@ Source: https://github.com/DigitalDevices/pvr.octonet
Files: *
Copyright: 2015-2016 Julian Scheel
2015-2016 jusst technologies GmbH
2005-2020 Team Kodi
2005-2021 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ License: GPL-2+
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: debian/*
Copyright: 2020 Team Kodi
Copyright: 2020-2021 Team Kodi
2016 Julian Scheel <julian@jusst.de>
2015 Jean-Luc Barriere
2015 wsnipex <wsnipex@a1.net>

5
debian/rules vendored
View File

@@ -14,10 +14,7 @@
override_dh_auto_configure:
# USE_LTO breaks build
dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1
override_dh_strip:
dh_strip -pkodi-pvr-octonet --dbg-package=kodi-pvr-octonet-dbg
dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1
override_dh_installdocs:
dh_installdocs --link-doc=kodi-pvr-octonet

2
debian/source/format vendored
View File

@@ -1 +1 @@
3.0 (quilt)
3.0 (native)

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

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.octonet"
version="4.1.0"
name="Digital Devices Octopus NET Client"
provider-name="digitaldevices">
<requires>@ADDON_DEPENDS@</requires>
<extension
point="kodi.pvrclient"
library_@PLATFORM@="@LIBRARY_FILENAME@"/>
<extension point="xbmc.addon.metadata">
<summary lang="de_DE">Kodi PVR Addon für Digital Devices Octopus NET Streams</summary>
<summary lang="en_US">Kodi PVR Addon for Digital Devices Octopus NET Streams</summary>
<platform>@PLATFORM@</platform>
<license>GPL-2.0-or-later</license>
<source>https://github.com/DigitalDevices/pvr.octonet</source>
<news>
</news>
</extension>
id="pvr.octonet"
version="4.1.0"
name="Digital Devices Octopus NET Client"
provider-name="digitaldevices">
<requires>@ADDON_DEPENDS@</requires>
<extension
point="kodi.pvrclient"
library_@PLATFORM@="@LIBRARY_FILENAME@"/>
<extension point="xbmc.addon.metadata">
<platform>@PLATFORM@</platform>
<license>GPL-2.0-or-later</license>
<source>https://github.com/DigitalDevices/pvr.octonet</source>
<news>
</news>
<summary lang="de_DE">Kodi PVR Addon für Digital Devices Octopus NET Streams</summary>
<summary lang="en_GB">Kodi PVR Addon for Digital Devices Octopus NET Streams</summary>
</extension>
</addon>

10
pvr.octonet/resources/language/resource.language.en_us/strings.po → pvr.octonet/resources/language/resource.language.de_de/strings.po
View File

@@ -5,17 +5,21 @@
msgid ""
msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
"Report-Msgid-Bugs-To: https://github.com/DigitalDevices/pvr.octonet/issues\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
"Language-Team: German (Germany) (https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-octonet/de_de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgctxt "Addon Summary"
msgid "Kodi PVR Addon for Digital Devices Octopus NET Streams"
msgstr "Kodi PVR Addon für Digital Devices Octopus NET Streams"
msgctxt "#30000"
msgid "Octonet Server Address"
msgstr ""

8
pvr.octonet/resources/language/resource.language.en_gb/strings.po
View File

@@ -5,17 +5,21 @@
msgid ""
msgstr ""
"Project-Id-Version: KODI Main\n"
"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
"Report-Msgid-Bugs-To: https://github.com/DigitalDevices/pvr.octonet/issues\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
"Language-Team: English (United Kingdom) (https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-octonet/en_gb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgctxt "Addon Summary"
msgid "Kodi PVR Addon for Digital Devices Octopus NET Streams"
msgstr ""
msgctxt "#30000"
msgid "Octonet Server Address"
msgstr ""

3
src/Socket.cpp
View File

@@ -1,6 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi
* https://kodi.tv
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.

3
src/Socket.h
View File

@@ -1,6 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi
* https://kodi.tv
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.

3
src/rtsp_client.cpp
View File

@@ -1,6 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi
* https://kodi.tv
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.

3
src/rtsp_client.hpp
View File

@@ -1,6 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi
* https://kodi.tv
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.