[PR PATCH] kodi: update to 19.4

[PR PATCH] kodi: update to 19.4

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 954 bytes --]

There is a new pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-19.4
https://github.com/void-linux/void-packages/pull/36526

kodi: update to 19.4
#### Testing the changes
- I tested the changes in this PR: **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild)
  - aarch64-musl (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/36526.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-19.4-36526.patch --]
[-- Type: text/x-diff, Size: 7703 bytes --]

From c94c686bd426df39ede0f5ba5ec2ef70bd807fa2 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 4 Apr 2022 23:12:16 +0200
Subject: [PATCH] kodi: update to 19.4

---
 .../kodi/patches/add-missing-includes.patch   |  4 +-
 .../disable-static-texturepacker-build.patch  |  2 +-
 srcpkgs/kodi/patches/fix-fileemu.patch        | 16 ++++----
 srcpkgs/kodi/patches/fix-musl.patch           |  2 +-
 srcpkgs/kodi/patches/fmt8-support.patch       |  7 ----
 srcpkgs/kodi/patches/ppc64.patch              |  8 ++--
 srcpkgs/kodi/template                         | 38 +++++--------------
 7 files changed, 25 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi/patches/add-missing-includes.patch b/srcpkgs/kodi/patches/add-missing-includes.patch
index 236bfa6fd0e1..1b9a4509744c 100644
--- a/srcpkgs/kodi/patches/add-missing-includes.patch
+++ b/srcpkgs/kodi/patches/add-missing-includes.patch
@@ -1,10 +1,10 @@
 --- a/xbmc/filesystem/ZipManager.h.orig
 +++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
+@@ -22,6 +22,7 @@
  #include <string>
  #include <vector>
  #include <map>
-+#include <stdint.h>
++#include <cstdint>
  
  class CURL;
  
diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
index 369f1b24d76d..766cae2005c8 100644
--- a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
+++ b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
@@ -1,6 +1,6 @@
 --- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
 +++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
  	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
  	cd $(PLATFORM); cp -a $(SOURCE)/* .
  	cd $(PLATFORM); ./autogen.sh
diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index 6cce7a4d3524..a16fcb9ffa29 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
+@@ -17,7 +17,7 @@
  #define _onexit_t void*
  #endif
  
@@ -11,8 +11,8 @@
  typedef off64_t __off64_t;
 --- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
 +++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
+@@ -23,7 +23,7 @@
+ #include <dirent.h>
  #include <dlfcn.h>
  
 -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
@@ -29,8 +29,8 @@
 +#include <paths.h>
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
+ #endif
+@@ -1479,7 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -39,7 +39,7 @@
      *pos = (fpos_t)tmpPos;
  #else
      pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
+@@ -1492,8 +1493,9 @@ extern "C"
      CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
      if (pFile != NULL)
      {
@@ -51,7 +51,7 @@
  #else
        pos->__pos = pFile->GetPosition();
  #endif
-@@ -1509,8 +1511,9 @@
+@@ -1508,8 +1510,9 @@ extern "C"
      int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
      if (fd >= 0)
      {
@@ -63,7 +63,7 @@
  #else
        if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
  #endif
-@@ -1532,7 +1535,7 @@
+@@ -1531,7 +1534,7 @@ extern "C"
      if (fd >= 0)
      {
        fpos64_t tmpPos;
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index c2eb622c98a4..891204118411 100644
--- a/srcpkgs/kodi/patches/fix-musl.patch
+++ b/srcpkgs/kodi/patches/fix-musl.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
  #ifdef  __cplusplus
  extern "C" {
  #endif
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch
index ab008d445a99..8bd3e7661ca4 100644
--- a/srcpkgs/kodi/patches/ppc64.patch
+++ b/srcpkgs/kodi/patches/ppc64.patch
@@ -1,9 +1,9 @@
 --- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
 +++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
+@@ -35,6 +35,12 @@
+   elseif(CPU MATCHES riscv64)
+     set(ARCH riscv64)
+     set(NEON False)
 +  elseif(CPU MATCHES ppc64le)
 +    set(ARCH ppc64le-linux)
 +    set(NEON False)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index a31240ff2766..da81c7e2d0a5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=19.0
-revision=4
+version=19.4
+revision=1
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+checksum=cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"
@@ -94,6 +94,8 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
 	 libwaylandpp-devel"
+	configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder
+	 -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -111,35 +113,13 @@ pre_configure() {
 
 	. /etc/profile.d/10_openjdk11.sh
 
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
+	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
 			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+				make -C tools/depends/native/$i native/$i
+			mv tools/depends/native/$i/native/$i tools/$i
+			make -C tools/depends/native/$i distclean
 		done
 	fi
 }

Re: [PR PATCH] [Merged]: kodi: update to 19.4

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 793 bytes --]

There's a merged pull request on the void-packages repository

kodi: update to 19.4
https://github.com/void-linux/void-packages/pull/36526

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild)
  - aarch64-musl (crossbuild)