From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22ACC1584F2 for ; Tue, 18 Mar 2025 01:57:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0B8C23431E1 for ; Tue, 18 Mar 2025 01:57:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 03CF411037F; Tue, 18 Mar 2025 01:57:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E4E1711037F for ; Tue, 18 Mar 2025 01:57:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EC053431E1 for ; Tue, 18 Mar 2025 01:57:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E684D1D72 for ; Tue, 18 Mar 2025 01:57:23 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1742263007.7c9af09ff7e09ef103b5f15e902396158569409b.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/kodi-21.2-r2.ebuild X-VCS-Directories: media-tv/kodi/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 7c9af09ff7e09ef103b5f15e902396158569409b X-VCS-Branch: master Date: Tue, 18 Mar 2025 01:57:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41316c8c-09d7-4cdc-9dc5-03277d7c8a5b X-Archives-Hash: 185d6b131cacc2e1dcf334c0c1acaf03 commit: 7c9af09ff7e09ef103b5f15e902396158569409b Author: Ionen Wolkens gentoo org> AuthorDate: Tue Mar 18 01:19:41 2025 +0000 Commit: Ionen Wolkens gentoo 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 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