multimedia/kodi: Updated for version 19.5.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 17 insertions, 118 deletions

diff --git a/multimedia/kodi/README b/multimedia/kodi/README
index a78fb1fab7..80eef02c5b 100644
--- a/multimedia/kodi/README
+++ b/multimedia/kodi/README
@@ -19,4 +19,6 @@ NOTE:
 Kodi can be compiled with jdk11 instead of zulu-openjdk11.
 
 ADDITIONAL NOTE:
-If you are having issues with addons crashing, please see README.python
+If you are having issues with addons crashing, please ensure you're
+upgraded to at least python3-3.9.14 or later from the patches/
+directory on your favorite mirror. 3.9.12 and earlier had issues.
diff --git a/multimedia/kodi/README.python b/multimedia/kodi/README.python
deleted file mode 100644
index 5efb8161da..0000000000
--- a/multimedia/kodi/README.python
+++ /dev/null
@@ -1,26 +0,0 @@
-# If you run into crashing when running addons, the problem is with the
-# python3 version that was released with 15.0 (3.9.12). This has been
-# fixed in a newer release, but it hasn't made it to 15.0 yet. You can
-# either deal with the crashes and wait until it's updated in 15.0 or
-# build your own updated package using the newer source tarball. The
-# instructions to do that are below.
-
-# NOTE: This README has been designed to allow you to run it as root
-#       and have it build and upgrade the python3 package.
-#       Run at your own risk.
-#
-# As root:
-# sh /usr/doc/kodi-19.4/README.python
-
-lftp -c "mirror -e -X *.tar.xz* -X *.tar.bz2 https://mirror.slackbuilds.org/slackware/slackware64-15.0/source/d/python3/"
-cd python3
-
-# Remove older versions then download newer ones
-wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz
-wget https://docs.python.org/3.9/archives/python-3.9.13-docs-text.tar.bz2
-
-# Run the SlackBuild
-BUILD=1_bass sh python3.SlackBuild
-
-# Install the newer package
-upgradepkg --reinstall --install-new /tmp/python3-3.9.13-*-1_bass.txz
diff --git a/multimedia/kodi/kodi-19.4-fmt-9.patch b/multimedia/kodi/kodi-19.4-fmt-9.patch
deleted file mode 100644
index b60d9ccc93..0000000000
--- a/multimedia/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/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild
index e810615f3c..e0f64ed04d 100644
--- a/multimedia/kodi/kodi.SlackBuild
+++ b/multimedia/kodi/kodi.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for kodi
 
 # Copyright 2009-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2022      Jeremy Hansen <jebrhansen+SBo@gmail.com>
+# Copyright 2022-2023 Jeremy Hansen <jebrhansen+SBo@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=kodi
 SRCNAM=xbmc
 CODNAM=Matrix
-VERSION=${VERSION:-19.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-19.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -78,9 +78,6 @@ find -L . \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patch to fix compliation with newer fmt versions
-# Thanks to gentoo for the patch and Steven Voges for the heads up
-patch -p1 < $CWD/kodi-19.4-fmt-9.patch
 
 # Autodetection of "optional" dependencies sucks. It does not work and
 # compilation will fail on each of these if not explicitly disabled.
@@ -117,7 +114,7 @@ cd $TMP/$PRGNAM-build
     -Dlibdvdcss_URL=$CWD/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \
     -Dlibdvdnav_URL=$CWD/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \
     -Dlibdvdread_URL=$CWD/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \
-    -DCROSSGUID_URL=$CWD/crossguid-8f399e8bd4.tar.gz \
+    -DCROSSGUID_URL=$CWD/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \
     -DFSTRCMP_URL=$CWD/fstrcmp-0.7.D001.tar.gz \
     -DUDFREAD_URL=$CWD/libudfread-1.1.0.tar.gz \
     -DCMAKE_BUILD_TYPE=Release ../$SRCNAM-$VERSION-$CODNAM
diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info
index 088fdf01df..db3339db14 100644
--- a/multimedia/kodi/kodi.info
+++ b/multimedia/kodi/kodi.info
@@ -1,18 +1,18 @@
 PRGNAM="kodi"
-VERSION="19.4"
+VERSION="19.5"
 HOMEPAGE="https://kodi.tv/"
-DOWNLOAD="https://github.com/xbmc/xbmc/archive/19.4-Matrix/xbmc-19.4-Matrix.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/crossguid-8f399e8bd4.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/fstrcmp-0.7.D001.tar.gz \
-          https://ponce.cc/slackware/sources/repo/kodi/19.4/libudfread-1.1.0.tar.gz"
-MD5SUM="a668854505eff3ca5ed9f33e3ac91c80 \
+DOWNLOAD="https://github.com/xbmc/xbmc/archive/19.5-Matrix/xbmc-19.5-Matrix.tar.gz \
+          https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.2-Leia-Beta-5/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \
+          https://github.com/xbmc/libdvdnav/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \
+          https://github.com/xbmc/libdvdread/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \
+          https://github.com/xbmc/crossguid/archive/8f399e8/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \
+          https://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz \
+          https://code.videolan.org/videolan/libudfread/-/archive/1.1.0/libudfread-1.1.0.tar.gz"
+MD5SUM="44f78712d1752af1c9c3d43dd5a56a17 \
         fb2824210a4eab2efeef36e7501e4979 \
         2aec5f8c790449126118abc6bb3cb5cd \
         f3244e7b002d37f91cc6a77461c4f619 \
-        7de3be575744da5f1098295485ef0741 \
+        696a6573286d6fdbfde18686aa9f6489 \
         9c440bbdfcad9fd22e38f2388715b0cc \
         cb71fa46a29183e01692e9fe738ec373"
 DOWNLOAD_x86_64=""