* [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x
@ 2023-06-24 8:29 Bernd Kuhls
2023-06-24 13:34 ` Yann E. MORIN
2023-07-06 11:45 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2023-06-24 8:29 UTC (permalink / raw)
To: buildroot
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 <bernd@kuhls.net>
---
...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?= <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)
+
+Upstream: https://github.com/xbmc/xbmc/commit/07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ 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 <flatbuffers/flatbuffers.h>
+
+-namespace flatbuffers
+-{
+-class FlatBufferBuilder;
+-}
+-
+ namespace KODI
+ {
+ namespace RETRO
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x
2023-06-24 8:29 [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x Bernd Kuhls
@ 2023-06-24 13:34 ` Yann E. MORIN
2023-07-06 11:45 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2023-06-24 13:34 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd, All,
On 2023-06-24 10:29 +0200, Bernd Kuhls spake thusly:
> 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 <bernd@kuhls.net>
Applied to master, thanks.
Regards,
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?= <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)
> +
> +Upstream: https://github.com/xbmc/xbmc/commit/07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c
> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> +---
> + 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 <flatbuffers/flatbuffers.h>
> +
> +-namespace flatbuffers
> +-{
> +-class FlatBufferBuilder;
> +-}
> +-
> + namespace KODI
> + {
> + namespace RETRO
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x
2023-06-24 8:29 [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x Bernd Kuhls
2023-06-24 13:34 ` Yann E. MORIN
@ 2023-07-06 11:45 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-07-06 11:45 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> 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 <bernd@kuhls.net>
Committed to 2023.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-06 11:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-24 8:29 [Buildroot] [PATCH 1/1] package/kodi: fix build error with flatbuffers 23.x Bernd Kuhls
2023-06-24 13:34 ` Yann E. MORIN
2023-07-06 11:45 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox