diff -Nru kodi-screensaver-cpblobs-3.0.3/debian/changelog kodi-screensaver-cpblobs-3.0.4/debian/changelog --- kodi-screensaver-cpblobs-3.0.3/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-screensaver-cpblobs (3.0.3-1~xenial) xenial; urgency=low +kodi-screensaver-cpblobs (3.0.4-1~xenial) xenial; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-screensaver-cpblobs-3.0.3/debian/copyright kodi-screensaver-cpblobs-3.0.4/debian/copyright --- kodi-screensaver-cpblobs-3.0.3/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/xbmc/screensaver.cpblobs Files: * -Copyright: 2005-2019 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-cpblobs-3.0.3/depends/common/glm/glm.sha256 kodi-screensaver-cpblobs-3.0.4/depends/common/glm/glm.sha256 --- kodi-screensaver-cpblobs-3.0.3/depends/common/glm/glm.sha256 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/depends/common/glm/glm.sha256 2020-02-28 15:01:36.000000000 +0000 @@ -1 +1 @@ -7f093f11c49877716bab96813c2e834db6839095281c8c0c65c60c8bdb9504a3 +3a073eb8f3be07cee74481db0e1f78eda553b554941e405c863ab64de6a2e954 diff -Nru kodi-screensaver-cpblobs-3.0.3/depends/common/glm/glm.txt kodi-screensaver-cpblobs-3.0.4/depends/common/glm/glm.txt --- kodi-screensaver-cpblobs-3.0.3/depends/common/glm/glm.txt 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/depends/common/glm/glm.txt 2020-02-28 15:01:36.000000000 +0000 @@ -1 +1 @@ -glm https://github.com/g-truc/glm/archive/47031aa4b7b079716e4cac496819e7f464b6a713.tar.gz +glm https://github.com/g-truc/glm/archive/0.9.9.4.tar.gz diff -Nru kodi-screensaver-cpblobs-3.0.3/depends/osx/glm/glm.sha256 kodi-screensaver-cpblobs-3.0.4/depends/osx/glm/glm.sha256 --- kodi-screensaver-cpblobs-3.0.3/depends/osx/glm/glm.sha256 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/depends/osx/glm/glm.sha256 2020-02-28 15:01:36.000000000 +0000 @@ -1 +1 @@ -7f093f11c49877716bab96813c2e834db6839095281c8c0c65c60c8bdb9504a3 +3a073eb8f3be07cee74481db0e1f78eda553b554941e405c863ab64de6a2e954 diff -Nru kodi-screensaver-cpblobs-3.0.3/depends/osx/glm/glm.txt kodi-screensaver-cpblobs-3.0.4/depends/osx/glm/glm.txt --- kodi-screensaver-cpblobs-3.0.3/depends/osx/glm/glm.txt 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/depends/osx/glm/glm.txt 2020-02-28 15:01:36.000000000 +0000 @@ -1 +1 @@ -glm https://github.com/g-truc/glm/archive/47031aa4b7b079716e4cac496819e7f464b6a713.tar.gz +glm https://github.com/g-truc/glm/archive/0.9.9.4.tar.gz diff -Nru kodi-screensaver-cpblobs-3.0.3/FindOpenGLES.cmake kodi-screensaver-cpblobs-3.0.4/FindOpenGLES.cmake --- kodi-screensaver-cpblobs-3.0.3/FindOpenGLES.cmake 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/FindOpenGLES.cmake 2020-02-28 15:01:36.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-cpblobs-3.0.3/lib/SOIL2/CMakeLists.txt kodi-screensaver-cpblobs-3.0.4/lib/SOIL2/CMakeLists.txt --- kodi-screensaver-cpblobs-3.0.3/lib/SOIL2/CMakeLists.txt 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/lib/SOIL2/CMakeLists.txt 2020-02-28 15:01:36.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(SOIL2) @@ -32,7 +32,9 @@ add_library(soil2 STATIC ${SRC_FILES} ${HEADER_FILES}) target_include_directories(soil2 PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..) -target_link_libraries(soil2 PUBLIC ${OPENGL_LIBRARIES}) -if(CORE_SYSTEM_NAME STREQUAL osx) +if(CORE_SYSTEM_NAME STREQUAL darwin_embedded OR CORE_SYSTEM_NAME STREQUAL osx OR CORE_SYSTEM_NAME STREQUAL ios) target_link_libraries(soil2 PUBLIC "-framework CoreFoundation") +elseif(OPENGLES_FOUND) + target_compile_definitions(soil2 PRIVATE SOIL_GLES2) + target_link_libraries(soil2 PRIVATE ${OPENGLES_LIBRARIES}) endif() diff -Nru kodi-screensaver-cpblobs-3.0.3/README.md kodi-screensaver-cpblobs-3.0.4/README.md --- kodi-screensaver-cpblobs-3.0.3/README.md 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/README.md 2020-02-28 15:01:36.000000000 +0000 @@ -6,8 +6,8 @@ ## 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 diff -Nru kodi-screensaver-cpblobs-3.0.3/screensaver.cpblobs/addon.xml.in kodi-screensaver-cpblobs-3.0.4/screensaver.cpblobs/addon.xml.in --- kodi-screensaver-cpblobs-3.0.3/screensaver.cpblobs/addon.xml.in 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/screensaver.cpblobs/addon.xml.in 2020-02-28 15:01:36.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -12,6 +12,8 @@ Metaballs moving around cpBlobs is a screensaver displaying metaballs moving around inside a cube. @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/screensaver.cpblobs resources/icon.png resources/fanart.jpg diff -Nru kodi-screensaver-cpblobs-3.0.3/src/Blobby.cpp kodi-screensaver-cpblobs-3.0.4/src/Blobby.cpp --- kodi-screensaver-cpblobs-3.0.3/src/Blobby.cpp 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/Blobby.cpp 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/src/Blobby.h kodi-screensaver-cpblobs-3.0.4/src/Blobby.h --- kodi-screensaver-cpblobs-3.0.3/src/Blobby.h 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/Blobby.h 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/src/cpBlobsMain.cpp kodi-screensaver-cpblobs-3.0.4/src/cpBlobsMain.cpp --- kodi-screensaver-cpblobs-3.0.3/src/cpBlobsMain.cpp 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/cpBlobsMain.cpp 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/src/cpBlobsMain.h kodi-screensaver-cpblobs-3.0.4/src/cpBlobsMain.h --- kodi-screensaver-cpblobs-3.0.3/src/cpBlobsMain.h 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/cpBlobsMain.h 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/src/IsoSurface.cpp kodi-screensaver-cpblobs-3.0.4/src/IsoSurface.cpp --- kodi-screensaver-cpblobs-3.0.3/src/IsoSurface.cpp 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/IsoSurface.cpp 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/src/IsoSurface.h kodi-screensaver-cpblobs-3.0.4/src/IsoSurface.h --- kodi-screensaver-cpblobs-3.0.3/src/IsoSurface.h 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/src/IsoSurface.h 2020-02-28 15:01:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * Copyright (C) Simon Windmill (siw@coolpowers.com) * Ported to Kodi GL4 by Alwin Esch * This file is part of Kodi - https://kodi.tv diff -Nru kodi-screensaver-cpblobs-3.0.3/.travis.yml kodi-screensaver-cpblobs-3.0.4/.travis.yml --- kodi-screensaver-cpblobs-3.0.3/.travis.yml 2020-02-21 19:00:24.000000000 +0000 +++ kodi-screensaver-cpblobs-3.0.4/.travis.yml 2020-02-28 15:01:36.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