commit 24e57a05274483dd879f03e980023c87f16baf46 Author: Matt Housh <jaeger@crux.ninja> Date: Sat Dec 31 12:42:06 2022 -0600 kodi: updated to version 19.5 diff --git a/kodi/.footprint b/kodi/.footprint index 38bd2f252..10ca615af 100644 --- a/kodi/.footprint +++ b/kodi/.footprint @@ -162,6 +162,8 @@ drwxr-xr-x root/root usr/lib/firewalld/services/ -rw-r--r-- root/root usr/lib/firewalld/services/kodi-http.xml -rw-r--r-- root/root usr/lib/firewalld/services/kodi-jsonrpc.xml drwxr-xr-x root/root usr/lib/kodi/ +drwxr-xr-x root/root usr/lib/kodi/cmake/ +-rw-r--r-- root/root usr/lib/kodi/cmake/KodiConfig.cmake -rwxr-xr-x root/root usr/lib/kodi/kodi-x11 -rwxr-xr-x root/root usr/lib/kodi/kodi-xrandr drwxr-xr-x root/root usr/lib/kodi/system/ @@ -229,8 +231,6 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/lan -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.af_za/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.am_et/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.am_et/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ar_ma/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ar_ma/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ar_sa/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ar_sa/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ast_es/ @@ -281,6 +281,8 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/lan -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fa_ir/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fi_fi/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fi_fi/strings.po +drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fil/ +-rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fil/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fo_fo/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fo_fo/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.fr_ca/ @@ -343,14 +345,10 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/lan -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.pt_br/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.pt_pt/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.pt_pt/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ro_md/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ro_md/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ro_ro/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ro_ro/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ru_ru/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.ru_ru/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.scn/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.scn/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.si_lk/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.si_lk/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.default/resources/language/resource.language.sk_sk/ @@ -398,8 +396,6 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/langua -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.af_za/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.am_et/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.am_et/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ar_ma/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ar_ma/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ar_sa/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ar_sa/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ast_es/ @@ -450,6 +446,8 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/langua -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fa_ir/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fi_fi/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fi_fi/strings.po +drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fil/ +-rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fil/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fo_fo/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fo_fo/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.fr_ca/ @@ -512,14 +510,10 @@ drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/langua -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.pt_br/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.pt_pt/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.pt_pt/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ro_md/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ro_md/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ro_ro/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ro_ro/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ru_ru/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.ru_ru/strings.po -drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.scn/ --rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.scn/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.si_lk/ -rw-r--r-- root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.si_lk/strings.po drwxr-xr-x root/root usr/share/kodi/addons/game.controller.snes/resources/language/resource.language.sk_sk/ @@ -2813,7 +2807,6 @@ drwxr-xr-x root/root usr/share/kodi/cmake/ -rw-r--r-- root/root usr/share/kodi/cmake/GenerateVersionedFiles.cmake -rw-r--r-- root/root usr/share/kodi/cmake/GeneratorSetup.cmake -rw-r--r-- root/root usr/share/kodi/cmake/HandleDepends.cmake --rw-r--r-- root/root usr/share/kodi/cmake/KodiConfig.cmake -rw-r--r-- root/root usr/share/kodi/cmake/Macros.cmake -rw-r--r-- root/root usr/share/kodi/cmake/PathSetup.cmake -rw-r--r-- root/root usr/share/kodi/cmake/PrepareEnv.cmake diff --git a/kodi/.signature b/kodi/.signature index 3e9e89e60..694fb0b64 100644 --- a/kodi/.signature +++ b/kodi/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+8cq0Y25oiXpDc9CtLigdO/OmFSXvnmgXc+ID38XOPMIEZUAB/3SEafHrYjux1ZlRqHnQ7bTBqnCPvmQFst/A4= -SHA256 (Pkgfile) = b8b6c282af9bf6f1fb7753cdaf1322cd1500dcf0db137bb247863573773d7168 -SHA256 (.footprint) = c45007af4a2e946af6cda1e1ae3a34c26ddfcfa823acfc5bb794b38b51c49001 -SHA256 (kodi-19.4.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da +RWSagIOpLGJF33rvAEk7Jjhkx6LfFpmLvX0+NMLX9ZM3dL1ETPK/n/yLpoYxiG20BI+gMXje7PVRRdrxuT7czdXEJQEwR3Wtjww= +SHA256 (Pkgfile) = 7eb0ddcf06c493d573949ab7a29c9f66c1f8759554b690059fcd33f7bb4870e3 +SHA256 (.footprint) = 274846fcbe62a0e534b0552824d7d8b7155e157a6fae2fadaa25d48362b76caa +SHA256 (kodi-19.5.tar.gz) = 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 SHA256 (gl-headers.patch) = 6fa089625184b2b47bea7a3dcb349931e9b39681df9d84fd690a1ba848460168 -SHA256 (kodi-19.4-fmt-9.patch) = 236d40c7c201212a3f76d0b6362391e6b459bacc9ec5d35b9e34fa4b2fee7c25 +SHA256 (kodi-ffmpeg-4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4 +SHA256 (mesa-eglchromium.patch) = 80c7c3399ef1b72dae214ecd5157469a2d0c69b6d931573482dba33c79ac296a diff --git a/kodi/Pkgfile b/kodi/Pkgfile index 3a74e7c21..185018f01 100644 --- a/kodi/Pkgfile +++ b/kodi/Pkgfile @@ -4,17 +4,27 @@ # Depends on: cmake fmt ghostscript giflib glu openjdk17-jdk libass libcdio libmicrohttpd mariadb samba swig taglib tinyxml spdlog libva libvdpau libdvdnav name=kodi -version=19.4 +version=19.5 release=1 -source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch $name-19.4-fmt-9.patch) +source=(https://github.com/xbmc/xbmc/archive/$version-Matrix/$name-$version.tar.gz gl-headers.patch + https://crux.nu/files/kodi-ffmpeg-4.3-kodi-dav1d-1.0.tar.gz + mesa-eglchromium.patch) + +unpack_source() { + cp $PKGMK_ROOT/*.patch $SRC/ + bsdtar -xf $PKGMK_SOURCE_DIR/$name-$version.tar.gz -C $SRC + cp $PKGMK_SOURCE_DIR/kodi-ffmpeg* $SRC/ +} build() { + # https://github.com/xbmc/xbmc/pull/22291/commits/b81d28d5ce679da2ff5f14dca691... + patch -p1 -d xbmc-$version-Matrix -i $SRC/mesa-eglchromium.patch + export PATH="/usr/lib/java/openjdk17-jdk/bin:$PATH" [[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" patch -d xbmc-$version-Matrix -p1 -i $SRC/gl-headers.patch - patch -d xbmc-$version-Matrix -p1 -i $SRC/$name-19.4-fmt-9.patch cmake -Bbuild \ -DVERBOSE=ON \ @@ -24,6 +34,7 @@ build() { -DENABLE_OPTICAL=ON \ -DENABLE_PYTHON=ON \ -DENABLE_INTERNAL_FFMPEG=ON \ + -DFFMPEG_URL=$SRC/kodi-ffmpeg-4.3-kodi-dav1d-1.0.tar.gz \ -DENABLE_INTERNAL_FLATBUFFERS=ON \ -DENABLE_INTERNAL_FSTRCMP=ON \ -DENABLE_INTERNAL_RapidJSON=ON \ diff --git a/kodi/kodi-19.4-fmt-9.patch b/kodi/kodi-19.4-fmt-9.patch deleted file mode 100644 index b60d9ccc9..000000000 --- a/kodi/kodi-19.4-fmt-9.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Wed, 6 Jul 2022 22:48:35 +1000 -Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers - is disallowed - ---- - xbmc/utils/GLUtils.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp -index 1ef804709ff56..c36dcf6a20fec 100644 ---- a/xbmc/utils/GLUtils.cpp -+++ b/xbmc/utils/GLUtils.cpp -@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) - void LogGraphicsInfo() - { - #if defined(HAS_GL) || defined(HAS_GLES) -- const GLubyte *s; -+ const char* s; - -- s = glGetString(GL_VENDOR); -+ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); - if (s) - CLog::Log(LOGINFO, "GL_VENDOR = %s", s); - else - CLog::Log(LOGINFO, "GL_VENDOR = NULL"); - -- s = glGetString(GL_RENDERER); -+ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); - if (s) - CLog::Log(LOGINFO, "GL_RENDERER = %s", s); - else - CLog::Log(LOGINFO, "GL_RENDERER = NULL"); - -- s = glGetString(GL_VERSION); -+ s = reinterpret_cast<const char*>(glGetString(GL_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_VERSION = %s", s); - else - CLog::Log(LOGINFO, "GL_VERSION = NULL"); - -- s = glGetString(GL_SHADING_LANGUAGE_VERSION); -+ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); - else - -From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Mon, 11 Jul 2022 09:39:02 +0000 -Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void - pointers is disallowed - ---- - xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 8a18288fd8af0..033c0f77bf454 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() - - if(status == Success && items_read) - { -- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); -+ const char* s; -+ -+ s = reinterpret_cast<const char*>(data); -+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); - } - else - CLog::Log(LOGDEBUG,"Window Manager Name: "); diff --git a/kodi/mesa-eglchromium.patch b/kodi/mesa-eglchromium.patch new file mode 100644 index 000000000..f3bc857ab --- /dev/null +++ b/kodi/mesa-eglchromium.patch @@ -0,0 +1,54 @@ +From b81d28d5ce679da2ff5f14dca691665551d30351 Mon Sep 17 00:00:00 2001 +From: Alan Swanson <reiver@improbability.net> +Date: Mon, 19 Dec 2022 21:28:13 +0200 +Subject: [PATCH] Work around Mesa eglchromium.h removal + +I have polished Alan's snippet to buildable state and tested +on Kodi from Debian sid. + +Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> +--- + cmake/modules/FindEGL.cmake | 6 ++++++ + xbmc/windowing/X11/GLContextEGL.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake +index b00fe08a25f95..f2648596cfa71 100644 +--- a/cmake/modules/FindEGL.cmake ++++ b/cmake/modules/FindEGL.cmake +@@ -9,6 +9,7 @@ + # EGL_INCLUDE_DIRS - the EGL include directory + # EGL_LIBRARIES - the EGL libraries + # EGL_DEFINITIONS - the EGL definitions ++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h + # + # and the following imported targets:: + # +@@ -35,6 +36,11 @@ if(EGL_FOUND) + set(EGL_LIBRARIES ${EGL_LIBRARY}) + set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR}) + set(EGL_DEFINITIONS -DHAS_EGL=1) ++ include(CheckIncludeFiles) ++ CHECK_INCLUDE_FILES("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE) ++ if(HAVE_EGLEXTANGLE) ++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") ++ endif() + + if(NOT TARGET EGL::EGL) + add_library(EGL::EGL UNKNOWN IMPORTED) +diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h +index 99a6a9024e8c6..afea0b7c43eac 100644 +--- a/xbmc/windowing/X11/GLContextEGL.h ++++ b/xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,11 @@ + #include "threads/CriticalSection.h" + + #include <EGL/eglext.h> ++#ifdef HAVE_EGLEXTANGLE ++#include <EGL/eglext_angle.h> ++#else + #include <EGL/eglextchromium.h> ++#endif + #include <X11/Xutil.h> + + class CGLContextEGL : public CGLContext