From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/files/, media-tv/kodi/
Date: Wed, 31 May 2023 03:07:52 +0000 (UTC) [thread overview]
Message-ID: <1685502364.57ce221edfeafd9b91be2ce4aacbedda83f62215.sam@gentoo> (raw)
commit: 57ce221edfeafd9b91be2ce4aacbedda83f62215
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 03:06:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 03:06:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ce221e
media-tv/kodi: fix build w/ new flatbuffers
Closes: https://bugs.gentoo.org/907420
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-tv/kodi/files/kodi-19.5-flatbuffers.patch | 35 +++++++++++++++++++++++++
media-tv/kodi/kodi-19.5.ebuild | 13 ++++-----
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch
new file mode 100644
index 000000000000..3e8f00c1449f
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch
@@ -0,0 +1,35 @@
+https://github.com/xbmc/xbmc/pull/23334
+
+From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
+Date: Sun, 28 May 2023 00:49:40 +0200
+Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of
+ FlatBufferBuilder
+
+This caused a compiler error with recent faltbuffers because the type changed:
+
+In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12:
+xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name
+class FlatBufferBuilder;
+ ^
+/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here
+using FlatBufferBuilder = FlatBufferBuilderImpl<false>;
+ ^
+1 error generated.
+
+(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68)
+--- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h
++++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h
+@@ -14,11 +14,6 @@
+
+ #include <flatbuffers/flatbuffers.h>
+
+-namespace flatbuffers
+-{
+-class FlatBufferBuilder;
+-}
+-
+ namespace KODI
+ {
+ namespace RETRO
+
diff --git a/media-tv/kodi/kodi-19.5.ebuild b/media-tv/kodi/kodi-19.5.ebuild
index 2a49d55230af..6dffb81372ec 100644
--- a/media-tv/kodi/kodi-19.5.ebuild
+++ b/media-tv/kodi/kodi-19.5.ebuild
@@ -33,12 +33,6 @@ fi
inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-PATCHES=(
- "${FILESDIR}/${PN}-19.4-atomic.patch"
- "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch"
- "${FILESDIR}/${PN}-19.5-gcc-13.patch"
-)
-
DESCRIPTION="A free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -195,6 +189,13 @@ In some cases Kodi needs to access multicast addresses.
Please consider enabling IP_MULTICAST under Networking options.
"
+PATCHES=(
+ "${FILESDIR}/${PN}-19.4-atomic.patch"
+ "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch"
+ "${FILESDIR}/${PN}-19.5-gcc-13.patch"
+ "${FILESDIR}/${PN}-19.5-flatbuffers.patch"
+)
+
pkg_setup() {
check_extra_config
python-single-r1_pkg_setup
next reply other threads:[~2023-05-31 3:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 3:07 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-14 1:23 [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/files/, media-tv/kodi/ Ionen Wolkens
2024-09-14 20:12 Andreas Sturmlechner
2024-08-25 16:10 Sam James
2024-06-02 7:10 Sam James
2024-05-23 18:01 Matt Turner
2024-01-21 4:41 Sam James
2023-01-30 3:27 Sam James
2022-12-17 19:38 Craig Andrews
2022-08-26 14:38 Jakov Smolić
2020-08-04 20:43 Craig Andrews
2020-06-23 18:44 Craig Andrews
2019-12-06 17:07 Craig Andrews
2019-09-05 17:30 Craig Andrews
2019-09-02 20:42 Craig Andrews
2019-02-18 3:01 Craig Andrews
2018-11-28 16:33 Craig Andrews
2018-06-25 17:37 Craig Andrews
2017-10-23 13:36 Craig Andrews
2017-01-20 16:52 Jory Pratt
2017-01-17 19:38 David Seifert
2017-01-17 18:57 David Seifert
2016-02-24 10:00 Alexis Ballier
2015-08-26 5:27 Mike Frysinger
2015-08-26 5:23 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1685502364.57ce221edfeafd9b91be2ce4aacbedda83f62215.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox