From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1686800-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 0E4BB158042
for <garchives@archives.gentoo.org>; Tue, 5 Nov 2024 02:03:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BE3ECE07F6;
Tue, 5 Nov 2024 02:03:26 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A4284E07F6
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:26 +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 AAAF3342FE8
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2405A1F7A
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: <1730772163.900c50dd186dc8c716fc882f7345b45e9b088976.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: 900c50dd186dc8c716fc882f7345b45e9b088976
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: b3349df4-aed6-41ad-bb26-a4f093f54af2
X-Archives-Hash: 2103784a047a265a86531b00c77874b1
commit: 900c50dd186dc8c716fc882f7345b45e9b088976
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 4 18:51:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 02:02:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900c50dd
media-libs/opencv: rework plugin lists
Explicitly specify `videoio` plugins.
Disable plugins for `highgui`, as this would otherwise autodetect gtk2.
`opengl` support would require `x11-libs/gtkglext` which is obsolete, reflect
that in `REQUIRED_USE`.
Bug: https://bugs.gentoo.org/698950
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 | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index e0fb1354215a..23dda8d411b1 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -167,7 +167,7 @@ REQUIRED_USE="
contribsfm? ( contrib eigen gflags glog )
contribxfeatures2d? ( contrib )
java? ( python )
- opengl? ( ?? ( gtk3 qt6 ) )
+ opengl? ( qt6 )
python? ( ${PYTHON_REQUIRED_USE} )
tesseract? ( contrib )
?? ( gtk3 qt6 )
@@ -709,10 +709,23 @@ multilib_src_configure() {
# -DBUILD_opencv_world="yes"
+ -DOPENCV_PLUGIN_VERSION=".$(ver_rs 1-2 '' "$(ver_cut 1-2)")"
+ -DOPENCV_PLUGIN_ARCH=".${ARCH}"
+
-DDNN_PLUGIN_LIST="all"
- -DHIGHGUI_PLUGIN_LIST="all"
- -DVIDEOIO_PLUGIN_LIST="all"
+ -DHIGHGUI_ENABLE_PLUGINS="no"
+ )
+ local VIDEOIO_PLUGIN_LIST=()
+ if use ffmpeg; then
+ VIDEOIO_PLUGIN_LIST+=("ffmpeg")
+ fi
+ if use gstreamer; then
+ VIDEOIO_PLUGIN_LIST+=("gstreamer")
+ fi
+
+ mycmakeargs+=(
+ -DVIDEOIO_PLUGIN_LIST="$(IFS=';'; echo "${VIDEOIO_PLUGIN_LIST[*]}")"
)
if use qt6; then