[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     7c9af09ff7e09ef103b5f15e902396158569409b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 18 01:19:41 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 18 01:56:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9af09f

media-tv/kodi: fix ffmpeg-compat detection

The right include dir was passed either way, but cmake use has
its own logic (not using pkg-config) and fails to find it if
non-compat ffmpeg is not also installed.

Note it is possible there are other cmake-using packages broken
in a similar way given they almost all do their own (different)
custom thing. Ultimately they'd have needed to be tested with
both installed and not installed to ensure they both do not use
the wrong one if present, and detect the right one properly --
only did the former so far (might review a few).

Thanks-to: Chris Mayo
Closes: https://bugs.gentoo.org/951504
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-tv/kodi/kodi-21.2-r2.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-tv/kodi/kodi-21.2-r2.ebuild b/media-tv/kodi/kodi-21.2-r2.ebuild
index 2be1087c92f9..25537ab93fa6 100644
--- a/media-tv/kodi/kodi-21.2-r2.ebuild
+++ b/media-tv/kodi/kodi-21.2-r2.ebuild
@@ -333,10 +333,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: drop compat and allow using >=media-video/ffmpeg-7
-	ffmpeg_compat_setup 6
-	ffmpeg_compat_add_flags
-
 	local core_platform=(
 		$(usev gbm)
 		$(usev wayland)
@@ -442,6 +438,11 @@ src_configure() {
 		mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
 	done
 
+	# TODO: drop compat and allow using >=media-video/ffmpeg-7
+	ffmpeg_compat_setup 6
+	ffmpeg_compat_add_flags
+	mycmakeargs+=( -DFFMPEG_INCLUDE_DIRS="${SYSROOT}$(ffmpeg_compat_get_prefix 6)" )
+
 	if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
 		# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
 		append-cflags -DNDEBUG