* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
@ 2021-03-12 0:59 ` marmeladema
2021-03-12 8:30 ` marmeladema
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-12 0:59 UTC (permalink / raw)
To: ml
[-- 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: 10535 bytes --]
From 0f54d66fea96539f027548a79bd78506bdaa12ee Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/2] 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 | 45 ++++++++++++++-----
5 files changed, 35 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..5a02d71895e 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 kodi-test"
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,7 +66,8 @@ 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
From 4552b9b3171bd847dae85709c1dba1cc005444a6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/2] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 42f37d8a08b..3dc27a103d7 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
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
2021-03-12 0:59 ` [PR PATCH] [Updated] " marmeladema
@ 2021-03-12 8:30 ` marmeladema
2021-03-12 10:24 ` marmeladema
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-12 8:30 UTC (permalink / raw)
To: ml
[-- 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: 10665 bytes --]
From 822fda3533a2c674ae912e2ad385754c3a4a3557 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/2] 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 326d1d851f2aa187c12299445759c89616774fb5 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/2] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 42f37d8a08b..3dc27a103d7 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
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
2021-03-12 0:59 ` [PR PATCH] [Updated] " marmeladema
2021-03-12 8:30 ` marmeladema
@ 2021-03-12 10:24 ` marmeladema
2021-03-12 15:22 ` ericonr
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-12 10:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
New comment by marmeladema on void-packages repository
https://github.com/void-linux/void-packages/pull/29407#issuecomment-797393626
Comment:
Build is fine on all supported arch, some tests are failing probably because they are run in CI:
```
353/586 Test #353: TestCPUInfo.GetCPUFrequency ............................................***Failed 0.15 sec
Note: Google Test filter = TestCPUInfo.GetCPUFrequency
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from TestCPUInfo
[ RUN ] TestCPUInfo.GetCPUFrequency
../xbmc/utils/test/TestCPUInfo.cpp:41: Failure
Expected: (CServiceBroker::GetCPUInfo()->GetCPUFrequency()) >= (0.f), actual: -1 vs 0
[ FAILED ] TestCPUInfo.GetCPUFrequency (0 ms)
[----------] 1 test from TestCPUInfo (0 ms total)
[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (66 ms total)
[ PASSED ] 0 tests.
[ FAILED ] 1 test, listed below:
[ FAILED ] TestCPUInfo.GetCPUFrequency
1 FAILED TEST
Clean shutdown of TestGlobalPattern1
...
The following tests FAILED:
353 - TestCPUInfo.GetCPUFrequency (Failed)
```
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (2 preceding siblings ...)
2021-03-12 10:24 ` marmeladema
@ 2021-03-12 15:22 ` ericonr
2021-03-12 16:57 ` marmeladema
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-03-12 15:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29407#issuecomment-797558465
Comment:
If you can disable only that specific test, please do so! Otherwise, we can use `make_check=extended` in the template (with an appropriate comment) so it only runs with `./xbps-src -K pkg kodi` (which is not what CI uses).
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (3 preceding siblings ...)
2021-03-12 15:22 ` ericonr
@ 2021-03-12 16:57 ` marmeladema
2021-03-13 10:39 ` [PR PATCH] [Updated] " marmeladema
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-12 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by marmeladema on void-packages repository
https://github.com/void-linux/void-packages/pull/29407#issuecomment-797621373
Comment:
@ericonr will try! Tests are managed by gtest. I have never used it I might be able to skip some tests for specific architectures.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (4 preceding siblings ...)
2021-03-12 16:57 ` marmeladema
@ 2021-03-13 10:39 ` marmeladema
2021-03-13 10:42 ` marmeladema
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-13 10:39 UTC (permalink / raw)
To: ml
[-- 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: 12439 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 046409ca373b23b411f73a4225ea8ac4c729aadd 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 | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4..97e5698c837 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,8 +74,20 @@ 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
+export GTEST_FILTER="${GTEST_FILTER}"
+
if [ -z "$CROSS_BUILD" ]; then
make_build_target+=" kodi-test"
fi
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (5 preceding siblings ...)
2021-03-13 10:39 ` [PR PATCH] [Updated] " marmeladema
@ 2021-03-13 10:42 ` marmeladema
2021-03-13 11:17 ` marmeladema
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-13 10:42 UTC (permalink / raw)
To: ml
[-- 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: 12463 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 f93083cf9e4e9c71eae5ed81604e15d84ca8f2a0 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 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4..f31e9959e40 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,10 +74,21 @@ 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
make_build_target+=" kodi-test"
+ export GTEST_FILTER="${_gtest_filter}"
fi
pre_configure() {
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (6 preceding siblings ...)
2021-03-13 10:42 ` marmeladema
@ 2021-03-13 11:17 ` marmeladema
2021-03-13 13:57 ` marmeladema
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-13 11:17 UTC (permalink / raw)
To: ml
[-- 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}"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (7 preceding siblings ...)
2021-03-13 11:17 ` marmeladema
@ 2021-03-13 13:57 ` marmeladema
2021-03-13 15:34 ` marmeladema
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-13 13:57 UTC (permalink / raw)
To: ml
[-- 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: 13041 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 d7fc33a4e2e80fe2a6dc6f782fb0df0074f0fd29 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 | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4..5eee2d18f2e 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (8 preceding siblings ...)
2021-03-13 13:57 ` marmeladema
@ 2021-03-13 15:34 ` marmeladema
2021-03-14 20:27 ` [PR PATCH] [Updated] " marmeladema
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-13 15:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by marmeladema on void-packages repository
https://github.com/void-linux/void-packages/pull/29407#issuecomment-798518878
Comment:
@ericonr Ok I think I got it now!
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (9 preceding siblings ...)
2021-03-13 15:34 ` marmeladema
@ 2021-03-14 20:27 ` marmeladema
2021-03-14 20:28 ` marmeladema
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-14 20:27 UTC (permalink / raw)
To: ml
[-- 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: 22865 bytes --]
From 04dafb27942ac282d1c3ea5016ed0516d21eb2b8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/4] 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 1e9d86040829..000000000000
--- 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 1c18a84c72ab..000000000000
--- 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 98fa08aaffba..c2eb622c98a4 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 76f6602063aa..000000000000
--- 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 bff11d8ae5ad..9905a0293d4c 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 f961562ac18efe13e03401d6ea957e654c954254 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/4] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..462846b97390 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 8d52e7bcb1731411f63c504595d0b91c1a6150d6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 3/4] kodi: prevent some failing tests to run in CI
---
srcpkgs/kodi/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4c..5eee2d18f2e9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From e42afe0b656d3e773a7d23fd2df5e9a84291b9d8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 15:55:31 +0000
Subject: [PATCH 4/4] kodi-addon-*: update for kodi-19.0-Matrix
---
srcpkgs/kodi-addon-game-libretro/template | 6 +++---
srcpkgs/kodi-addon-inputstream-adaptive/template | 6 +++---
srcpkgs/kodi-addon-inputstream-rtmp/template | 6 +++---
srcpkgs/kodi-addon-peripheral-joystick/template | 6 +++---
srcpkgs/kodi-addon-pvr-hts/template | 6 +++---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++----
srcpkgs/kodi-addon-pvr-zattoo/template | 6 +++---
srcpkgs/kodi-addon-vfs-rar/template | 8 ++++----
srcpkgs/kodi-addon-vfs-sftp/template | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282dfe..6e44c5a1de9c 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-game-libretro'
pkgname=kodi-addon-game-libretro
-version=1.1.1
+version=2.2.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-game/game.libretro"
distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
+checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc82..ca978f1f3d81 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-adaptive'
pkgname=kodi-addon-inputstream-adaptive
-version=2.4.4
+version=2.6.7
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/peak3d/inputstream.adaptive"
distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
+checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index bee02ae906ef..3e7e4968f8c3 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-rtmp'
pkgname=kodi-addon-inputstream-rtmp
-version=2.0.9
+version=3.4.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,5 +13,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/inputstream.rtmp"
distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
+checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f284096046..7c325925c4b0 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,7 +1,7 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
-version=1.4.9
-_kodi_release="Leia"
+version=1.7.1
+_kodi_release="Matrix"
revision=1
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
-checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
+checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702bb..eeb0d6335275 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-hts'
pkgname=kodi-addon-pvr-hts
-version=4.4.21
+version=8.2.3
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.hts"
distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba346..7628dd6bd31f 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,17 +1,17 @@
# Template file for 'kodi-addon-pvr-iptvsimple'
pkgname=kodi-addon-pvr-iptvsimple
-version=3.9.8
+version=7.5.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
+makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel
zlib-devel"
short_desc="IPTV Simple client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
+checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index c313e855d20f..1ff40658bcf0 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-zattoo'
pkgname=kodi-addon-pvr-zattoo
-version=18.1.23
+version=19.7.8.1
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -14,6 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://github.com/rbuehlma/pvr.zattoo"
distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
+checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
nocross="depends on kodi-platform"
make_check=no # No target to "make test"
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a9..9ae75a72c860 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,15 +1,15 @@
# Template file for 'kodi-addon-vfs-rar'
pkgname=kodi-addon-vfs-rar
-version=2.3.2
+version=4.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
-makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel pkg-config"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.rar"
distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
-checksum=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
+checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 5ba4d6a33c3c..40d91f566d62 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-vfs-sftp'
pkgname=kodi-addon-vfs-sftp
-version=1.0.5
+version=2.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.sftp"
distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
+checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
nocross="depends on kodi-platform"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (10 preceding siblings ...)
2021-03-14 20:27 ` [PR PATCH] [Updated] " marmeladema
@ 2021-03-14 20:28 ` marmeladema
2021-03-14 22:35 ` marmeladema
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-14 20:28 UTC (permalink / raw)
To: ml
[-- 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: 22928 bytes --]
From 04dafb27942ac282d1c3ea5016ed0516d21eb2b8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/4] 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 1e9d86040829..000000000000
--- 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 1c18a84c72ab..000000000000
--- 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 98fa08aaffba..c2eb622c98a4 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 76f6602063aa..000000000000
--- 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 bff11d8ae5ad..9905a0293d4c 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 f961562ac18efe13e03401d6ea957e654c954254 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/4] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..462846b97390 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 8d52e7bcb1731411f63c504595d0b91c1a6150d6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 3/4] kodi: prevent some failing tests to run in CI
---
srcpkgs/kodi/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4c..5eee2d18f2e9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From cd5c563e61d6157b0283a16a88eae5451c6f8429 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 15:55:31 +0000
Subject: [PATCH 4/4] kodi-addon-*: update for kodi-19.0-Matrix
---
srcpkgs/kodi-addon-game-libretro/template | 6 +++---
srcpkgs/kodi-addon-inputstream-adaptive/template | 6 +++---
srcpkgs/kodi-addon-inputstream-rtmp/template | 6 +++---
srcpkgs/kodi-addon-peripheral-joystick/template | 6 +++---
srcpkgs/kodi-addon-pvr-hts/template | 6 +++---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++----
srcpkgs/kodi-addon-pvr-zattoo/template | 6 +++---
srcpkgs/kodi-addon-vfs-rar/template | 8 ++++----
srcpkgs/kodi-addon-vfs-sftp/template | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282dfe..6e44c5a1de9c 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-game-libretro'
pkgname=kodi-addon-game-libretro
-version=1.1.1
+version=2.2.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-game/game.libretro"
distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
+checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc82..ca978f1f3d81 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-adaptive'
pkgname=kodi-addon-inputstream-adaptive
-version=2.4.4
+version=2.6.7
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/peak3d/inputstream.adaptive"
distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
+checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index bee02ae906ef..3e7e4968f8c3 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-rtmp'
pkgname=kodi-addon-inputstream-rtmp
-version=2.0.9
+version=3.4.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,5 +13,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/inputstream.rtmp"
distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
+checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f284096046..de72349fcf20 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
-version=1.4.9
-_kodi_release="Leia"
+version=1.7.1
revision=1
+_kodi_release="Matrix"
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
-checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
+checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702bb..eeb0d6335275 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-hts'
pkgname=kodi-addon-pvr-hts
-version=4.4.21
+version=8.2.3
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.hts"
distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba346..7628dd6bd31f 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,17 +1,17 @@
# Template file for 'kodi-addon-pvr-iptvsimple'
pkgname=kodi-addon-pvr-iptvsimple
-version=3.9.8
+version=7.5.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
+makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel
zlib-devel"
short_desc="IPTV Simple client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
+checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index c313e855d20f..1ff40658bcf0 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-zattoo'
pkgname=kodi-addon-pvr-zattoo
-version=18.1.23
+version=19.7.8.1
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -14,6 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://github.com/rbuehlma/pvr.zattoo"
distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
+checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
nocross="depends on kodi-platform"
make_check=no # No target to "make test"
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a9..9ae75a72c860 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,15 +1,15 @@
# Template file for 'kodi-addon-vfs-rar'
pkgname=kodi-addon-vfs-rar
-version=2.3.2
+version=4.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
-makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel pkg-config"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.rar"
distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
-checksum=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
+checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 5ba4d6a33c3c..40d91f566d62 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-vfs-sftp'
pkgname=kodi-addon-vfs-sftp
-version=1.0.5
+version=2.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.sftp"
distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
+checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
nocross="depends on kodi-platform"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (11 preceding siblings ...)
2021-03-14 20:28 ` marmeladema
@ 2021-03-14 22:35 ` marmeladema
2021-03-14 22:36 ` marmeladema
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-14 22:35 UTC (permalink / raw)
To: ml
[-- 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: 36102 bytes --]
From 04dafb27942ac282d1c3ea5016ed0516d21eb2b8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/5] 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 1e9d86040829..000000000000
--- 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 1c18a84c72ab..000000000000
--- 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 98fa08aaffba..c2eb622c98a4 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 76f6602063aa..000000000000
--- 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 bff11d8ae5ad..9905a0293d4c 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 f961562ac18efe13e03401d6ea957e654c954254 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/5] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..462846b97390 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 8d52e7bcb1731411f63c504595d0b91c1a6150d6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 3/5] kodi: prevent some failing tests to run in CI
---
srcpkgs/kodi/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4c..5eee2d18f2e9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From cd5c563e61d6157b0283a16a88eae5451c6f8429 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 15:55:31 +0000
Subject: [PATCH 4/5] kodi-addon-*: update for kodi-19.0-Matrix
---
srcpkgs/kodi-addon-game-libretro/template | 6 +++---
srcpkgs/kodi-addon-inputstream-adaptive/template | 6 +++---
srcpkgs/kodi-addon-inputstream-rtmp/template | 6 +++---
srcpkgs/kodi-addon-peripheral-joystick/template | 6 +++---
srcpkgs/kodi-addon-pvr-hts/template | 6 +++---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++----
srcpkgs/kodi-addon-pvr-zattoo/template | 6 +++---
srcpkgs/kodi-addon-vfs-rar/template | 8 ++++----
srcpkgs/kodi-addon-vfs-sftp/template | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282dfe..6e44c5a1de9c 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-game-libretro'
pkgname=kodi-addon-game-libretro
-version=1.1.1
+version=2.2.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-game/game.libretro"
distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
+checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc82..ca978f1f3d81 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-adaptive'
pkgname=kodi-addon-inputstream-adaptive
-version=2.4.4
+version=2.6.7
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/peak3d/inputstream.adaptive"
distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
+checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index bee02ae906ef..3e7e4968f8c3 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-rtmp'
pkgname=kodi-addon-inputstream-rtmp
-version=2.0.9
+version=3.4.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,5 +13,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/inputstream.rtmp"
distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
+checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f284096046..de72349fcf20 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
-version=1.4.9
-_kodi_release="Leia"
+version=1.7.1
revision=1
+_kodi_release="Matrix"
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
-checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
+checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702bb..eeb0d6335275 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-hts'
pkgname=kodi-addon-pvr-hts
-version=4.4.21
+version=8.2.3
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.hts"
distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba346..7628dd6bd31f 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,17 +1,17 @@
# Template file for 'kodi-addon-pvr-iptvsimple'
pkgname=kodi-addon-pvr-iptvsimple
-version=3.9.8
+version=7.5.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
+makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel
zlib-devel"
short_desc="IPTV Simple client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
+checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index c313e855d20f..1ff40658bcf0 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-zattoo'
pkgname=kodi-addon-pvr-zattoo
-version=18.1.23
+version=19.7.8.1
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -14,6 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://github.com/rbuehlma/pvr.zattoo"
distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
+checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
nocross="depends on kodi-platform"
make_check=no # No target to "make test"
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a9..9ae75a72c860 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,15 +1,15 @@
# Template file for 'kodi-addon-vfs-rar'
pkgname=kodi-addon-vfs-rar
-version=2.3.2
+version=4.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
-makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel pkg-config"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.rar"
distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
-checksum=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
+checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 5ba4d6a33c3c..40d91f566d62 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-vfs-sftp'
pkgname=kodi-addon-vfs-sftp
-version=1.0.5
+version=2.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.sftp"
distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
+checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
nocross="depends on kodi-platform"
From 1e0deb9f1d3271a61038eaaa26173e0abf2410b5 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 14 Mar 2021 22:30:37 +0000
Subject: [PATCH 5/5] kodi-rpc: detach package from kodi package and copy kodi
18.9 patches
Kodi 19 does not support rpbi as a specific core platform anymore
and thus cannot be updated to use kodi 19 and its patches.
It might be possible that kodi itelf work out of the box now using
the gdm core platform using:
```
$ kodi --windowing=gbm
```
---
srcpkgs/kodi-rpi/patches | 1 -
.../patches/add-missing-cassert.patch | 20 +++++
.../patches/add-missing-includes.patch | 10 +++
srcpkgs/kodi-rpi/patches/crossguid-0.2.patch | 37 ++++++++++
.../disable-static-texturepacker-build.patch | 11 +++
srcpkgs/kodi-rpi/patches/fix-fileemu.patch | 74 +++++++++++++++++++
srcpkgs/kodi-rpi/patches/fix-musl.patch | 11 +++
.../kodi-rpi/patches/fortify-source-fix.patch | 11 +++
srcpkgs/kodi-rpi/patches/ppc64.patch | 15 ++++
.../kodi-rpi/patches/remove-filewrap.patch | 40 ++++++++++
10 files changed, 229 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/kodi-rpi/patches
create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
diff --git a/srcpkgs/kodi-rpi/patches b/srcpkgs/kodi-rpi/patches
deleted file mode 120000
index 95c1fe40f190..000000000000
--- a/srcpkgs/kodi-rpi/patches
+++ /dev/null
@@ -1 +0,0 @@
-../kodi/patches
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- 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-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+
+ class CURL;
+
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- 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-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ cd $(PLATFORM); cp -a $(SOURCE)/* .
+ cd $(PLATFORM); ./autogen.sh
+- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+
+
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- 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 @@
+ int ret;
+
+ ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ *pos = (fpos_t)tmpPos;
+ #else
+ pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+ 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();
+ #else
+ pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+ 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)
+ #else
+ if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+ if (fd >= 0)
+ {
+ fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ tmpPos= *pos;
+ #else
+ tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !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-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // 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.
+-#if _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-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- 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)
++ elseif(CPU MATCHES ppc64le)
++ set(ARCH ppc64le-linux)
++ set(NEON False)
++ elseif(CPU MATCHES ppc64)
++ set(ARCH ppc64-linux)
++ set(NEON False)
+ else()
+ message(SEND_ERROR "Unknown CPU: ${CPU}")
+ endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- 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;
+ };
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (12 preceding siblings ...)
2021-03-14 22:35 ` marmeladema
@ 2021-03-14 22:36 ` marmeladema
2021-03-15 1:40 ` ericonr
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-14 22:36 UTC (permalink / raw)
To: ml
[-- 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: 36102 bytes --]
From 04dafb27942ac282d1c3ea5016ed0516d21eb2b8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 12:20:31 +0000
Subject: [PATCH 1/5] 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 1e9d86040829..000000000000
--- 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 1c18a84c72ab..000000000000
--- 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 98fa08aaffba..c2eb622c98a4 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 76f6602063aa..000000000000
--- 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 bff11d8ae5ad..9905a0293d4c 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 f961562ac18efe13e03401d6ea957e654c954254 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 2/5] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..462846b97390 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 8d52e7bcb1731411f63c504595d0b91c1a6150d6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 3/5] kodi: prevent some failing tests to run in CI
---
srcpkgs/kodi/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4c..5eee2d18f2e9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From cd5c563e61d6157b0283a16a88eae5451c6f8429 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 15:55:31 +0000
Subject: [PATCH 4/5] kodi-addon-*: update for kodi-19.0-Matrix
---
srcpkgs/kodi-addon-game-libretro/template | 6 +++---
srcpkgs/kodi-addon-inputstream-adaptive/template | 6 +++---
srcpkgs/kodi-addon-inputstream-rtmp/template | 6 +++---
srcpkgs/kodi-addon-peripheral-joystick/template | 6 +++---
srcpkgs/kodi-addon-pvr-hts/template | 6 +++---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++----
srcpkgs/kodi-addon-pvr-zattoo/template | 6 +++---
srcpkgs/kodi-addon-vfs-rar/template | 8 ++++----
srcpkgs/kodi-addon-vfs-sftp/template | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282dfe..6e44c5a1de9c 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-game-libretro'
pkgname=kodi-addon-game-libretro
-version=1.1.1
+version=2.2.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-game/game.libretro"
distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
+checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc82..ca978f1f3d81 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-adaptive'
pkgname=kodi-addon-inputstream-adaptive
-version=2.4.4
+version=2.6.7
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/peak3d/inputstream.adaptive"
distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
+checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index bee02ae906ef..3e7e4968f8c3 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-rtmp'
pkgname=kodi-addon-inputstream-rtmp
-version=2.0.9
+version=3.4.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,5 +13,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/inputstream.rtmp"
distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
+checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f284096046..de72349fcf20 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
-version=1.4.9
-_kodi_release="Leia"
+version=1.7.1
revision=1
+_kodi_release="Matrix"
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
-checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
+checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702bb..eeb0d6335275 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-hts'
pkgname=kodi-addon-pvr-hts
-version=4.4.21
+version=8.2.3
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.hts"
distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba346..7628dd6bd31f 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,17 +1,17 @@
# Template file for 'kodi-addon-pvr-iptvsimple'
pkgname=kodi-addon-pvr-iptvsimple
-version=3.9.8
+version=7.5.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
+makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel
zlib-devel"
short_desc="IPTV Simple client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
+checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index c313e855d20f..1ff40658bcf0 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-zattoo'
pkgname=kodi-addon-pvr-zattoo
-version=18.1.23
+version=19.7.8.1
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -14,6 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://github.com/rbuehlma/pvr.zattoo"
distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
+checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
nocross="depends on kodi-platform"
make_check=no # No target to "make test"
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a9..9ae75a72c860 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,15 +1,15 @@
# Template file for 'kodi-addon-vfs-rar'
pkgname=kodi-addon-vfs-rar
-version=2.3.2
+version=4.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
-makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel pkg-config"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.rar"
distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
-checksum=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
+checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 5ba4d6a33c3c..40d91f566d62 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-vfs-sftp'
pkgname=kodi-addon-vfs-sftp
-version=1.0.5
+version=2.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.sftp"
distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
+checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
nocross="depends on kodi-platform"
From 2455d9903c82db0fcf5a8e3088962480ac80b3f7 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 14 Mar 2021 22:30:37 +0000
Subject: [PATCH 5/5] kodi-rpi: detach package from kodi package and copy kodi
18.9 patches
Kodi 19 does not support rpbi as a specific core platform anymore
and thus cannot be updated to use kodi 19 and its patches.
It might be possible that kodi itelf work out of the box now using
the gdm core platform using:
```
$ kodi --windowing=gbm
```
---
srcpkgs/kodi-rpi/patches | 1 -
.../patches/add-missing-cassert.patch | 20 +++++
.../patches/add-missing-includes.patch | 10 +++
srcpkgs/kodi-rpi/patches/crossguid-0.2.patch | 37 ++++++++++
.../disable-static-texturepacker-build.patch | 11 +++
srcpkgs/kodi-rpi/patches/fix-fileemu.patch | 74 +++++++++++++++++++
srcpkgs/kodi-rpi/patches/fix-musl.patch | 11 +++
.../kodi-rpi/patches/fortify-source-fix.patch | 11 +++
srcpkgs/kodi-rpi/patches/ppc64.patch | 15 ++++
.../kodi-rpi/patches/remove-filewrap.patch | 40 ++++++++++
10 files changed, 229 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/kodi-rpi/patches
create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
diff --git a/srcpkgs/kodi-rpi/patches b/srcpkgs/kodi-rpi/patches
deleted file mode 120000
index 95c1fe40f190..000000000000
--- a/srcpkgs/kodi-rpi/patches
+++ /dev/null
@@ -1 +0,0 @@
-../kodi/patches
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- 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-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+
+ class CURL;
+
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- 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-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ cd $(PLATFORM); cp -a $(SOURCE)/* .
+ cd $(PLATFORM); ./autogen.sh
+- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+
+
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- 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 @@
+ int ret;
+
+ ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ *pos = (fpos_t)tmpPos;
+ #else
+ pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+ 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();
+ #else
+ pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+ 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)
+ #else
+ if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+ if (fd >= 0)
+ {
+ fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ tmpPos= *pos;
+ #else
+ tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !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-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // 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.
+-#if _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-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- 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)
++ elseif(CPU MATCHES ppc64le)
++ set(ARCH ppc64le-linux)
++ set(NEON False)
++ elseif(CPU MATCHES ppc64)
++ set(ARCH ppc64-linux)
++ set(NEON False)
+ else()
+ message(SEND_ERROR "Unknown CPU: ${CPU}")
+ endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- 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;
+ };
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (13 preceding siblings ...)
2021-03-14 22:36 ` marmeladema
@ 2021-03-15 1:40 ` ericonr
2021-03-15 22:02 ` [PR PATCH] [Updated] " marmeladema
2021-03-16 0:07 ` [PR PATCH] [Merged]: " ericonr
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-03-15 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29407#issuecomment-799033442
Comment:
Please squash the two kodi commits together, and have one `kodi-addon` commit for each package.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (14 preceding siblings ...)
2021-03-15 1:40 ` ericonr
@ 2021-03-15 22:02 ` marmeladema
2021-03-16 0:07 ` [PR PATCH] [Merged]: " ericonr
16 siblings, 0 replies; 18+ messages in thread
From: marmeladema @ 2021-03-15 22:02 UTC (permalink / raw)
To: ml
[-- 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: 30114 bytes --]
From 1ffb2b49192ed2fa993b3e2360191d28d167b659 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 21:55:33 +0000
Subject: [PATCH 01/12] kodi: update to 19.0-Matrix and detach kodi-rpi patch
files
Kodi 19 does not support rpbi as a specific core platform anymore
and thus cannot be updated to use kodi 19 and its patches.
It might be possible that kodi itelf work out of the box now using
the gdm core platform using:
```
$ kodi --windowing=gbm
```
---
srcpkgs/kodi-rpi/patches | 1 -
.../patches/add-missing-cassert.patch | 0
.../patches/add-missing-includes.patch | 10 +++
.../patches/crossguid-0.2.patch | 0
.../disable-static-texturepacker-build.patch | 11 +++
srcpkgs/kodi-rpi/patches/fix-fileemu.patch | 74 +++++++++++++++++++
srcpkgs/kodi-rpi/patches/fix-musl.patch | 11 +++
.../kodi-rpi/patches/fortify-source-fix.patch | 11 +++
srcpkgs/kodi-rpi/patches/ppc64.patch | 15 ++++
.../patches/remove-filewrap.patch | 0
srcpkgs/kodi/patches/fix-musl.patch | 4 +-
srcpkgs/kodi/template | 49 +++++++++---
12 files changed, 171 insertions(+), 15 deletions(-)
delete mode 120000 srcpkgs/kodi-rpi/patches
rename srcpkgs/{kodi => kodi-rpi}/patches/add-missing-cassert.patch (100%)
create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
rename srcpkgs/{kodi => kodi-rpi}/patches/crossguid-0.2.patch (100%)
create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
rename srcpkgs/{kodi => kodi-rpi}/patches/remove-filewrap.patch (100%)
diff --git a/srcpkgs/kodi-rpi/patches b/srcpkgs/kodi-rpi/patches
deleted file mode 120000
index 95c1fe40f190..000000000000
--- a/srcpkgs/kodi-rpi/patches
+++ /dev/null
@@ -1 +0,0 @@
-../kodi/patches
\ No newline at end of file
diff --git a/srcpkgs/kodi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
similarity index 100%
rename from srcpkgs/kodi/patches/add-missing-cassert.patch
rename to srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+
+ class CURL;
+
diff --git a/srcpkgs/kodi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
similarity index 100%
rename from srcpkgs/kodi/patches/crossguid-0.2.patch
rename to srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ cd $(PLATFORM); cp -a $(SOURCE)/* .
+ cd $(PLATFORM); ./autogen.sh
+- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+
+
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- 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 @@
+ int ret;
+
+ ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ *pos = (fpos_t)tmpPos;
+ #else
+ pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+ 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();
+ #else
+ pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+ 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)
+ #else
+ if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+ if (fd >= 0)
+ {
+ fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ tmpPos= *pos;
+ #else
+ tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !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-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // 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.
+-#if _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-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- 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)
++ elseif(CPU MATCHES ppc64le)
++ set(ARCH ppc64le-linux)
++ set(NEON False)
++ elseif(CPU MATCHES ppc64)
++ set(ARCH ppc64-linux)
++ set(NEON False)
+ else()
+ message(SEND_ERROR "Unknown CPU: ${CPU}")
+ endif()
diff --git a/srcpkgs/kodi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
similarity index 100%
rename from srcpkgs/kodi/patches/remove-filewrap.patch
rename to srcpkgs/kodi-rpi/patches/remove-filewrap.patch
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index 98fa08aaffba..c2eb622c98a4 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/template b/srcpkgs/kodi/template
index bff11d8ae5ad..9905a0293d4c 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 88528fbd766ddd6a3e379dd0e665bc1afc6737cf Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 10 Mar 2021 13:52:44 +0000
Subject: [PATCH 02/12] libwaylandpp: fix shlibs
---
common/shlibs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..462846b97390 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 af593edf4dc8b37eaf8402093fe468353ea0d4d6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 13 Mar 2021 10:39:07 +0000
Subject: [PATCH 03/12] kodi: prevent some failing tests to run in CI
---
srcpkgs/kodi/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4c..5eee2d18f2e9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
case "$XBPS_TARGET_MACHINE" in
aarch64*)
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ 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/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+ _gtest_filter+=":TestDateTime.SetFromDBTime"
+ _gtest_filter+=":TestDateTime.SetDateTime"
+ _gtest_filter+=":TestDateTime.Reset"
+ ;;
esac
if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
fi
}
+do_check() {
+ ./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
kodi-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From 2e8094be15fde9df5d26d6f8736fd2d7427107a4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 21:58:22 +0000
Subject: [PATCH 04/12] kodi-addon-game-libretro: update to version 2.2.0
---
srcpkgs/kodi-addon-game-libretro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282dfe..6e44c5a1de9c 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-game-libretro'
pkgname=kodi-addon-game-libretro
-version=1.1.1
+version=2.2.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-game/game.libretro"
distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
+checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
nocross="depends on kodi-platform"
From 2932c6609c554c3628f98ed2a31199e11983db0e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 21:58:49 +0000
Subject: [PATCH 05/12] kodi-addon-inputstream-adaptive: update to version
2.6.7
---
srcpkgs/kodi-addon-inputstream-adaptive/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc82..ca978f1f3d81 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-adaptive'
pkgname=kodi-addon-inputstream-adaptive
-version=2.4.4
+version=2.6.7
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/peak3d/inputstream.adaptive"
distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
+checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
nocross="depends on kodi-platform"
From babbad60b943dc38a32f85bbfaf0bf0239d3d848 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 21:59:18 +0000
Subject: [PATCH 06/12] kodi-addon-inputstream-rtmp: update to version 3.4.0
---
srcpkgs/kodi-addon-inputstream-rtmp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index bee02ae906ef..3e7e4968f8c3 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-inputstream-rtmp'
pkgname=kodi-addon-inputstream-rtmp
-version=2.0.9
+version=3.4.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,5 +13,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/inputstream.rtmp"
distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
+checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
nocross="depends on kodi-platform"
From b153c39a3a566eb866bbfbf8e161bad3ad3ba656 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 21:59:42 +0000
Subject: [PATCH 07/12] kodi-addon-peripheral-joystick: update to version 1.7.1
---
srcpkgs/kodi-addon-peripheral-joystick/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f284096046..de72349fcf20 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
-version=1.4.9
-_kodi_release="Leia"
+version=1.7.1
revision=1
+_kodi_release="Matrix"
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
-checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
+checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
nocross="depends on kodi-platform"
From 6ffa4ba0bb451e57c91c9ada68960629a4951b26 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 22:00:13 +0000
Subject: [PATCH 08/12] kodi-addon-pvr-hts: update to version 8.2.3
---
srcpkgs/kodi-addon-pvr-hts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702bb..eeb0d6335275 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-hts'
pkgname=kodi-addon-pvr-hts
-version=4.4.21
+version=8.2.3
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.hts"
distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
+checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From c9721922ea97fcc79985de7d8fa5c6b9897bdbe9 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 22:00:37 +0000
Subject: [PATCH 09/12] kodi-addon-pvr-iptvsimple: update to version 7.5.0
---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba346..7628dd6bd31f 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,17 +1,17 @@
# Template file for 'kodi-addon-pvr-iptvsimple'
pkgname=kodi-addon-pvr-iptvsimple
-version=3.9.8
+version=7.5.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
+makedepends="kodi-devel kodi-platform-devel p8-platform-devel pugixml-devel
zlib-devel"
short_desc="IPTV Simple client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
+checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
nocross="depends on kodi-platform"
From 26ac9f38788c84e8aec451109898bf58a450277d Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 22:01:10 +0000
Subject: [PATCH 10/12] kodi-addon-pvr-zattoo: update to version 19.7.8.1
---
srcpkgs/kodi-addon-pvr-zattoo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index c313e855d20f..1ff40658bcf0 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-pvr-zattoo'
pkgname=kodi-addon-pvr-zattoo
-version=18.1.23
+version=19.7.8.1
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -14,6 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://github.com/rbuehlma/pvr.zattoo"
distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
+checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
nocross="depends on kodi-platform"
make_check=no # No target to "make test"
From 12eefcd16aaafd534bc536e06ebfdd9a9ab77276 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 22:01:44 +0000
Subject: [PATCH 11/12] kodi-addon-vfs-rar: update to version 4.4.0
---
srcpkgs/kodi-addon-vfs-rar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a9..9ae75a72c860 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,15 +1,15 @@
# Template file for 'kodi-addon-vfs-rar'
pkgname=kodi-addon-vfs-rar
-version=2.3.2
+version=4.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
-makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel pkg-config"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.rar"
distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
-checksum=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
+checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
nocross="depends on kodi-platform"
From e754f05cf02dde5428065c85f1f02dc8b13272b9 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 15 Mar 2021 22:02:10 +0000
Subject: [PATCH 12/12] kodi-addon-vfs-sftp: update to version 2.0.0
---
srcpkgs/kodi-addon-vfs-sftp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 5ba4d6a33c3c..40d91f566d62 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,8 +1,8 @@
# Template file for 'kodi-addon-vfs-sftp'
pkgname=kodi-addon-vfs-sftp
-version=1.0.5
+version=2.0.0
revision=1
-_kodi_release=Leia
+_kodi_release=Matrix
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/vfs.sftp"
distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
-checksum=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
+checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
nocross="depends on kodi-platform"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Merged]: kodi: update to version 19.0-Matrix
2021-03-11 22:06 [PR PATCH] kodi: update to version 19.0-Matrix marmeladema
` (15 preceding siblings ...)
2021-03-15 22:02 ` [PR PATCH] [Updated] " marmeladema
@ 2021-03-16 0:07 ` ericonr
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-03-16 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
There's a merged pull request on the void-packages repository
kodi: update to version 19.0-Matrix
https://github.com/void-linux/void-packages/pull/29407
Description:
<!-- 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
^ permalink raw reply [flat|nested] 18+ messages in thread