8 files changed, 33 insertions, 111 deletions
diff --git a/video/kodi/BUILD b/video/kodi/BUILD
index 83afd51192..19921a421b 100755
--- a/video/kodi/BUILD
+++ b/video/kodi/BUILD
@@ -1,3 +1,6 @@
+OPTS+=" -DCORE_PLATFORM_NAME=X11" &&
+OPTS+=" -DAPP_RENDER_SYSTEM=gl"   &&
+
 if ! (get_spell_provider "${SPELL}" "LIBAVCODEC" 2> /dev/null); then
   check_tmp_noexec /tmp 
 fi &&
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index f88a652ae9..220be21b6b 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -31,7 +31,6 @@ depends libxmu &&
 depends libxinerama &&
 depends curl &&
 depends SSL  &&
-depends dbus &&
 depends fribidi &&
 depends JAVA &&
 depends faad2 &&
@@ -52,12 +51,23 @@ depends libtool &&
 depends glew &&
 depends libx11 "-DENABLE_X11=ON" &&
 depends crossguid "-DENABLE_INTERNAL_CROSSGUID=OFF" &&
-depends flatbuffers &&
-depends fmt &&
-depends fstrcmp &&
-depends rapidjson &&
+depends flatbuffers "-DENABLE_INTERNAL_FLATBUFFERS=OFF" &&
+depends fmt "-DENABLE_INTERNAL_FMT=OFF" &&
+depends fstrcmp "-DENABLE_INTERNAL_FSTRCMP=OFF" &&
+depends rapidjson "-DENABLE_INTERNAL_RAPIDJSON=OFF" &&
+depends LIBAVCODEC "-DENABLE_INTERNAL_FFMPEG=OFF" &&
+depends spdlog "-DENABLE_INTERNAL_SPDLOG=OFF" &&
 
-optional_depends alsa-lib "" "" "for ALSA support" &&
+optional_depends alsa-lib "-DENABLE_ALSA=ON" "-DENABLE_ALSA=OFF" "for ALSA support" &&
+optional_depends dav1d    "-DENABLE_DAV1D=ON -DENABLE_INTERNAL_FFMPEG=OFF" "-DENABLE_DAV1D=OFF" "for dav1d support" &&
+optional_depends dbus     "-DENABLE_DBUS=ON" "-DENABLE_DBUS=OFF" "for dbus support" &&
+optional_depends libdrm   "-DENABLE_LIBDRM=ON" "-DENABLE_LIBDRM=OFF" "for libdrm support" &&
+optional_depends libinput "-DENABLE_LIBINPUT=ON" "-DENABLE_LIBINPUT=OFF" "for libinput support" &&
+optional_depends lircclient "-DENABLE_LIRCCLIENT=ON" "-DENABLE_LIRCCLIENT=OFF" "for lirc support" &&
+optional_depends python3  "-DENABLE_PYTHON=ON" "-DENABLE_PYTHON=OFF" "for python support" &&
+optional_depends sndio    "-DENABLE_SNDIO=ON" "-DENABLE_SNDIO=OFF" "for sndio support" &&
+optional_depends wayland "-DENABLE_WAYLANDPP=ON" "-DENABLE_WAYLANDPP=OFF" "for waylandpp support" &&
+optional_depends wayland-protocols "-DENABLE_WAYLANDPROTOCOLS=ON" "-DENABLE_WAYLANDPROTOCOLS=OFF" "for wayland-protocols support" &&
 optional_depends libvdpau "-DENABLE_VDPAU=ON" "-DENABLE_VDPAU=OFF" \
                           "for VDPAU decoding" &&
 optional_depends libva "-DENABLE_VAAPI=ON" "-DENABLE_VAAPI=OFF" \
@@ -65,21 +75,18 @@ optional_depends libva "-DENABLE_VAAPI=ON" "-DENABLE_VAAPI=OFF" \
 optional_depends lirc "-DENABLE_LIRC=ON" "-DENABLE_LIRC=OFF" \
                       "support for IR remote control" &&
 optional_depends MYSQL "" "" "for mysql support" &&
-optional_depends pulseaudio "" "" "for PulseAudio support" &&
+optional_depends pulseaudio "-DENABLE_PULSEAUDIO=ON" "-DENABLE_PULSEAUDIO=OFF" "for PulseAudio support" &&
 optional_depends avahi "" "" "for Avahi support" &&
 optional_depends libxrandr "" "" "for XRandR support" &&
-optional_depends LIBAVCODEC "-DENABLE_INTERNAL_FFMPEG=OFF" \
-                            "-DENABLE_INTERNAL_FFMPEG=ON" \
-                            "use system ffmpeg" &&
 optional_depends libbluray "" "" "for libbluray support" &&
 optional_depends libdvdcss "-DENABLE_DVDCSS=ON" "-DENABLE_DVDCSS=OFF" \
                            "for libdvdcss support" &&
-optional_depends DEVICE-MANAGER "" "" "for udev support" &&
+optional_depends DEVICE-MANAGER "-DENABLE_UDEV=ON" "-DENABLE_UDEV=OFF" "for udev support" &&
 optional_depends BLUEZ "" "" "for bluetooth support" &&
