diff -Nru kodi-pvr-vdr-vnsi-3.6.3/azure-pipelines.yml kodi-pvr-vdr-vnsi-3.6.4/azure-pipelines.yml --- kodi-pvr-vdr-vnsi-3.6.3/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/azure-pipelines.yml 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'pvr.vdr.vnsi' + +trigger: + branches: + include: + - Leia + - releases/* + paths: + include: + - '*' + exclude: + - 'debian/*' + +jobs: + - job: Windows + + pool: + vmImage: 'VS2017-Win2016' + + strategy: + matrix: + Win32: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: Win32 + CONFIGURATION: Release + Win64: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + Win64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + ARM64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: ARM64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + + workspace: + clean: all + + steps: + + - script: | + cd .. + git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi + cd $(Build.SourcesDirectory) + mkdir build + cd build + mkdir "definition/$(app_id)" + echo $(app_id) . . > definition/$(app_id)/$(app_id).txt + mklink /J "$(Pipeline.Workspace)/$(app_id)" "$(Build.SourcesDirectory)" + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '--build . --config $(CONFIGURATION) --target $(app_id)' diff -Nru kodi-pvr-vdr-vnsi-3.6.3/CMakeLists.txt kodi-pvr-vdr-vnsi-3.6.4/CMakeLists.txt --- kodi-pvr-vdr-vnsi-3.6.3/CMakeLists.txt 2018-11-12 15:12:19.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,13 +1,9 @@ +cmake_minimum_required(VERSION 3.5) project(pvr.vdr.vnsi) -cmake_minimum_required(VERSION 2.6) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) -enable_language(CXX) - find_package(Kodi REQUIRED) -find_package(kodiplatform REQUIRED) find_package(p8-platform REQUIRED) add_definitions(-DUSE_DEMUX) @@ -81,9 +77,8 @@ message(STATUS "Configured render system: ${APP_RENDER_SYSTEM}") include_directories(${INCLUDES} - ${kodiplatform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS} - ${KODI_INCLUDE_DIR}) + ${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways build_addon(pvr.vdr.vnsi VDR DEPLIBS) diff -Nru kodi-pvr-vdr-vnsi-3.6.3/debian/changelog kodi-pvr-vdr-vnsi-3.6.4/debian/changelog --- kodi-pvr-vdr-vnsi-3.6.3/debian/changelog 2019-02-10 14:18:29.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-vdr-vnsi (3.6.3-1~xenial) xenial; urgency=low +kodi-pvr-vdr-vnsi (3.6.4-1~xenial) xenial; urgency=low [ xbmc ] * autogenerated dummy changelog diff -Nru kodi-pvr-vdr-vnsi-3.6.3/debian/control kodi-pvr-vdr-vnsi-3.6.4/debian/control --- kodi-pvr-vdr-vnsi-3.6.3/debian/control 2018-11-12 18:55:43.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -2,7 +2,7 @@ Priority: extra Maintainer: fernetmenta Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, - libkodiplatform-dev (>= 17.1.0), kodi-addon-dev, + libp8-platform-dev, kodi-addon-dev, libgles2-mesa-dev [arm], libgl1-mesa-dev [i386 amd64], pkg-config Standards-Version: 3.9.4 Section: libs diff -Nru kodi-pvr-vdr-vnsi-3.6.3/Jenkinsfile kodi-pvr-vdr-vnsi-3.6.4/Jenkinsfile --- kodi-pvr-vdr-vnsi-3.6.3/Jenkinsfile 2018-11-12 15:12:19.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin() +buildPlugin(version: "Leia") diff -Nru kodi-pvr-vdr-vnsi-3.6.3/pvr.vdr.vnsi/addon.xml.in kodi-pvr-vdr-vnsi-3.6.4/pvr.vdr.vnsi/addon.xml.in --- kodi-pvr-vdr-vnsi-3.6.3/pvr.vdr.vnsi/addon.xml.in 2019-02-09 20:21:12.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/pvr.vdr.vnsi/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-pvr-vdr-vnsi-3.6.3/pvr.vdr.vnsi/changelog.txt kodi-pvr-vdr-vnsi-3.6.4/pvr.vdr.vnsi/changelog.txt --- kodi-pvr-vdr-vnsi-3.6.3/pvr.vdr.vnsi/changelog.txt 2019-02-09 20:21:12.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/pvr.vdr.vnsi/changelog.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,3 +1,8 @@ +3.6.4 +- Remove usage of kodi-platform as depend +- Add Azure for Windows test builds +- Minor cleanups + 3.6.3 - With this version, kodi-pvr is upstream repo for this addon again. - Merged sources from FernetMenta/pvr.vdr.vnsi master. diff -Nru kodi-pvr-vdr-vnsi-3.6.3/README.md kodi-pvr-vdr-vnsi-3.6.4/README.md --- kodi-pvr-vdr-vnsi-3.6.3/README.md 2019-02-09 20:21:12.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,5 @@ -[![Build Status](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi) +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi.svg?branch=Leia)](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi/branches) +[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.vdr.vnsi?branchName=Leia)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=69&branchName=Leia) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # VDR VNSI PVR @@ -8,7 +9,7 @@ ### Linux -1. `git clone https://github.com/xbmc/xbmc.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/kodi-pvr/pvr.vdr.vnsi.git` 3. `cd pvr.vdr.vnsi && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=pvr.vdr.vnsi -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-pvr-vdr-vnsi-3.6.3/src/client.cpp kodi-pvr-vdr-vnsi-3.6.4/src/client.cpp --- kodi-pvr-vdr-vnsi-3.6.3/src/client.cpp 2018-11-12 15:12:19.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/src/client.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -20,7 +20,7 @@ */ #include "client.h" -#include "xbmc_pvr_dll.h" +#include "kodi/xbmc_pvr_dll.h" #include "VNSIDemux.h" #include "VNSIRecording.h" #include "VNSIData.h" diff -Nru kodi-pvr-vdr-vnsi-3.6.3/src/client.h kodi-pvr-vdr-vnsi-3.6.4/src/client.h --- kodi-pvr-vdr-vnsi-3.6.3/src/client.h 2018-11-12 15:12:19.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/src/client.h 2013-05-31 22:59:22.000000000 +0000 @@ -20,9 +20,9 @@ * */ -#include "libXBMC_addon.h" -#include "libXBMC_pvr.h" -#include "libKODI_guilib.h" +#include "kodi/libXBMC_addon.h" +#include "kodi/libXBMC_pvr.h" +#include "kodi/libKODI_guilib.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT 34890 diff -Nru kodi-pvr-vdr-vnsi-3.6.3/src/VNSIDemux.h kodi-pvr-vdr-vnsi-3.6.4/src/VNSIDemux.h --- kodi-pvr-vdr-vnsi-3.6.3/src/VNSIDemux.h 2018-11-12 15:12:19.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/src/VNSIDemux.h 2013-05-31 22:59:22.000000000 +0000 @@ -24,7 +24,7 @@ #include "client.h" #include #include -#include "xbmc_pvr_types.h" +#include "kodi/xbmc_pvr_types.h" class cResponsePacket; diff -Nru kodi-pvr-vdr-vnsi-3.6.3/.travis.yml kodi-pvr-vdr-vnsi-3.6.4/.travis.yml --- kodi-pvr-vdr-vnsi-3.6.3/.travis.yml 2019-02-09 20:21:12.000000000 +0000 +++ kodi-pvr-vdr-vnsi-3.6.4/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -32,7 +32,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Leia --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