diff -Nru kodi-screensaver-biogenesis-2.2.2/appveyor.yml kodi-screensaver-biogenesis-2.2.3/appveyor.yml --- kodi-screensaver-biogenesis-2.2.2/appveyor.yml 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/appveyor.yml 2020-02-22 05:03:18.000000000 +0000 @@ -1,6 +1,6 @@ version: BuildNr.{build} -image: Visual Studio 2015 +image: Visual Studio 2017 shallow_clone: true @@ -10,20 +10,20 @@ app_id: screensaver.biogenesis matrix: - - GENERATOR: "Visual Studio 14" + - GENERATOR: "Visual Studio 15" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - - GENERATOR: "Visual Studio 14 Win64" + - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" - - GENERATOR: "Visual Studio 14 ARM" + - GENERATOR: "Visual Studio 15 ARM" CONFIG: Release WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" build_script: - cd .. - - 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 diff -Nru kodi-screensaver-biogenesis-2.2.2/azure-pipelines.yml kodi-screensaver-biogenesis-2.2.3/azure-pipelines.yml --- kodi-screensaver-biogenesis-2.2.2/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/azure-pipelines.yml 2020-02-22 05:03:18.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'screensaver.biogenesis' + +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-screensaver-biogenesis-2.2.2/debian/changelog kodi-screensaver-biogenesis-2.2.3/debian/changelog --- kodi-screensaver-biogenesis-2.2.2/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-screensaver-biogenesis (2.2.2-1~xenial) xenial; urgency=low +kodi-screensaver-biogenesis (2.2.3-1~xenial) xenial; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-screensaver-biogenesis-2.2.2/debian/kodi-screensaver-biogenesis.install kodi-screensaver-biogenesis-2.2.3/debian/kodi-screensaver-biogenesis.install --- kodi-screensaver-biogenesis-2.2.2/debian/kodi-screensaver-biogenesis.install 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/debian/kodi-screensaver-biogenesis.install 2013-05-31 22:59:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/kodi/addons/screensaver.biogenesis/screensaver.biogenesis.so* -usr/share/kodi/addons/screensaver.biogenesis +usr/lib/* +usr/share/* diff -Nru kodi-screensaver-biogenesis-2.2.2/FindOpenGLES.cmake kodi-screensaver-biogenesis-2.2.3/FindOpenGLES.cmake --- kodi-screensaver-biogenesis-2.2.2/FindOpenGLES.cmake 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/FindOpenGLES.cmake 2020-02-22 05:03:18.000000000 +0000 @@ -18,7 +18,7 @@ pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET) endif() -if(NOT CORE_SYSTEM_NAME STREQUAL ios) +if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND NOT CORE_SYSTEM_NAME STREQUAL ios) find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h PATHS ${PC_OPENGLES_INCLUDEDIR}) find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2 diff -Nru kodi-screensaver-biogenesis-2.2.2/Jenkinsfile kodi-screensaver-biogenesis-2.2.3/Jenkinsfile --- kodi-screensaver-biogenesis-2.2.2/Jenkinsfile 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/Jenkinsfile 2020-02-22 05:03:18.000000000 +0000 @@ -1 +1 @@ -buildPlugin() +buildPlugin(version: "Leia") diff -Nru kodi-screensaver-biogenesis-2.2.2/README.md kodi-screensaver-biogenesis-2.2.3/README.md --- kodi-screensaver-biogenesis-2.2.2/README.md 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/README.md 2020-02-22 05:03:18.000000000 +0000 @@ -2,13 +2,14 @@ This is a [Kodi](http://kodi.tv) screensaver addon. -[![Build Status](https://travis-ci.org/xbmc/screensaver.biogenesis.svg?branch=master)](https://travis-ci.org/xbmc/screensaver.biogenesis) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/screensaver.biogenesis?svg=true)](https://ci.appveyor.com/project/xbmc/screensaver-biogenesis) +[![Build Status](https://travis-ci.org/xbmc/screensaver.biogenesis.svg?branch=Leia)](https://travis-ci.org/xbmc/screensaver.biogenesis/branches) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.biogenesis?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=42&branchName=Leia) + ## Build instructions -When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository. +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. Also make sure you follow this README from the branch in question. ### Linux @@ -16,7 +17,7 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -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/xbmc/screensaver.biogenesis.git` 3. `cd screensaver.biogenesis && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=screensaver.biogenesis -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-screensaver-biogenesis-2.2.2/screensaver.biogenesis/addon.xml.in kodi-screensaver-biogenesis-2.2.3/screensaver.biogenesis/addon.xml.in --- kodi-screensaver-biogenesis-2.2.2/screensaver.biogenesis/addon.xml.in 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/screensaver.biogenesis/addon.xml.in 2020-02-22 05:03:18.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -22,6 +22,8 @@ - Many parameters are configurable in the settings. @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/screensaver.biogenesis resources/icon.png resources/fanart.png diff -Nru kodi-screensaver-biogenesis-2.2.2/src/Life.cpp kodi-screensaver-biogenesis-2.2.3/src/Life.cpp --- kodi-screensaver-biogenesis-2.2.2/src/Life.cpp 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/src/Life.cpp 2020-02-22 05:03:18.000000000 +0000 @@ -24,6 +24,7 @@ #include "types.h" #include +#include #ifdef WIN32 #include #else diff -Nru kodi-screensaver-biogenesis-2.2.2/.travis.yml kodi-screensaver-biogenesis-2.2.3/.travis.yml --- kodi-screensaver-biogenesis-2.2.2/.travis.yml 2019-03-19 23:09:53.000000000 +0000 +++ kodi-screensaver-biogenesis-2.2.3/.travis.yml 2020-02-22 05:03:18.000000000 +0000 @@ -22,7 +22,7 @@ sudo: required compiler: clang - os: osx - osx_image: xcode9 + osx_image: xcode9.4 before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgl1-mesa-dev; fi @@ -33,7 +33,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