From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E6CB4158042 for ; Tue, 5 Nov 2024 02:03:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B616E07EA; Tue, 5 Nov 2024 02:03:26 +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 1BB94E07EA for ; 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 35320342FB2 for ; Tue, 5 Nov 2024 02:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69B641D23 for ; Tue, 5 Nov 2024 02:03:22 +0000 (UTC) From: "Sam James" 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" Message-ID: <1730772157.f03bd6e74ab2f999a3e6647943347fb672f57c1a.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: f03bd6e74ab2f999a3e6647943347fb672f57c1a X-VCS-Branch: master Date: Tue, 5 Nov 2024 02:03:22 +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: d974b546-1642-46da-8fbd-42c30ccea403 X-Archives-Hash: f87e266157445e5ffaac4be6443ebab7 commit: f03bd6e74ab2f999a3e6647943347fb672f57c1a Author: Paul Zander gmail com> AuthorDate: Tue Oct 15 11:56:28 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 5 02:02:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03bd6e7 media-libs/opencv: default to qt6, drop qt5 Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index fb15696ce141..f25d07f2e464 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -76,7 +76,7 @@ IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394" # image IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp" # gui -IUSE+=" gtk3 qt5 qt6 opengl vtk" +IUSE+=" gtk3 qt6 opengl vtk" # parallel IUSE+=" openmp tbb" # lapack options @@ -158,7 +158,7 @@ REQUIRED_USE=" dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) - contribcvv? ( contrib || ( qt5 qt6 ) ) + contribcvv? ( contrib qt6 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) @@ -166,10 +166,10 @@ REQUIRED_USE=" contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib ) java? ( python ) - opengl? ( ?? ( gtk3 || ( qt5 qt6 ) ) ) + opengl? ( ?? ( gtk3 qt6 ) ) python? ( ${PYTHON_REQUIRED_USE} ) tesseract? ( contrib ) - ?? ( gtk3 || ( qt5 qt6 ) ) + ?? ( gtk3 qt6 ) test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d ) " @@ -242,17 +242,8 @@ COMMON_DEPEND=" ${PYTHON_DEPS} dev-python/numpy:=[${PYTHON_USEDEP}] ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qttest:5 - dev-qt/qtconcurrent:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - !qt5? ( - qt6? ( - dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] - ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] ) quirc? ( media-libs/quirc ) tesseract? ( app-text/tesseract[${MULTILIB_USEDEP}] ) @@ -705,12 +696,7 @@ multilib_src_configure() { ) - if use qt5; then - mycmakeargs+=( - -DWITH_QT="$(multilib_native_usex qt5)" - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" - ) - elif use qt6; then + if use qt6; then mycmakeargs+=( -DWITH_QT="$(multilib_native_usex qt6)" -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes" @@ -928,7 +914,7 @@ multilib_src_test() { 'AsyncAPICancelation/cancel*basic' ) - if ! use gtk3 && ! use qt5 && ! use qt6; then + if ! use gtk3 && ! use qt6; then CMAKE_SKIP_TESTS+=( # these fail with parallism '^Highgui_*' @@ -1139,7 +1125,7 @@ multilib_src_install() { /usr/include/opencv4/opencv2/text/swt_text_detection.hpp /usr/include/opencv4/opencv2/text/textDetector.hpp - # [qt5,qt6] + # [qt6] /usr/include/opencv4/opencv2/viz.hpp /usr/include/opencv4/opencv2/viz/types.hpp /usr/include/opencv4/opencv2/viz/viz3d.hpp