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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 915CB15827B for ; Wed, 13 Aug 2025 00:27:11 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 76D34340DAF for ; Wed, 13 Aug 2025 00:27:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 656F5110280; Wed, 13 Aug 2025 00:27:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5E503110280 for ; Wed, 13 Aug 2025 00:27:10 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB49F340DAF for ; Wed, 13 Aug 2025 00:27:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D404333F for ; Wed, 13 Aug 2025 00:27:08 +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: <1755044620.a841d428e43862f0f4a6e2022a49b340892bd659.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-compat/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild X-VCS-Directories: media-video/ffmpeg-compat/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: a841d428e43862f0f4a6e2022a49b340892bd659 X-VCS-Branch: master Date: Wed, 13 Aug 2025 00:27:08 +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: 226cc8f7-63cb-4fe0-971b-3bc7765b185f X-Archives-Hash: 1fa6f33cd6a4b5b92005cea9ad7a684e commit: a841d428e43862f0f4a6e2022a49b340892bd659 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Aug 13 00:23:40 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Aug 13 00:23:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a841d428 media-video/ffmpeg-compat: sync with ffmpeg Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild index 820362189448..d0cf2139f99c 100644 --- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild +++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild @@ -383,7 +383,7 @@ src_prepare() { # respect user preferences sed -i '/cflags -fdiagnostics-color/d' configure || die - # handle *FLAGS here to avoid repeating for each ABI below (bug #923491) + # handle here to avoid repeating for each ABI below (bug #923491) FFMPEG_ENABLE_LTO= if tc-is-lto; then : "$(get-flag -flto)" # get -flto= (e.g. =thin) @@ -392,15 +392,15 @@ src_prepare() { filter-lto use elibc_musl && append-cppflags -D__musl__ #940733 - - if use npp; then - local cuda=${ESYSROOT}/opt/cuda/targets/$(usex amd64 x86_64 sbsa)-linux - append-cppflags -I"${cuda}"/include - append-ldflags -L"${cuda}"/lib - fi } multilib_src_configure() { + if use npp && multilib_is_native_abi; then + local -x CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS} + append-cppflags $($(tc-getPKG_CONFIG) --cflags nppc || die) + append-ldflags $($(tc-getPKG_CONFIG) --libs-only-L nppc || die) + fi + local conf=( "${S}"/configure ) # not autotools-based local prefix=${EPREFIX}/usr