From 529aa4af1a86c87e89c170018ed6e19179dec02b Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Sun, 14 Nov 2021 01:49:42 -0800 Subject: [PATCH] kodi: update to 19.3. Update patches to match. --- .../kodi/patches/add-missing-includes.patch | 8 +- .../disable-static-texturepacker-build.patch | 6 +- srcpkgs/kodi/patches/fix-fileemu.patch | 83 +++++++++---------- srcpkgs/kodi/patches/fix-musl.patch | 6 +- srcpkgs/kodi/patches/fmt8-support.patch | 7 -- srcpkgs/kodi/patches/fortify-source-fix.patch | 12 +-- srcpkgs/kodi/patches/ppc64.patch | 12 +-- srcpkgs/kodi/template | 6 +- 8 files changed, 64 insertions(+), 76 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..f2a7741362b6 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 +--- a/xbmc/filesystem/ZipManager.h +++ b/xbmc/filesystem/ZipManager.h -@@ -33,6 +33,7 @@ +@@ -22,6 +22,7 @@ #include #include #include +#include - + class CURL; - + diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch index 369f1b24d76d..da645d078ea2 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 @@ +--- a/tools/depends/native/TexturePacker/Makefile ++++ b/tools/depends/native/TexturePacker/Makefile +@@ -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..ee1a4dea6e35 100644 --- a/srcpkgs/kodi/patches/fix-fileemu.patch +++ b/srcpkgs/kodi/patches/fix-fileemu.patch @@ -1,36 +1,15 @@ ---- 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 @@ - #define _onexit_t void* - #endif - --#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - typedef off_t __off_t; - typedef int64_t off64_t; - 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 - #include - --#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) - typedef off_t __off_t; - typedef int64_t off64_t; - typedef off64_t __off64_t; ---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2019-01-30 19:29:02.249253971 +0100 -+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2019-01-30 19:39:34.911053272 +0100 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #ifdef TARGET_POSIX - #include "PlatformDefs.h" // for __stat64 - #include "XFileUtils.h" -@@ -1480,7 +1481,7 @@ +--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp ++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +@@ -1319,7 +1319,7 @@ extern "C" + CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking"); //warning + #ifndef TARGET_POSIX + return static_cast(tell(fd)); +-#elif defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) ++#elif defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) + return lseek(fd, 0, SEEK_CUR); + #else + return lseek64(fd, 0, SEEK_CUR); +@@ -1479,7 +1479,7 @@ extern "C" int ret; ret = dll_fgetpos64(stream, &tmpPos); @@ -39,31 +18,25 @@ *pos = (fpos_t)tmpPos; #else pos->__pos = (off_t)tmpPos.__pos; -@@ -1493,8 +1494,9 @@ +@@ -1492,7 +1492,7 @@ extern "C" CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); if (pFile != NULL) { -#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -- *pos = pFile->GetPosition(); +#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) -+ uint64_t *ppos = (uint64_t *) pos; -+ *ppos = pFile->GetPosition(); + *pos = pFile->GetPosition(); #else pos->__pos = pFile->GetPosition(); - #endif -@@ -1509,8 +1511,9 @@ +@@ -1508,7 +1508,7 @@ extern "C" int fd = g_emuFileWrapper.GetDescriptorByStream(stream); if (fd >= 0) { -#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) -- if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0) +#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) -+ const uint64_t *ppos = (const uint64_t *) pos; -+ if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0) + if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0) #else if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) - #endif -@@ -1532,7 +1535,7 @@ +@@ -1531,7 +1531,7 @@ extern "C" if (fd >= 0) { fpos64_t tmpPos; @@ -72,3 +45,25 @@ tmpPos= *pos; #else tmpPos.__pos = (off64_t)(pos->__pos); +--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h ++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h +@@ -17,7 +17,7 @@ + #define _onexit_t void* + #endif + +-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) ++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) + typedef off_t __off_t; + typedef int64_t off64_t; + typedef off64_t __off64_t; +--- a/xbmc/cores/DllLoader/exports/wrapper.c ++++ b/xbmc/cores/DllLoader/exports/wrapper.c +@@ -23,7 +23,7 @@ + #include + #include + +-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) ++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__) + typedef off_t __off_t; + typedef int64_t off64_t; + typedef off64_t __off64_t; diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch index c2eb622c98a4..c18f4bd3e19d 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 @@ +--- a/xbmc/cores/DllLoader/ldt_keeper.c ++++ b/xbmc/cores/DllLoader/ldt_keeper.c +@@ -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 -+#endif -+ diff --git a/srcpkgs/kodi/patches/fortify-source-fix.patch b/srcpkgs/kodi/patches/fortify-source-fix.patch index 5717746e09e1..d661b658485a 100644 --- a/srcpkgs/kodi/patches/fortify-source-fix.patch +++ b/srcpkgs/kodi/patches/fortify-source-fix.patch @@ -1,11 +1,11 @@ ---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig +--- a/xbmc/cores/DllLoader/exports/wrapper.c +++ b/xbmc/cores/DllLoader/exports/wrapper.c -@@ -462,7 +462,7 @@ +@@ -449,7 +449,7 @@ struct mntent *__wrap_getmntent(FILE *fp) // are actually #defines which are inlined when compiled with -O. Those defines - // actally call __*chk (for example, __fread_chk). We need to bypass this whole - // thing to actually call our wrapped functions. + // actually call __*chk (for example, __fread_chk). We need to bypass this whole + // thing to actually call our wrapped functions. -#if _FORTIFY_SOURCE > 1 -+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1 - ++#if defined (__GLIBC__) && _FORTIFY_SOURCE > 1 + size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream) { diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch index ab008d445a99..e88a6c4f177c 100644 --- a/srcpkgs/kodi/patches/ppc64.patch +++ b/srcpkgs/kodi/patches/ppc64.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- a/cmake/scripts/linux/ArchSetup.cmake ++++ b/cmake/scripts/linux/ArchSetup.cmake +@@ -32,6 +32,12 @@ else() elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64) set(ARCH aarch64) set(NEON True) @@ -10,6 +10,6 @@ + elseif(CPU MATCHES ppc64) + set(ARCH ppc64-linux) + set(NEON False) - else() - message(SEND_ERROR "Unknown CPU: ${CPU}") - endif() + elseif(CPU MATCHES riscv64) + set(ARCH riscv64) + set(NEON False) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index a31240ff2766..834e1679235b 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.3 +revision=1 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -17,7 +17,7 @@ maintainer="Orphaned " 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=440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b # Add CrossGUID dependency distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz" checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"