kodi-gbm: pull a patch for fmt 9 and other minor changes

This commit is contained in:
Tim Biermann 2022-07-24 19:34:40 +02:00
parent 3226997832
commit d9d9f40c98
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 132 additions and 10 deletions

@ -170,13 +170,42 @@ drwxr-xr-x root/root usr/lib/python3.10/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.pyc
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.pyc
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/bt.py
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/bt/hid.py
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/defs.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.pyc
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/keymaps.py
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/sixaxis.py
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/kodi/ps3/sixpair.py

@ -1,11 +1,11 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF301pOcYTkSmbYke8T4o+qME4LA7lCnWOVq+ttFi/Ig+DV7WwEybhK65EoGrlLutaR7klt6w0qKwwwrn238jN4AY=
SHA256 (Pkgfile) = 002673a0a7fc20101b968443a6b602efd03f03ca9d16c80642166c4d9b320ee8
SHA256 (.footprint) = f410b6f66e22902747903127a9dba3c6e04852f22fffdfad00442792a5f02e5a
RWSagIOpLGJF31T73fk3AbA6Wmk9mOX2JzYaFWEQ+MG83ecGIRgvCvtkqD9uh2fwLY3YcgjliB3yAMbCNYva2oZUTtsjuWCyEAk=
SHA256 (Pkgfile) = 6c7d2a0d068b372ce45c81ed352580f76dbcdb16b0d431d850d5b76a23e91a96
SHA256 (.footprint) = 53c9f3ee6a8e4a56daea6ab5b754e5867265ea094d77291e86bde0beb8cf64d0
SHA256 (xbmc-19.4-Matrix.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
SHA256 (4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4
SHA256 (fmt-5.1.0.tar.gz) = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44
SHA256 (crossguid-8f399e8bd4.tar.gz) = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
SHA256 (kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
SHA256 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
SHA256 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
SHA256 (kodi-19.4-fmt-9.patch) = 236d40c7c201212a3f76d0b6362391e6b459bacc9ec5d35b9e34fa4b2fee7c25

@ -6,26 +6,27 @@
name=kodi-gbm
version=19.4
release=2
release=3
# version variables {{{
_codename=Matrix
_ffmpeg_version="4.3.1-$_codename-Beta1"
_ffmpeg_version="4.3-kodi-dav1d-1.0"
_crossguid_version="8f399e8bd4"
_fmt_version="5.1.0"
_fmt_version="6.1.2"
_libdvdcss_version="1.4.2-Leia-Beta-5"
_libdvdnav_version="6.0.0-Leia-Alpha-3"
_libdvdread_version="6.0.0-Leia-Alpha-3"
# }}}
# source {{{
source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$_codename.tar.gz
https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/4.3-kodi-dav1d-1.0.tar.gz
https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/$_ffmpeg_version.tar.gz
#https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz
http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz
#http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz
http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz
https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-gbm/}-libdvdcss-$_libdvdcss_version.tar.gz
https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-gbm/}-libdvdnav-$_libdvdnav_version.tar.gz
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm}-libdvdread-$_libdvdread_version.tar.gz)
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm}-libdvdread-$_libdvdread_version.tar.gz
kodi-19.4-fmt-9.patch)
# }}}
# unpack_source() {{{
unpack_source() {
@ -66,6 +67,20 @@ build() {
prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
# }}}
patch -Np1 -d xbmc-$version-$_codename -i $SRC/kodi-19.4-fmt-9.patch
# grabbed off from gentoo
#for i in xbmc-$version-$_codename/tools/depends/native/TexturePacker/src xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src; do
for i in xbmc-$version-$_codename/tools/depends/native/{TexturePacker,JsonSchemaBuilder}/src; do
pushd $i;
autoreconf -vfi;
popd
done
sed -e 's/autoreconf -vif/echo "autoreconf already done"/' -i \
xbmc-$version-$_codename/tools/depends/native/TexturePacker/src/autogen.sh \
xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \
@ -101,6 +116,10 @@ build() {
cmake --build build
DESTDIR=$PKG cmake --build build --target install
export PYTHONHASHSEED=0
/usr/bin/python3 -m compileall -d / $PKG/usr/lib
/usr/bin/python3 -O -m compileall -d / $PKG/usr/lib
rm -r $PKG/usr/{lib/firewalld,share/doc}
}
# vim: foldmethod=marker foldlevelstart=1

@ -0,0 +1,74 @@
From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 6 Jul 2022 22:48:35 +1000
Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
is disallowed
---
xbmc/utils/GLUtils.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
index 1ef804709ff56..c36dcf6a20fec 100644
--- a/xbmc/utils/GLUtils.cpp
+++ b/xbmc/utils/GLUtils.cpp
@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
void LogGraphicsInfo()
{
#if defined(HAS_GL) || defined(HAS_GLES)
- const GLubyte *s;
+ const char* s;
- s = glGetString(GL_VENDOR);
+ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
if (s)
CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
else
CLog::Log(LOGINFO, "GL_VENDOR = NULL");
- s = glGetString(GL_RENDERER);
+ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
if (s)
CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
else
CLog::Log(LOGINFO, "GL_RENDERER = NULL");
- s = glGetString(GL_VERSION);
+ s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
if (s)
CLog::Log(LOGINFO, "GL_VERSION = %s", s);
else
CLog::Log(LOGINFO, "GL_VERSION = NULL");
- s = glGetString(GL_SHADING_LANGUAGE_VERSION);
+ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
if (s)
CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
else
From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 11 Jul 2022 09:39:02 +0000
Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
pointers is disallowed
---
xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index 8a18288fd8af0..033c0f77bf454 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
if(status == Success && items_read)
{
- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
+ const char* s;
+
+ s = reinterpret_cast<const char*>(data);
+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
}
else
CLog::Log(LOGDEBUG,"Window Manager Name: ");