gentoo auto-resync : 17:12:2022 - 21:40:16

4 files changed, 25 insertions, 2 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index d0292a0bbcca..415f734791ad 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,5 +1,6 @@
 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.4-fmt-9.patch 2455 BLAKE2B 02ade8fe11dc19850814b01dd77db9f8f58aa2b9fac56d525c0fcd6e1235fdb3bee251835e6ddb78579e0fd1568f9c1284cbae356188d6998b6aed062f3089d1 SHA512 be32a2413b69b3c1bbc053a328c07bb8b42d84a58a22b0d84da6b0d50cf6d3cb29a509ebb808b4f9e1b3f1bc89ee6aa36dd5ee5685597102c3855aa27dfa724e
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
@@ -10,8 +11,8 @@ 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.4-r3.ebuild 10995 BLAKE2B 873045aff53276245b54297404829242ed4cabcf85801d4c34d63c628598f1cee1508a3582e33a416e3ff342914ac95989af3ee940eae09e10f17d37103f86d4 SHA512 a9709e837528749eb47e0a841c3a27c7d7f421fe50efe936904a492dc603c92b3538a9076b643113cf3cb9114a23d3e808f114edb4eb5a94716d017ee2049b6a
-EBUILD kodi-19.4-r4.ebuild 11031 BLAKE2B 8029a161f714224d9d16ff56f8a344133c8cf73a3d2492ae396abd3ff1693632e41aa57e18d0f237e39995513c5be16667bcdb280feb739bf7e9df3ebbaa5b77 SHA512 bfe221b33b8d975d2fd2e0765ead769bd11989f7aa5ebf4ccc808b9880f5fcc249fdb754c29c6ac1124eb78da5412df987220b5273403e2e9f1556f3375b9fbe
+EBUILD kodi-19.4-r3.ebuild 11145 BLAKE2B f0eadd6891b70e18e754eb440769b93434643fabfcc1cc7c52fb0ea526e76cdd561292d5abdd71fff46d9476880fa67304fa3afc5b024dc0e70dcdd0f6b87341 SHA512 4378e32daaacf08abe30256e52e6d04621455d06484e3031e4c66a857b792c4f995951bb2bdb2e5b0cbc176e7f19900589aaaccdba1b72bd545f9ee014634b6a
+EBUILD kodi-19.4-r4.ebuild 11181 BLAKE2B 379f72b4dc88318a0bb662963c1ffe3d078ec57ce77de8ed3cb9d7e8515d504effa82a5d524e623e78ff56a7869d67b5fd12a21e2eb634ab753de056467f8672 SHA512 5e322922cb392c3b29805f4607131b465a960f04fe06482babfc2a598e790d4c7fd25d4af0f93be11b54c29775444959a18a0edbbf529734a7314b91e0a10855
 EBUILD kodi-19.9999.ebuild 10907 BLAKE2B ea5348a8a581c7ad94c9110843e98e18ae52320b7e7342920342fa0e70c4289fa5d26aba80573a8b17a2c3ec21f08ae0b322458b9abcc8c95e09a7559c05e12a SHA512 ec55a6010a8121f0efb672d595d7091373be2b493a83253b61d772a92b50387c24e823e39e4c435c1b1e4413c2dd3dcef34f4289dea77e6c91be0b7be75cad5f
 EBUILD kodi-9999.ebuild 10968 BLAKE2B 6f49e40d9545d853c815868637ff1c89a0cd219516e5697178363e0ab65ec16602af82427141c0812bd3e304339b93caba28a6c04a78b345f92951424fab976c SHA512 c4474c5ff1cf52e722eca24fe5f4608c646a0eb0dcf23a785ed8e053ef78284002da5e2b69427cd8a61c903abb856b6efdbe7df99f6d1219b13f8f1a8e671a1e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch
new file mode 100644
index 000000000000..e9ff90dfe55d
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch
@@ -0,0 +1,12 @@
+--- xbmc/xbmc/windowing/X11/GLContextEGL.h
++++ xbmc/xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,7 @@
+ #include "threads/CriticalSection.h"
+ 
+ #include <EGL/eglext.h>
+-#include <EGL/eglextchromium.h>
++#include <EGL/eglext_angle.h>
+ #include <X11/Xutil.h>
+ 
+ class CGLContextEGL : public CGLContext
+
diff --git a/media-tv/kodi/kodi-19.4-r3.ebuild b/media-tv/kodi/kodi-19.4-r3.ebuild
index caecc50cdfca..cc58afabb027 100644
--- a/media-tv/kodi/kodi-19.4-r3.ebuild
+++ b/media-tv/kodi/kodi-19.4-r3.ebuild
@@ -208,6 +208,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	# https://bugs.gentoo.org/885419
+	if has_version ">=media-libs/mesa-22.3.0"; then
+		PATCHES+=( "${FILESDIR}/${P}-fix-mesa-22.3.0-build.patch" )
+	fi
+
 	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580
diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
index 3fcd9b13f6b0..d295604a6976 100644
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ b/media-tv/kodi/kodi-19.4-r4.ebuild
@@ -209,6 +209,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	# https://bugs.gentoo.org/885419
+	if has_version ">=media-libs/mesa-22.3.0"; then
+		PATCHES+=( "${FILESDIR}/${P}-fix-mesa-22.3.0-build.patch" )
+	fi
+
 	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580