diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-31 09:23:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-31 09:23:01 +0100 |
commit | 441510fa20665b7920b149994e72b3a1cd62a813 (patch) | |
tree | 4bc2e347ca49e5da4915fc3c117c0db31b0ac6cd /media-tv/kodi/files | |
parent | 3810dd6a469ba3e0014a390d92f1fc220dd20c3b (diff) |
gentoo auto-resync : 31:05:2023 - 09:23:01
Diffstat (limited to 'media-tv/kodi/files')
-rw-r--r-- | media-tv/kodi/files/kodi-19.5-flatbuffers.patch | 35 |
1 files changed, 35 insertions, 0 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 + |