gentoo auto-resync : 31:05:2023 - 09:23:01

3 files changed, 44 insertions, 7 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 6fd944f6a01e..be23a58e48b8 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,7 @@
 AUX kodi-19.4-atomic.patch 3225 BLAKE2B 83559b2886625c3d8b3a4958733c62508e3ca2d538141f061c5d8f8bc681710540c1ce5cffe3184e293d9f8d5e99c1c83cf29d8d4cada9920f3b2f0f756b6c44 SHA512 8d011c9d0caa037f44557a7fd6f745735207fd510b76f53064ee2dbc03e660dfe475586fa4a08fb5308ed0d5133261aae6853c2c7b63d8da4600903f6b232f9a
 AUX kodi-19.4-dav1d-1.0.0.patch 4781 BLAKE2B 1f51f4f89b481b80c384b0567715b7e512c28d26cdfc4572c2e1cf71cba5047bc010d7747b909704804e647cb100144bed0168f4209c602d96146d34fe72c123 SHA512 b16e8f9eefbd1d758f5d38485a0dd29e34478be8e69092ca2a80e182b7a45d3024c58fe80b0fc375eb503bedbf18035a50e695047095311aad2812bde9113ec5
 AUX kodi-19.4-fix-mesa-22.3.0-build.patch 301 BLAKE2B 7a351aa891015524f8377763dd1b9fbe1162c1431131995a75d9acdafa6c500f80ae01b0d2ac82e2be5ac286430cc15c8c2de6901da56c1d22d82d0566160a60 SHA512 e76e9244b97d6c791a18a35dc891b795b062aa4417ff2467930ccf0d4f0be3ef16791bd7c111213527c1cd87a983008ea055d2bb00334e237fb94d58c8057b05
+AUX kodi-19.5-flatbuffers.patch 1172 BLAKE2B 35434d6d71296bc4377ccb762d1dc1d73d100f446bf8b1f5ea96c2b5a80240a63f3f75c3bcb79bcfec038cba611e0c223769b518ba5f537f38770497dd7a461d SHA512 3687a77a35e8588873d1291ad2b9cfc7ff659fcf88ffad389e2016659800ad96ab645bd6843ee46f83856eddccc3f4e6965ba62c4aec18c4a1d6ff438a4cc812
 AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-5.1.2-Nexus-Alpha3.tar.gz 14416966 BLAKE2B fe35ef6a9aa2d60a2b34432ae8063850003d550208f223ea43af8ebcaa73e6993639e8cfe8a38676bac79e6b1816bd791b75b66ef58ff4d740bc9a5e0e7f9b78 SHA512 ce60852b8456d6f4bfc60de0ceadb33034d9b3eea8c0bc84d8b7199984ecbf334a2c4d9b42eade439d0ef30ce22e3b2ca0a49d4df837a18cd3136b4343ed3113
@@ -11,7 +12,7 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
-EBUILD kodi-19.5.ebuild 11221 BLAKE2B 55e98a0d545b789dbcc8161615469a99c657987fc908143b256c935dfd1e773c97822a3559d4c7002e9c2df9dbbf0d8b63732887ed28ce85a708ee23a882da3d SHA512 6759d895812d798d28b7b161b5a35be8a0d2ffb49e553beb952071546a47276770ee1fd6b417fd774a64722167c20505eb6d373e4411c1a642c013cbfc3d2db3
+EBUILD kodi-19.5.ebuild 11265 BLAKE2B 53c36e1fb7aa7dea68033ee0372225a550845ab450d5801fa3629043abe6a20185dc56e0e7c1792350239d9ced8680d53dae5e97d2a89525856711d81d248823 SHA512 ea1e8ce758ca58b09347d795aa7cfb068970f18026fa4d2e7dc3c6bf546675615c1e0d2a1673b1bb6054cce0721bec5e73fc2175cb64f66532058b7c6097d040
 EBUILD kodi-19.9999.ebuild 10924 BLAKE2B 27199b995e65913ae261fe412a963903e61f19cc49c085a07cb02bec4d780a11e4fa374193c7036b1ed43e29c817e362b5721aa15cadeb85e5bd96729b4d4679 SHA512 34eabe010a72c4aecdc32d0a7dfbbf32a1d6adf28ff3e9431c37890d95a013fb61c4f10d41544f7c253e96eb5b8d091eed06c07bb9cbb671d39d16bf6ee5b6a5
 EBUILD kodi-9999.ebuild 10974 BLAKE2B c1009e74974514d00fbfe052e6ee0391bc9023ea72def84f3d58725789fd75de676305709ae2521ac33ef4f46071241196e5ffc8903186c61253aedc7c35ac67 SHA512 252e2681fdfc41e7fdb5b72a2ad2cce2909bd80b6c355ae7ef5c9d881c7da69d86506316268da7239b9c3d887be23f7b8871c63c9911199439c20a1980eb7774
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
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