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 4B2D915812D for ; Tue, 31 Dec 2024 09:08:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82E8DE07D0; Tue, 31 Dec 2024 09:08:47 +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 66847E07D0 for ; Tue, 31 Dec 2024 09:08:47 +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 0412133FE7D for ; Tue, 31 Dec 2024 09:08:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6933E19A0 for ; Tue, 31 Dec 2024 09:08:43 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1735636066.b8a98b5c3e43efc185c80cde62fb3c8759c81e13.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openimageio/metadata.xml media-libs/openimageio/openimageio-2.5.13.1.ebuild X-VCS-Directories: media-libs/openimageio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b8a98b5c3e43efc185c80cde62fb3c8759c81e13 X-VCS-Branch: master Date: Tue, 31 Dec 2024 09:08:43 +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: 03d02d98-9823-49a6-9400-4bf44b760e6e X-Archives-Hash: ed9802990962cbadf06f9469987ae337 commit: b8a98b5c3e43efc185c80cde62fb3c8759c81e13 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 29 21:40:34 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 31 09:07:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a98b5c media-libs/openimageio: Drop IUSE qt6 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/openimageio/metadata.xml | 3 +-- media-libs/openimageio/openimageio-2.5.13.1.ebuild | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml index ebe3fe1f3f72..f292b41f7508 100644 --- a/media-libs/openimageio/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -8,11 +8,10 @@ Enable DICOM medical image file support via sci-libs/dcmtk Enable support for NASA's sci-libs/cfitsio library - Build iv (with Qt5) + Build iv with dev-qt/qtbase Enable OpenCV support via media-libs/opencv Enable OpenVDB support via media-gfx/openvdb Enable Ptex texture mapping system file support via media-libs/ptex - Build iv with Qt6 Build the command-line tools diff --git a/media-libs/openimageio/openimageio-2.5.13.1.ebuild b/media-libs/openimageio/openimageio-2.5.13.1.ebuild index 0e6c33de61fd..8a45d68d0cb3 100644 --- a/media-libs/openimageio/openimageio-2.5.13.1.ebuild +++ b/media-libs/openimageio/openimageio-2.5.13.1.ebuild @@ -48,7 +48,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" +IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python raw test +tools +truetype ${CPU_FEATURES[*]%:*}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )" RESTRICT="!test? ( test )" @@ -99,15 +99,7 @@ RDEPEND=" ) gui? ( media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) + dev-qt/qtbase:6[gui,widgets,opengl] ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= ) @@ -246,9 +238,6 @@ src_configure() { if use gui; then mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) - fi else mycmakeargs+=( -DUSE_QT="no"