kodi-wayland: 19.5 -> 20.0
This commit is contained in:
parent
23565939ac
commit
204c94c8b1
GPG Key ID:
42F8B4E30B673606
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,10 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF38aHc4ecSGXKgz4heqPKBTStT8lDhVSz5KUtznqM54zlI+BvppUPvzhvgPzTJzGLB34CNBLg3hiR172BmGFdqAM=
|
||||
SHA256 (Pkgfile) = 618e46ee431a41b4542eb1928cd45930923247b13e8e0433578d9d5cf467361e
|
||||
SHA256 (.footprint) = aa9791bab03827426ca2562af8a1f44e953be24c513094831b2cf5505ffa1c14
|
||||
SHA256 (xbmc-19.5-Matrix.tar.gz) = 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19
|
||||
SHA256 (kodi-ffmpeg-4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4
|
||||
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
|
||||
RWSagIOpLGJF3y6SWG1s+nvp+BAEx4nmyyiqYVunKOKoorsIOICtJLWlIYQpmF09C3cEQGcfqtWxg7zAIItw22hqHZBi0oZq9Qw=
|
||||
SHA256 (Pkgfile) = 73442c890479f4e76d7b8582403676cc93159a3a761787ce1f6364c9a099223c
|
||||
SHA256 (.footprint) = b7344ab259de5a27ce4cae98f25bc6ff4a07609b949d8813bc71eefc64572440
|
||||
SHA256 (xbmc-20.0-Nexus.tar.gz) = 4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79
|
||||
SHA256 (ffmpeg-4.4.1-Nexus-Alpha1.tar.gz) = abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed
|
||||
SHA256 (kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
|
||||
SHA256 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
|
||||
SHA256 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
|
||||
SHA256 (22658.patch) = b970818a13508aacee149bfa7a791b442efd8522a6f6eba6d923c20f2927d1c5
|
||||
|
|
|
|||
26
kodi-wayland/22658.patch
Normal file
26
kodi-wayland/22658.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From 5ce034ff98754d1b0e8e9eda2afcab595b9f4f82 Mon Sep 17 00:00:00 2001
|
||||
From: CrystalP <crystalp@kodi.tv>
|
||||
Date: Mon, 30 Jan 2023 22:53:18 -0500
|
||||
Subject: [PATCH] render the .notdef characters to fix drawing of text with
|
||||
unicode chars missing in font
|
||||
|
||||
---
|
||||
xbmc/guilib/GUIFontTTF.cpp | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
|
||||
index 33e32e8954a80..6b38fb0cbbc0c 100644
|
||||
--- a/xbmc/guilib/GUIFontTTF.cpp
|
||||
+++ b/xbmc/guilib/GUIFontTTF.cpp
|
||||
@@ -492,11 +492,6 @@ void CGUIFontTTF::DrawTextInternal(CGraphicContext& context,
|
||||
|
||||
// grab the next character
|
||||
Character* ch = &characters.front();
|
||||
- if (ch->m_glyphAndStyle == 0)
|
||||
- {
|
||||
- characters.pop();
|
||||
- continue;
|
||||
- }
|
||||
|
||||
if ((text[glyph.m_glyphInfo.cluster] & 0xffff) == static_cast<character_t>('\t'))
|
||||
{
|
||||
|
|
@ -1,31 +1,27 @@
|
|||
# Description: Open source home theater software, wayland native version
|
||||
# URL: https://kodi.tv/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: dbus flatbuffers fstrcmp glu libass libcdio libdvdread libinput libxkbcommon openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
|
||||
# Depends on: crossguid dbus flatbuffers fstrcmp glu libass libcdio libdvdread libinput libxkbcommon openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
|
||||
# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
|
||||
|
||||
name=kodi-wayland
|
||||
version=19.5
|
||||
version=20.0
|
||||
release=1
|
||||
|
||||
# version variables {{{
|
||||
_codename=Matrix
|
||||
_ffmpeg_version="4.3-kodi-dav1d-1.0"
|
||||
_crossguid_version="8f399e8bd4"
|
||||
_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"
|
||||
_codename=Nexus
|
||||
_ffmpeg_version="4.4.1-${_codename}-Alpha1"
|
||||
_libdvdcss_version="1.4.3-Next-${_codename}-Alpha2-2"
|
||||
_libdvdnav_version="6.1.1-Next-${_codename}-Alpha2-2"
|
||||
_libdvdread_version="6.1.3-Next-${_codename}-Alpha2-2"
|
||||
# }}}
|
||||
# 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/$_ffmpeg_version.tar.gz
|
||||
https://sources.archlinux.org/other/community/kodi/kodi-ffmpeg-$_ffmpeg_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/FFmpeg/archive/$_ffmpeg_version/ffmpeg-$_ffmpeg_version.tar.gz
|
||||
https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz
|
||||
https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz
|
||||
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland}-libdvdread-$_libdvdread_version.tar.gz)
|
||||
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz
|
||||
22658.patch)
|
||||
# }}}
|
||||
# unpack_source() {{{
|
||||
unpack_source() {
|
||||
|
|
@ -53,6 +49,7 @@ build() {
|
|||
prt-get isinst alsa-lib && KODI_EXTRA+=' -D ENABLE_ALSA=ON' || KODI_EXTRA+=' -D ENABLE_ALSA=OFF'
|
||||
prt-get isinst avahi && KODI_EXTRA+=' -D ENABLE_AVAHI=ON' || KODI_EXTRA+=' -D ENABLE_AVAHI=OFF'
|
||||
prt-get isinst bluez sbc && KODI_EXTRA+=' -D ENABLE_BLUETOOTH=ON' || KODI_EXTRA+=' -D ENABLE_BLUETOOTH=OFF'
|
||||
prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
prt-get isinst dav1d && KODI_EXTRA+=' -D ENABLE_INTERNAL_DAV1D=OFF' || KODI_EXTRA+=' -D ENABLE_INTERNAL_DAV1D=ON'
|
||||
prt-get isinst libmicrohttpd && KODI_EXTRA+=' -D ENABLE_MICROHTTPD=ON' || KODI_EXTRA+=' -D ENABLE_MICROHTTPD=OFF'
|
||||
prt-get isinst libnfs && KODI_EXTRA+=' -D ENABLE_NFS=ON' || KODI_EXTRA+=' -D ENABLE_NFS=OFF'
|
||||
|
|
@ -62,8 +59,7 @@ build() {
|
|||
prt-get isinst mysql && KODI_EXTRA+=' -D ENABLE_MYSQLCLIENT=ON'
|
||||
prt-get isinst mariadb && KODI_EXTRA+=' -D ENABLE_MARIADBCLIENT=ON'
|
||||
prt-get isinst pulseaudio && KODI_EXTRA+=' -D ENABLE_PULSEAUDIO=ON' || KODI_EXTRA+=' -D ENABLE_PULSEAUDIO=OFF'
|
||||
|
||||
prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
prt-get isinst pipewire && KODI_EXTRA+=' -D ENABLE_PIPEWIRE=ON' || KODI_EXTRA+=' -D ENABLE_PIPEWIRE=OFF'
|
||||
# }}}
|
||||
|
||||
# grabbed off from gentoo
|
||||
|
|
@ -76,6 +72,8 @@ build() {
|
|||
xbmc-$version-$_codename/tools/depends/native/TexturePacker/src/autogen.sh \
|
||||
xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
|
||||
|
||||
patch -Np1 -d xbmc-$version-$_codename -i $SRC/22658.patch
|
||||
|
||||
cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-D CMAKE_INSTALL_LIBDIR=lib \
|
||||
|
|
@ -84,6 +82,7 @@ build() {
|
|||
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
|
||||
-D CORE_PLATFORM_NAME=wayland \
|
||||
-D APP_RENDER_SYSTEM=gl \
|
||||
-D ENABLE_EGL=ON \
|
||||
-D ENABLE_DBUS=ON \
|
||||
-D ENABLE_DVDCSS=ON \
|
||||
-D ENABLE_EVENTCLIENTS=ON \
|
||||
|
|
@ -92,14 +91,13 @@ build() {
|
|||
-D fmt_DIR=/usr/lib/cmake/fmt \
|
||||
-D spdlog_DIR=/usr/lib/cmake/spdlog \
|
||||
-D ENABLE_ISO9660PP=OFF \
|
||||
-D ENABLE_LDGOLD=OFF \
|
||||
-D ENABLE_GOLD=OFF \
|
||||
-D ENABLE_OPTICAL=OFF \
|
||||
-D ENABLE_TESTING=OFF \
|
||||
-D VERBOSE=OFF \
|
||||
-D ENABLE_INTERNAL_FFMPEG=ON \
|
||||
-D FFMPEG_URL="$SRC/kodi-ffmpeg-$_ffmpeg_version.tar.gz" \
|
||||
-D ENABLE_INTERNAL_CROSSGUID=ON \
|
||||
-D CROSSGUID_URL="$SRC/crossguid-$_crossguid_version.tar.gz" \
|
||||
-D FFMPEG_URL="$SRC/ffmpeg-$_ffmpeg_version.tar.gz" \
|
||||
-D ENABLE_INTERNAL_CROSSGUID=OFF \
|
||||
-D LIBDVDCSS_URL="$SRC/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz" \
|
||||
-D LIBDVDNAV_URL="$SRC/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz" \
|
||||
-D LIBDVDREAD_URL="$SRC/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz" \
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
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: ");
|
||||
Loading…
Reference in New Issue
Block a user