From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1686810-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(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 D764F158042
for <garchives@archives.gentoo.org>; Tue, 5 Nov 2024 02:03:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 852E5E085B;
Tue, 5 Nov 2024 02:03:28 +0000 (UTC)
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 pigeon.gentoo.org (Postfix) with ESMTPS id 65FD1E085B
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:28 +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 2104A342FF0
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D620C159D
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:23 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1730772168.3db769c9725026eabb9b697856ef2bd57b6ebe4d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/opencv/opencv-4.10.0.ebuild
X-VCS-Directories: media-libs/opencv/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3db769c9725026eabb9b697856ef2bd57b6ebe4d
X-VCS-Branch: master
Date: Tue, 5 Nov 2024 02:03:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 52e2c6b6-0808-423b-96ca-8ca31a9027e4
X-Archives-Hash: b30e180c594b0c4aca01cbe924c40ac5
commit: 3db769c9725026eabb9b697856ef2bd57b6ebe4d
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 14:31:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db769c9
media-libs/opencv: rework vtk depspec #929217
The VTK <-> OpenCASCADE interaction is cumbersome with their circular inclusion
and non-namespaced exporting of defines in cmake files.
Since we do not want `OpenCASCADE` polluting our build environment with
e.g. `-DHAVE_FFMPEG=true`, we require `VTK` to be build without `OpenCASCADE`
support or `OpenCASCADE` to be build without ffmpeg support.
Closes: https://bugs.gentoo.org/929217
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencv/opencv-4.10.0.ebuild | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 53c8949d37ed..ea1242c5e0b7 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -259,7 +259,16 @@ COMMON_DEPEND="
tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk:=[rendering,cuda=] )
+ vtk? (
+ sci-libs/vtk:=[rendering,cuda=]
+ || (
+ (
+ sci-libs/vtk[opencascade(+)]
+ sci-libs/opencascade[-ffmpeg]
+ )
+ sci-libs/vtk[-opencascade(-)]
+ )
+ )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
xine? ( media-libs/xine-lib )
"