commit: f4c1c77134f178d68b23010ff39d459c97e99daf Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Apr 13 20:54:43 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Apr 14 01:22:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c1c771
media-tv/kodi: no ffmpeg-compat detection for -system-ffmpeg -system-ffmpeg doesn't require ffmpeg-compat, so the dependency may not be present. Closes: https://bugs.gentoo.org/951554 Fixes: 4dd83d2fb0d7d68405cdfdb9cfd11fe7809c8af2 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/41581 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-tv/kodi/kodi-21.2-r2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/media-tv/kodi/kodi-21.2-r2.ebuild b/media-tv/kodi/kodi-21.2-r2.ebuild index f48e181c5ed4..f4a15f3264bf 100644 --- a/media-tv/kodi/kodi-21.2-r2.ebuild +++ b/media-tv/kodi/kodi-21.2-r2.ebuild @@ -439,10 +439,12 @@ 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 use system-ffmpeg; then + # 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)" ) + fi if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
