Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix

[marmeladema <marmeladema@users.noreply.github.com>]

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

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

https://github.com/marmeladema/void-packages kodi-19.0
https://github.com/void-linux/void-packages/pull/29407

kodi: update to version 19.0-Matrix
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64
  - [x] x86_64-musl



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

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

From 9629b6c0b5127ff241e85809397a8fb66490fd5b Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/3] kodi: update to 19.0-Matrix

---
 .../kodi/patches/add-missing-cassert.patch    | 20 --------
 srcpkgs/kodi/patches/crossguid-0.2.patch      | 37 --------------
 srcpkgs/kodi/patches/fix-musl.patch           |  4 +-
 srcpkgs/kodi/patches/remove-filewrap.patch    | 40 ---------------
 srcpkgs/kodi/template                         | 49 ++++++++++++++-----
 5 files changed, 39 insertions(+), 111 deletions(-)
 delete mode 100644 srcpkgs/kodi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi/patches/remove-filewrap.patch

diff --git a/srcpkgs/kodi/patches/add-missing-cassert.patch b/srcpkgs/kodi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d8604082..00000000000
--- a/srcpkgs/kodi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi/patches/crossguid-0.2.patch b/srcpkgs/kodi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72a..00000000000
--- a/srcpkgs/kodi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index 98fa08aaffb..c2eb622c98a 100644
--- a/srcpkgs/kodi/patches/fix-musl.patch
+++ b/srcpkgs/kodi/patches/fix-musl.patch
@@ -4,8 +4,8 @@
  #ifdef  __cplusplus
  extern "C" {
  #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+-#if defined(TARGET_ANDROID) && (defined(__i386__) || defined(__x86_64__)) && !defined(modify_ldt)
++#if defined(__linux__) && (defined(__i386__) || defined(__x86_64__)) && !defined(modify_ldt)
  #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
  #else
  int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi/patches/remove-filewrap.patch b/srcpkgs/kodi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063a..00000000000
--- a/srcpkgs/kodi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index bff11d8ae5a..9905a0293d4 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,19 +1,38 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=18.9
-revision=6
-_codename="Leia"
+version=19.0
+revision=1
+_codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
-configure_args="-DENABLE_INTERNAL_CROSSGUID=OFF -DWITH_FFMPEG=/usr
- -DENABLE_LDGOLD=OFF"
+configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF
+ -DAPP_RENDER_SYSTEM=gl -DENABLE_INTERNAL_CROSSGUID=ON
+ -DCROSSGUID_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/crossguid-8f399e8bd4.tar.gz
+ -Dlibdvdcss_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdcss-1.4.2-Leia-Beta-5.tar.gz
+ -Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+ -Dlibdvdnav_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz"
+make_build_target="all"
 short_desc="Software media player and entertainment hub for digital media"
 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=bdf8afa9356b1f815de9984801d3e0d2b46a719e747895b75528f20995c59d2b
-python_version=2
+checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+# Add CrossGUID dependency
+distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
+checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"
+# Add libdvdcss dependency
+distfiles+=" https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz>libdvdcss-1.4.2-Leia-Beta-5.tar.gz"
+checksum+=" 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d"
+# Add libdvdread dependency
+distfiles+=" https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz>libdvdread-6.0.0-Leia-Alpha-3.tar.gz"
+checksum+=" a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf"
+# Add libdvdnav dependency
+distfiles+=" https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz>libdvdnav-6.0.0-Leia-Alpha-3.tar.gz"
+checksum+=" 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a"
+skip_extraction="crossguid-8f399e8bd4.tar.gz libdvdcss-1.4.2-Leia-Beta-5.tar.gz
+ libdvdread-6.0.0-Leia-Alpha-3.tar.gz libdvdnav-6.0.0-Leia-Alpha-3.tar.gz"
+python_version=3
 patch_args="-Np1"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
@@ -22,8 +41,8 @@ archs="i686* x86_64* aarch64*
  ppc64*"
 
 hostmakedepends="
- automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python-devel
- gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which"
+ automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+ gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++"
 makedepends="
  eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -35,8 +54,9 @@ makedepends="
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
  taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel
  giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel
- libcec-devel dcadec-devel crossguid flatbuffers-devel fmt-devel lcms2-devel
- libfstrcmp-devel rapidjson libcdio-paranoia"
+ libcec-devel dcadec-devel flatbuffers-devel fmt-devel lcms2-devel
+ libfstrcmp-devel rapidjson libcdio-paranoia spdlog libwaylandpp-devel
+ libinput-devel libdav1d-devel gtest-devel"
 
 # The following dependencies are dlopen(3)ed.
 depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
@@ -46,11 +66,16 @@ depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
 		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		makedepends+=" python-devel ffmpeg-devel"
+		hostmakedepends+=" libwaylandpp-devel"
+		makedepends+=" python3-devel ffmpeg-devel"
 		configure_args+=" -DENABLE_VAAPI=OFF"
 		;;
 esac
 
+if [ -z "$CROSS_BUILD" ]; then
+	make_build_target+=" kodi-test"
+fi
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 	find -type f | \

From eb9828775c7b6e5265c939370f60b832449247d3 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/3] libwaylandpp: fix shlibs

---
 common/shlibs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0..462846b9739 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,3 +3966,7 @@ libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libwayland-client++.so.0 libwaylandpp-0.2.8_1
+libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
+libwayland-egl++.so.0 libwaylandpp-0.2.8_1
+libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
\ No newline at end of file

From 3c0332ab330e30a2c280de2258ed9bf60a9c2e09 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 3/3] kodi: prevent some failing tests to run in CI

---
 srcpkgs/kodi/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4..cf9e1ec28ac 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,10 @@ depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
  lame librtmp libnfs>=1.9.7 libplist>=1.12"
 depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 
+# Disable this test on all architectures
+# https://github.com/void-linux/void-packages/commit/326d1d851f2aa187c12299445759c89616774fb5/checks/2093337051/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
 		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +74,16 @@ case "$XBPS_TARGET_MACHINE" in
 		makedepends+=" python3-devel ffmpeg-devel"
 		configure_args+=" -DENABLE_VAAPI=OFF"
 		;;
+	i686)
+		# Additionaly disable these tests on i686 architecutre
+		# https://github.com/void-linux/void-packages/commit/326d1d851f2aa187c12299445759c89616774fb5/checks/2093337086/logs
+		_gtest_filter+=":TestDateTime.SetFromDBTime:TestDateTime.SetDateTime:TestDateTime.Reset"
+		;;
+	x86_64-musl)
+		# Additionally disable this test on x86_64-musl architecture
+		# https://github.com/void-linux/void-packages/commit/326d1d851f2aa187c12299445759c89616774fb5/checks/2093337203/logs
+		_gtest_filter+=":TestFile.Stat"
+		;;
 esac
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +132,11 @@ post_build() {
 	fi
 }
 
+do_check() {
+    # ./build/kodi-test --gtest_filter="${_gtest_filter}"
+    ./build/kodi-test
+}
+
 kodi-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"