Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] kodi: update to 19.3.
@ 2021-11-14 22:09 Goorzhel
  2021-11-14 22:49 ` Goorzhel
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-14 22:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Goorzhel/void-packages kodi
https://github.com/void-linux/void-packages/pull/34083

kodi: update to 19.3.
Update patches to match.  (Is there a way to do that other than cloning the upstream, making the changes by hand, and doing a `git diff`?)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
I **briefly** tested the changes in this PR. It installs fine on a Pi 4 (`aarch64`), although there were setup pains — on both `19.0` and `.3` — that forced me toward LibreELEC instead.


<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 529aa4af1a86c87e89c170018ed6e19179dec02b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
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 <string>
  #include <vector>
  #include <map>
 +#include <stdint.h>
- 
+
  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 <dlfcn.h>
- 
--#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 <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #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<long long>(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 <dirent.h>
+ #include <dlfcn.h>
+ 
+-#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 <fmt/xchar.h>
-+#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 <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=440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
@ 2021-11-14 22:49 ` Goorzhel
  2021-11-14 22:49 ` Goorzhel
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-14 22:49 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968379344

Comment:
Ah, I hadn't test `musl`, even though all the patches were presumably for it. Good job, me. Taking a look.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
  2021-11-14 22:49 ` Goorzhel
@ 2021-11-14 22:49 ` Goorzhel
  2021-11-15  1:33 ` Goorzhel
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-14 22:49 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968379344

Comment:
Ah, I hadn't tested `musl`, even though all the patches were presumably for it. Good job, me. Taking a look.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
  2021-11-14 22:49 ` Goorzhel
  2021-11-14 22:49 ` Goorzhel
@ 2021-11-15  1:33 ` Goorzhel
  2021-11-15  1:35 ` Goorzhel
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-15  1:33 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968431423

Comment:
It's something to do with `fpos`, which is being patched in `fix-fileemu.patch`: <details>

```
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp: In function 'int dll_fgetpos64(FILE*, fpos_t*)':                                                               ../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:1497:33: error: no match for 'operator=' (operand types are 'fpos_t' and 'int64_t' {aka 'long int'})             1497 |       *pos = pFile->GetPosition();
      |                                 ^
In file included from ../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:10:
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note: candidate: 'constexpr _G_fpos64_t& _G_fpos64_t::operator=(const _G_fpos64_t&)'                           54 | typedef union _G_fpos64_t {
      |               ^~~~~~~~~~~
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note:   no known conversion for argument 1 from 'int64_t' {aka 'long int'} to 'const _G_fpos64_t&'          /usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note: candidate: 'constexpr _G_fpos64_t& _G_fpos64_t::operator=(_G_fpos64_t&&)'                             /usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note:   no known conversion for argument 1 from 'int64_t' {aka 'long int'} to '_G_fpos64_t&&'               ../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp: In function 'int dll_fsetpos64(FILE*, const fpos_t*)':                                                         ../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:1513:28: error: cannot convert 'const fpos_t' to '__off64_t' {aka 'long int'}                                    1513 |       if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)                                                                                                             |                            ^~~~
      |                            |                                                                                                                                 |                            const fpos_t
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:654:44: note:   initializing argument 2 of '__off64_t dll_lseeki64(int, __off64_t, int)'
  654 |   __off64_t dll_lseeki64(int fd, __off64_t lPos, int iWhence)
      |                                  ~~~~~~~~~~^~~~
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (2 preceding siblings ...)
  2021-11-15  1:33 ` Goorzhel
@ 2021-11-15  1:35 ` Goorzhel
  2021-11-15  2:29 ` Goorzhel
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-15  1:35 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968431423

Comment:
It's something to do with `fpos`, which is being patched in `fix-fileemu.patch`: <details>

