diff -Nru kodi-screensaver-matrixtrails-2.2.1/debian/changelog kodi-screensaver-matrixtrails-2.2.2/debian/changelog --- kodi-screensaver-matrixtrails-2.2.1/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,6 @@ -kodi-screensaver-matrixtrails (2.2.1-1~disco) disco; urgency=low +kodi-screensaver-matrixtrails (2.2.2-1~disco) disco; urgency=low [ kodi ] * autogenerated dummy changelog - -- Arne Morten Kvarving Sat, 01 Jun 2013 00:59:22 +0200 - + -- Nobody Sat, 01 Jun 2013 00:59:22 +0200 diff -Nru kodi-screensaver-matrixtrails-2.2.1/debian/changelog.in kodi-screensaver-matrixtrails-2.2.2/debian/changelog.in --- kodi-screensaver-matrixtrails-2.2.1/debian/changelog.in 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/debian/changelog.in 2013-05-31 22:59:22.000000000 +0000 @@ -3,5 +3,4 @@ [ kodi ] * autogenerated dummy changelog - -- Arne Morten Kvarving Sat, 01 Jun 2013 00:59:22 +0200 - + -- Nobody Sat, 01 Jun 2013 00:59:22 +0200 diff -Nru kodi-screensaver-matrixtrails-2.2.1/debian/compat kodi-screensaver-matrixtrails-2.2.2/debian/compat --- kodi-screensaver-matrixtrails-2.2.1/debian/compat 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/debian/compat 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru kodi-screensaver-matrixtrails-2.2.1/debian/control kodi-screensaver-matrixtrails-2.2.2/debian/control --- kodi-screensaver-matrixtrails-2.2.1/debian/control 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -1,9 +1,9 @@ Source: kodi-screensaver-matrixtrails Priority: extra -Maintainer: Arne Morten Kvarving +Maintainer: Nobody Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, - libgl1-mesa-dev -Standards-Version: 3.9.5 + libgles2-mesa-dev [arm64 armhf], libgl1-mesa-dev [i386 amd64] +Standards-Version: 4.1.2 Section: libs Homepage: http://kodi.tv diff -Nru kodi-screensaver-matrixtrails-2.2.1/debian/copyright kodi-screensaver-matrixtrails-2.2.2/debian/copyright --- kodi-screensaver-matrixtrails-2.2.1/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/xbmc/screensaver.matrixtrails Files: * -Copyright: 2005-2018 Team Kodi +Copyright: 2005-2020 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 diff -Nru kodi-screensaver-matrixtrails-2.2.1/FindOpenGLES.cmake kodi-screensaver-matrixtrails-2.2.2/FindOpenGLES.cmake --- kodi-screensaver-matrixtrails-2.2.1/FindOpenGLES.cmake 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/FindOpenGLES.cmake 2020-02-01 11:07:59.000000000 +0000 @@ -1,9 +1,9 @@ #.rst: # FindOpenGLES # ------------ -# Finds the OpenGLES2 library +# Finds the OpenGLES2 and OpenGLES3 library # -# This will define the following variables:: +# This will define the following variables: # # OPENGLES_FOUND - system has OpenGLES # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory @@ -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-matrixtrails-2.2.1/.gitignore kodi-screensaver-matrixtrails-2.2.2/.gitignore --- kodi-screensaver-matrixtrails-2.2.1/.gitignore 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/.gitignore 2020-02-01 11:07:59.000000000 +0000 @@ -1,8 +1,17 @@ # build artifacts build/ -obj-x86_64-linux-gnu/ screensaver.*/addon.xml +# Debian build files +debian/changelog +debian/files +debian/*.log +debian/*.substvars +debian/.debhelper/ +debian/tmp/ +debian/kodi-screensaver-*/ +obj-x86_64-linux-gnu/ + # commonly used editors # vim *.swp @@ -25,3 +34,9 @@ # clion .idea/ + +# to prevent add after a "git format-patch VALUE" and "git add ." call +/*.patch + +# to prevent add if project code opened by Visual Studio over CMake file +.vs/ diff -Nru kodi-screensaver-matrixtrails-2.2.1/Jenkinsfile kodi-screensaver-matrixtrails-2.2.2/Jenkinsfile --- kodi-screensaver-matrixtrails-2.2.1/Jenkinsfile 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/Jenkinsfile 2020-02-01 11:07:59.000000000 +0000 @@ -1 +1 @@ -buildPlugin(platforms: ['android-armv7', 'android-aarch64', 'ios-armv7', 'ios-aarch64', 'osx-x86_64', 'ubuntu-ppa']) +buildPlugin(version: "Leia", platforms: ['android-armv7', 'android-aarch64', 'ios-armv7', 'ios-aarch64', 'osx-x86_64', 'ubuntu-ppa']) diff -Nru kodi-screensaver-matrixtrails-2.2.1/lib/SOIL2/CMakeLists.txt kodi-screensaver-matrixtrails-2.2.2/lib/SOIL2/CMakeLists.txt --- kodi-screensaver-matrixtrails-2.2.1/lib/SOIL2/CMakeLists.txt 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/lib/SOIL2/CMakeLists.txt 2020-02-01 11:07:59.000000000 +0000 @@ -34,4 +34,6 @@ target_include_directories(soil2 PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..) if(CORE_SYSTEM_NAME STREQUAL osx) target_link_libraries(soil2 PUBLIC "-framework CoreFoundation") +elseif(OPENGLES_FOUND) + target_compile_definitions(soil2 PRIVATE SOIL_GLES2) endif() diff -Nru kodi-screensaver-matrixtrails-2.2.1/README.md kodi-screensaver-matrixtrails-2.2.2/README.md --- kodi-screensaver-matrixtrails-2.2.1/README.md 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/README.md 2020-02-01 11:07:59.000000000 +0000 @@ -1,13 +1,13 @@ # screensaver.matrixtrails addon for Kodi -This is a [Kodi](http://kodi.tv) screensaver addon. +This is a [Kodi](https://kodi.tv) screensaver addon. -[![Build Status](https://travis-ci.org/xbmc/screensaver.matrixtrails.svg?branch=master)](https://travis-ci.org/xbmc/screensaver.matrixtrails) +[![Build Status](https://travis-ci.org/xbmc/screensaver.matrixtrails.svg?branch=Leia)](https://travis-ci.org/xbmc/screensaver.matrixtrails/branches) ## 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 @@ -15,8 +15,8 @@ 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` -2. `git clone https://github.com/xbmc/screensaver.matrixtrails.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` +2. `git clone --branch Leia https://github.com/xbmc/screensaver.matrixtrails.git` 3. `cd screensaver.matrixtrails && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=screensaver.matrixtrails -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff -Nru kodi-screensaver-matrixtrails-2.2.1/screensaver.matrixtrails/addon.xml.in kodi-screensaver-matrixtrails-2.2.2/screensaver.matrixtrails/addon.xml.in --- kodi-screensaver-matrixtrails-2.2.1/screensaver.matrixtrails/addon.xml.in 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/screensaver.matrixtrails/addon.xml.in 2020-02-01 11:07:59.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -12,6 +12,8 @@ Matrix trails screensaver The "digital rain" effect, as seen on the computer monitors in "The Matrix". @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/screensaver.matrixtrails resources/icon.png resources/fanart.png diff -Nru kodi-screensaver-matrixtrails-2.2.1/src/matrixtrails.cpp kodi-screensaver-matrixtrails-2.2.2/src/matrixtrails.cpp --- kodi-screensaver-matrixtrails-2.2.1/src/matrixtrails.cpp 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/src/matrixtrails.cpp 2020-02-01 11:07:59.000000000 +0000 @@ -25,6 +25,7 @@ #include "matrixtrails.h" #include "SOIL2/SOIL2.h" +#include #include //////////////////////////////////////////////////////////////////////////// diff -Nru kodi-screensaver-matrixtrails-2.2.1/.travis.yml kodi-screensaver-matrixtrails-2.2.2/.travis.yml --- kodi-screensaver-matrixtrails-2.2.1/.travis.yml 2019-03-19 23:02:55.000000000 +0000 +++ kodi-screensaver-matrixtrails-2.2.2/.travis.yml 2020-02-01 11:07:59.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