From 35b57c9e879389bcec045bc00d3c1e0761379ad1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 10:29:53 +0200 Subject: [PATCH] package/kodi: fix build error with flatbuffers 23.x Fixes build error with defconfig BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y caused by bumping flatbuffers to version >= 23.x in commit 3d1ee7d624b71009ff61d4fa5ed860c52eb89b47 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...fer-Remove-forward-declararion-of-Fl.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch diff --git a/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch b/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch new file mode 100644 index 0000000000..87df0e4c9a --- /dev/null +++ b/package/kodi/0003-SavestateFlatBuffer-Remove-forward-declararion-of-Fl.patch @@ -0,0 +1,42 @@ +From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20H=C3=A4rer?= +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; + ^ +1 error generated. + +(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68) + +Upstream: https://github.com/xbmc/xbmc/commit/07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c + +Signed-off-by: Bernd Kuhls +--- + xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h +index cb93e6bbc2e12..fa42a9bad7034 100644 +--- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h ++++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h +@@ -14,11 +14,6 @@ + + #include + +-namespace flatbuffers +-{ +-class FlatBufferBuilder; +-} +- + namespace KODI + { + namespace RETRO