```
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp: In function 'int dll_fgetpos64(FILE*, fpos_t*)':
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:1497:33: error: no match for 'operator=' (operand types are 'fpos_t' and 'int64_t' {aka 'long int'})
 1497 |       *pos = pFile->GetPosition();
      |                                 ^
In file included from ../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:10:
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note: candidate: 'constexpr _G_fpos64_t& _G_fpos64_t::operator=(const _G_fpos64_t&)'
   54 | typedef union _G_fpos64_t {
      |               ^~~~~~~~~~~
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note:   no known conversion for argument 1 from 'int64_t' {aka 'long int'} to 'const _G_fpos64_t&'
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note: candidate: 'constexpr _G_fpos64_t& _G_fpos64_t::operator=(_G_fpos64_t&&)'
/usr/aarch64-linux-musl/usr/include/stdio.h:54:15: note:   no known conversion for argument 1 from 'int64_t' {aka 'long int'} to '_G_fpos64_t&&'
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp: In function 'int dll_fsetpos64(FILE*, const fpos_t*)':
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:1513:28: error: cannot convert 'const fpos_t' to '__off64_t' {aka 'long int'}
 1513 |       if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
      |                            ^~~~
      |                            |
      |                            const fpos_t
../xbmc/cores/DllLoader/exports/emu_msvcrt.cpp:654:44: note:   initializing argument 2 of '__off64_t dll_lseeki64(int, __off64_t, int)'
  654 |   __off64_t dll_lseeki64(int fd, __off64_t lPos, int iWhence)
      |                                  ~~~~~~~~~~^~~~
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (3 preceding siblings ...)
  2021-11-15  1:35 ` Goorzhel
@ 2021-11-15  2:29 ` Goorzhel
  2021-11-15  6:02 ` [PR PATCH] [Updated] " Goorzhel
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-15  2:29 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968461434

Comment:
```cpp
  #if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
        *pos = pFile->GetPosition();
  #else
        pos->__pos = pFile->GetPosition();
  #endif
```

So, the first branch seems to treat `pos` as an integer (I think), or at least something that can be assigned an integer, but that's not the case in musl:
```cpp
  typedef union _G_fpos64_t {
          char __opaque[16];
          long long __lldata;
          double __align;
  } fpos_t;
```
And the other branch also won't work because there's no `__pos` member.

I dunno, I think I'm going to need someone that groks C++ to take a look at this, because I'm in over my head here.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (4 preceding siblings ...)
  2021-11-15  2:29 ` Goorzhel
@ 2021-11-15  6:02 ` Goorzhel
  2021-11-16 23:52 ` Goorzhel
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-15  6:02 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Goorzhel against master on the void-packages repository

https://github.com/Goorzhel/void-packages kodi
https://github.com/void-linux/void-packages/pull/34083

kodi: update to 19.3.
Update patches to match.  (Is there a way to do that other than cloning the upstream, making the changes by hand, and doing a `git diff`?)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
I **briefly** tested the changes in this PR. It installs fine on a Pi 4 (`aarch64`), although there were setup pains — on both `19.0` and `.3` — that forced me toward LibreELEC instead.


<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 529aa4af1a86c87e89c170018ed6e19179dec02b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sun, 14 Nov 2021 01:49:42 -0800
Subject: [PATCH 1/3] 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 <string>
  #include <vector>
  #include <map>
 +#include <stdint.h>
- 
+
  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 <dlfcn.h>
- 
--#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 <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #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<long long>(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 <dirent.h>
+ #include <dlfcn.h>
+ 
+-#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 <fmt/xchar.h>
-+#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 <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=440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"

From fcc00a39a16ca62086261487cd547ae354560d59 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sun, 14 Nov 2021 15:22:31 -0800
Subject: [PATCH 2/3] kodi: Add missed paths.h include.

---
 srcpkgs/kodi/patches/fix-fileemu.patch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index ee1a4dea6e35..d307f1ac1648 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,5 +1,13 @@
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #endif
 @@ -1319,7 +1319,7 @@ extern "C"
        CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking");      //warning
  #ifndef TARGET_POSIX

From 562d91af0d41494b3591507f363b0f1e9ca4f767 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sun, 14 Nov 2021 21:54:52 -0800
Subject: [PATCH 3/3] kodi: missed some casts

---
 srcpkgs/kodi/patches/fix-fileemu.patch | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index d307f1ac1648..dba5a7d5d331 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,3 +1,5 @@
+diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+index b7585e5..0b8dece 100644
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
 @@ -38,6 +38,7 @@
@@ -8,7 +10,7 @@
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
  #endif
-@@ -1319,7 +1319,7 @@ extern "C"
+@@ -1319,7 +1320,7 @@ extern "C"
        CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking");      //warning
  #ifndef TARGET_POSIX
        return static_cast<long long>(tell(fd));
@@ -17,7 +19,7 @@
        return lseek(fd, 0, SEEK_CUR);
  #else
        return lseek64(fd, 0, SEEK_CUR);
-@@ -1479,7 +1479,7 @@ extern "C"
+@@ -1479,7 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -26,25 +28,31 @@
      *pos = (fpos_t)tmpPos;
  #else
      pos->__pos = (off_t)tmpPos.__pos;
-@@ -1492,7 +1492,7 @@ extern "C"
+@@ -1492,8 +1493,9 @@ 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__)
-       *pos = pFile->GetPosition();
++      uint64_t *ppos = (uint64_t *) pos;
++      *ppos = pFile->GetPosition();
  #else
        pos->__pos = pFile->GetPosition();
-@@ -1508,7 +1508,7 @@ extern "C"
+ #endif
+@@ -1508,8 +1510,9 @@ 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__)
-       if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++      const uint64_t *ppos = (const uint64_t *) pos;
++      if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
  #else
        if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
-@@ -1531,7 +1531,7 @@ extern "C"
+ #endif
+@@ -1531,7 +1534,7 @@ extern "C"
      if (fd >= 0)
      {
        fpos64_t tmpPos;
@@ -53,6 +61,8 @@
        tmpPos= *pos;
  #else
        tmpPos.__pos = (off64_t)(pos->__pos);
+diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h
+index 7869dc2..7c59401 100644
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h
 @@ -17,7 +17,7 @@
@@ -64,6 +74,8 @@
  typedef off_t __off_t;
  typedef int64_t off64_t;
  typedef off64_t __off64_t;
+diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
+index 33ab343..23a1bcb 100644
 --- a/xbmc/cores/DllLoader/exports/wrapper.c
 +++ b/xbmc/cores/DllLoader/exports/wrapper.c
 @@ -23,7 +23,7 @@

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (5 preceding siblings ...)
  2021-11-15  6:02 ` [PR PATCH] [Updated] " Goorzhel