-optional_depends samba "" "" "for samba support" &&
-optional_depends libmicrohttpd "" "" "for webserver support" &&
+optional_depends samba "-DENABLE_SMBCLIENT=ON" "-DENABLE_SMBCLIENT=OFF" "for samba support" &&
+optional_depends libmicrohttpd "-DENABLE_MICROHTTPD=ON" "-DENABLE_MICROHTTPD=OFF" "for webserver support" &&
 optional_depends libssh "" "" "for SFTP support" &&
 optional_depends libusb "" "" "for libusb support" &&
 optional_depends libcec "" "" "for TV remote control support via HDMI" &&
-optional_depends lcms2 "" "" "for color managment support"
+optional_depends lcms2 "-DENABLE_LCMS2=ON" "-DENABLE_LCMS2=OFF" "for color managment support"
 optional_depends libcap "" "" "for libcap support"
diff --git a/video/kodi/DETAILS b/video/kodi/DETAILS
index 4042105baa..5993267c2f 100755
--- a/video/kodi/DETAILS
+++ b/video/kodi/DETAILS
@@ -1,13 +1,13 @@
 source "${GRIMOIRE}/CMAKE_FUNCTIONS"
            SPELL=kodi
 if [[ $KODI_BRANCH == rc ]]; then
-         VERSION=18.9
-     SOURCE_HASH=sha512:72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353
+         VERSION=19.0
+     SOURCE_HASH=sha512:d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422
 else
-         VERSION=18.9
-     SOURCE_HASH=sha512:72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353
+         VERSION=19.0
+     SOURCE_HASH=sha512:d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422
 fi
-        CODENAME=Leia
+        CODENAME=Matrix
   SECURITY_PATCH=1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=https://github.com/xbmc/xbmc/archive/${VERSION}-${CODENAME}.tar.gz
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 9102a1a8c6..390292ff0e 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,7 @@
+2021-02-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS, BUILD, DEPENDS: version 19.0
+	* patches/{0001-Add-missing-include.patch,0001-std-isnan-isnan.patch,crossguid.patch,python.patch}: removed
+
 2020-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 18.9
 
diff --git a/video/kodi/patches/0001-Add-missing-include.patch b/video/kodi/patches/0001-Add-missing-include.patch
deleted file mode 100644
index ba3a56405e..0000000000
--- a/video/kodi/patches/0001-Add-missing-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 39add2ec85000c327308a89784ebdaa8d1f1e15f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Sat, 8 Feb 2020 23:44:12 +0100
-Subject: [PATCH] Add missing include
-
----
- xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 +
- xbmc/windowing/GraphicContext.cpp                  | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-index 222d1fa..a7ce8ad 100644
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
-diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
-index 1ced496..2491d08 100644
---- a/xbmc/windowing/GraphicContext.cpp
-+++ b/xbmc/windowing/GraphicContext.cpp
-@@ -6,6 +6,8 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
-+
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
--- 
-2.25.0
-
diff --git a/video/kodi/patches/0001-std-isnan-isnan.patch b/video/kodi/patches/0001-std-isnan-isnan.patch
deleted file mode 100644
index e75deab3c9..0000000000
--- a/video/kodi/patches/0001-std-isnan-isnan.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c95a758eaca3baf466da25e91ebea89b609fe227 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Fri, 25 Aug 2017 20:39:33 +0200
-Subject: [PATCH] std::isnan isnan
-
----
- xbmc/dialogs/GUIDialogExtendedProgressBar.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-index 42c2238..043a25f 100644
---- a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-+++ b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-@@ -52,7 +52,7 @@ void CGUIDialogProgressBarHandle::SetTitle(const std::string &strTitle)
- void CGUIDialogProgressBarHandle::SetProgress(int currentItem, int itemCount)
- {
-   float fPercentage = (currentItem*100.0f)/itemCount;
--  if (!std::isnan(fPercentage))
-+  if (!isnan(fPercentage))
-     m_fPercentage = std::min(100.0f, fPercentage);
- }
- 
--- 
-2.14.1
-
diff --git a/video/kodi/patches/crossguid.patch b/video/kodi/patches/crossguid.patch
deleted file mode 100644
index 9bae13dba4..0000000000
--- a/video/kodi/patches/crossguid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nuar xbmc-17.4-Krypton.orig/xbmc/utils/StringUtils.cpp xbmc-17.4-Krypton/xbmc/utils/StringUtils.cpp
---- xbmc-17.4-Krypton.orig/xbmc/utils/StringUtils.cpp	2017-08-24 12:59:16.508345154 -0400
-+++ xbmc-17.4-Krypton/xbmc/utils/StringUtils.cpp	2017-08-24 13:12:39.486505409 -0400
-@@ -1191,8 +1191,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/video/kodi/patches/python.patch b/video/kodi/patches/python.patch
deleted file mode 100644
index 5dc0fcf6d6..0000000000
--- a/video/kodi/patches/python.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
---- a/cmake/modules/FindPython.cmake
-+++ b/cmake/modules/FindPython.cmake
-@@ -6,10 +6,10 @@
- # PYTHON_LIBRARIES - The python libraries
- 
- if(PKG_CONFIG_FOUND)
--  pkg_check_modules(PC_PYTHON python>=2.7 QUIET)
-+  find_package(PythonLibs 2.7 REQUIRED)
- endif()
- 
--find_program(PYTHON_EXECUTABLE python ONLY_CMAKE_FIND_ROOT_PATH)
-+find_program(PYTHON_EXECUTABLE python2.7 ONLY_CMAKE_FIND_ROOT_PATH)
- find_library(PYTHON_LIBRARY NAMES python2.7 PATHS ${PC_PYTHON_LIBDIR})
- find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} ${DEPENDS_PATH}/include/python2.7)
-