media-tv/kodi : fix build with >=media-libs/mesa-22.3.0 ( https://bugs.gentoo.org/885419 )

4 files changed, 18 insertions, 2 deletions

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 00000000..e9ff90df
--- /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-r5.ebuild b/media-tv/kodi/kodi-19.4-r6.ebuild
index f9b12fcd..f84e0a1b 100644
--- a/media-tv/kodi/kodi-19.4-r5.ebuild
+++ b/media-tv/kodi/kodi-19.4-r6.ebuild
@@ -209,6 +209,10 @@ 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/metadata/md5-cache/media-tv/kodi-19.4-r5 b/metadata/md5-cache/media-tv/kodi-19.4-r6
index 13b3cd67..21f712b8 100644
--- a/metadata/md5-cache/media-tv/kodi-19.4-r5
+++ b/metadata/md5-cache/media-tv/kodi-19.4-r6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	646b7a2a63596361551a6c1fabf28057	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=860fcde5ad43f4202c14c2f858ce8d08
+_md5_=eea1931ab66bca7693806497344da444
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index deb42158..96a0620a 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -30,7 +30,7 @@ lxqt-base/lxqt-session 1.2.0-r1: LXQt Session Manager
 mail-client/mailspring 1.9.2-r1: A beautiful fast and maintained fork of Nylas Mail
 media-libs/libpipewire 0.3.43-r10: Pipewire client libraries
 media-sound/cantata 2.5.0-r10: Featureful and configurable Qt client for the music player daemon (MPD)
-media-tv/kodi 19.4-r5: A free and open source media-player and entertainment hub
+media-tv/kodi 19.4-r6: A free and open source media-player and entertainment hub
 media-tv/sopcast 3.2.6-r3: SopCast free P2P Internet TV binary
 media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices
 net-libs/libnm-glib 1.18.10-r2: Legacy NetworkManager glib and util libraries