@ 2021-11-16 23:52 ` Goorzhel
  2021-12-04  4:32 ` ericonr
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-11-16 23:52 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-968461434

Comment:
```cpp
  #if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
        *pos = pFile->GetPosition();
  #else
        pos->__pos = pFile->GetPosition();
  #endif
```

So, the first branch seems to treat `pos` as an integer (I think), or at least something that can be assigned an integer, but that's not the case in musl:
```cpp
  typedef union _G_fpos64_t {
          char __opaque[16];
          long long __lldata;
          double __align;
  } fpos_t;
```
And the other branch also won't work because there's no `__pos` member.

I dunno, I think I'm going to need someone that groks C++ to take a look at this, because I'm in over my head here.

EDIT: I had missed two crucial type-casting lines.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (6 preceding siblings ...)
  2021-11-16 23:52 ` Goorzhel
@ 2021-12-04  4:32 ` ericonr
  2021-12-04  4:33 ` [PR PATCH] [Updated] " Goorzhel
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-12-04  4:32 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-985965660

Comment:
The truth is this shouldn't be touching `fpos_t` at all...

Please squash the commits!

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (7 preceding siblings ...)
  2021-12-04  4:32 ` ericonr
@ 2021-12-04  4:33 ` Goorzhel
  2021-12-04  4:39 ` Goorzhel
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-12-04  4:33 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Goorzhel against master on the void-packages repository

https://github.com/Goorzhel/void-packages kodi
https://github.com/void-linux/void-packages/pull/34083

kodi: update to 19.3.
Update patches to match.  (Is there a way to do that other than cloning the upstream, making the changes by hand, and doing a `git diff`?)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
I **briefly** tested the changes in this PR. It installs fine on a Pi 4 (`aarch64`), although there were setup pains — on both `19.0` and `.3` — that forced me toward LibreELEC instead.


<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 53a7085bc4ff4f32da97b344b8acd430a433812f Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
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        | 81 +++++++++++--------
 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, 73 insertions(+), 65 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 <string>
  #include <vector>
  #include <map>
 +#include <stdint.h>
- 
+
  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..dba5a7d5d331 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,27 +1,7 @@
---- 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 <dlfcn.h>
- 
--#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
+diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+index b7585e5..0b8dece 100644
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
 @@ -38,6 +38,7 @@
  #include <fcntl.h>
  #include <time.h>
@@ -29,8 +9,17 @@
 +#include <paths.h>
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
+ #endif
+@@ -1319,7 +1320,7 @@ extern "C"
+       CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking");      //warning
+ #ifndef TARGET_POSIX
+       return static_cast<long long>(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 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -39,31 +28,31 @@
      *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)
      {
 -#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();
++      uint64_t *ppos = (uint64_t *) pos;
++      *ppos = pFile->GetPosition();
  #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)
      {
 -#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)
++      const uint64_t *ppos = (const uint64_t *) pos;
++      if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
  #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;
@@ -72,3 +61,29 @@
        tmpPos= *pos;
  #else
        tmpPos.__pos = (off64_t)(pos->__pos);
+diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h
+index 7869dc2..7c59401 100644
+--- 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;
+diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
+index 33ab343..23a1bcb 100644
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -23,7 +23,7 @@
+ #include <dirent.h>
+ #include <dlfcn.h>
+ 
+-#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 <fmt/xchar.h>
-+#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 <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=440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (8 preceding siblings ...)
  2021-12-04  4:33 ` [PR PATCH] [Updated] " Goorzhel
@ 2021-12-04  4:39 ` Goorzhel
  2021-12-04  4:39 ` Goorzhel
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-12-04  4:39 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-985966384

Comment:
> The truth is this shouldn't be touching fpos_t at all...

Hmm, out of curiosity, why's that?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (9 preceding siblings ...)
  2021-12-04  4:39 ` Goorzhel
@ 2021-12-04  4:39 ` Goorzhel
  2021-12-04  4:42 ` ericonr
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Goorzhel @ 2021-12-04  4:39 UTC (permalink / raw)
  To: ml

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

New comment by Goorzhel on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-985966384

Comment:
> The truth is this shouldn't be touching `fpos_t` at all...

Hmm, out of curiosity, why's that?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (10 preceding siblings ...)
  2021-12-04  4:39 ` Goorzhel
@ 2021-12-04  4:42 ` ericonr
  2022-04-04 23:11 ` marmeladema
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-12-04  4:42 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-985966736

Comment:
Because it's an opaque structure, you aren't supposed to poke inside its bits.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (11 preceding siblings ...)
  2021-12-04  4:42 ` ericonr
@ 2022-04-04 23:11 ` marmeladema
  2022-04-05  0:03 ` [PR PATCH] [Closed]: " the-maldridge
  2022-04-05  0:03 ` the-maldridge
  14 siblings, 0 replies; 16+ messages in thread
From: marmeladema @ 2022-04-04 23:11 UTC (permalink / raw)
  To: ml

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

New comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-1088103051

Comment:
Superseded by https://github.com/void-linux/void-packages/pull/36526

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (13 preceding siblings ...)
  2022-04-05  0:03 ` [PR PATCH] [Closed]: " the-maldridge
@ 2022-04-05  0:03 ` the-maldridge
  14 siblings, 0 replies; 16+ messages in thread
From: the-maldridge @ 2022-04-05  0:03 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/34083#issuecomment-1088136539

Comment:
Obsoleted by #36526.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Closed]: kodi: update to 19.3.
  2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
                   ` (12 preceding siblings ...)
  2022-04-04 23:11 ` marmeladema
@ 2022-04-05  0:03 ` the-maldridge
  2022-04-05  0:03 ` the-maldridge
  14 siblings, 0 replies; 16+ messages in thread
From: the-maldridge @ 2022-04-05  0:03 UTC (permalink / raw)
  To: ml

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

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

kodi: update to 19.3.
https://github.com/void-linux/void-packages/pull/34083

Description:
Update patches to match.  (Is there a way to do that other than cloning the upstream, making the changes by hand, and doing a `git diff`?)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
I **briefly** tested the changes in this PR. It installs fine on a Pi 4 (`aarch64`), although there were setup pains — on both `19.0` and `.3` — that forced me toward LibreELEC instead.


<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2022-04-05  0:03 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-14 22:09 [PR PATCH] kodi: update to 19.3 Goorzhel
2021-11-14 22:49 ` Goorzhel
2021-11-14 22:49 ` Goorzhel
2021-11-15  1:33 ` Goorzhel
2021-11-15  1:35 ` Goorzhel
2021-11-15  2:29 ` Goorzhel
2021-11-15  6:02 ` [PR PATCH] [Updated] " Goorzhel
2021-11-16 23:52 ` Goorzhel
2021-12-04  4:32 ` ericonr
2021-12-04  4:33 ` [PR PATCH] [Updated] " Goorzhel
2021-12-04  4:39 ` Goorzhel
2021-12-04  4:39 ` Goorzhel
2021-12-04  4:42 ` ericonr
2022-04-04 23:11 ` marmeladema
2022-04-05  0:03 ` [PR PATCH] [Closed]: " the-maldridge
2022-04-05  0:03 ` the-maldridge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).