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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7EDEF158089 for ; Fri, 27 Oct 2023 13:01:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF70C2BC029; Fri, 27 Oct 2023 13:01:42 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CBCE2BC029 for ; Fri, 27 Oct 2023 13:01:42 +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 9DF06335C31 for ; Fri, 27 Oct 2023 13:01:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BFA71220 for ; Fri, 27 Oct 2023 13:01:40 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1698411679.65f587cba61d970bb72e086febe3edb50b175891.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openimageio/openimageio-2.4.12.0.ebuild media-libs/openimageio/openimageio-2.4.13.0.ebuild media-libs/openimageio/openimageio-2.4.14.0.ebuild media-libs/openimageio/openimageio-2.4.15.0.ebuild media-libs/openimageio/openimageio-2.4.16.0.ebuild media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild media-libs/openimageio/openimageio-2.5.4.0.ebuild X-VCS-Directories: media-libs/openimageio/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 65f587cba61d970bb72e086febe3edb50b175891 X-VCS-Branch: master Date: Fri, 27 Oct 2023 13:01:40 +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: 5b2c0840-c0e5-4888-b3cd-05d97bf8f1f7 X-Archives-Hash: a999a0ff27b1759528be753b0835e225 commit: 65f587cba61d970bb72e086febe3edb50b175891 Author: Paul Zander gmail com> AuthorDate: Fri Oct 27 11:13:56 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 27 13:01:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f587cb media-libs/openimageio: silence warnings Closes: https://bugs.gentoo.org/913746 Signed-off-by: Paul Zander gmail.com> Signed-off-by: Andrew Ammerlaan gentoo.org> media-libs/openimageio/openimageio-2.4.12.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.13.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.14.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.15.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.16.0.ebuild | 5 ++--- media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild | 1 + media-libs/openimageio/openimageio-2.5.4.0.ebuild | 5 ++--- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/media-libs/openimageio/openimageio-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild index c59fe4eab154..31c4f5904360 100644 --- a/media-libs/openimageio/openimageio-2.4.12.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.12.0.ebuild @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -154,9 +155,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild index 350883eff393..da733907b3ce 100644 --- a/media-libs/openimageio/openimageio-2.4.13.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild @@ -104,6 +104,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -158,9 +159,7 @@ src_configure() { if use qt5 || use qt6; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.14.0.ebuild b/media-libs/openimageio/openimageio-2.4.14.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.14.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.14.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.15.0.ebuild b/media-libs/openimageio/openimageio-2.4.15.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.15.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.15.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.16.0.ebuild b/media-libs/openimageio/openimageio-2.4.16.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.4.16.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.16.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild index 09223e5d244c..79fdf5d96ef7 100644 --- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild @@ -100,6 +100,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts diff --git a/media-libs/openimageio/openimageio-2.5.4.0.ebuild b/media-libs/openimageio/openimageio-2.5.4.0.ebuild index 008c987ed88e..0de0832197fc 100644 --- a/media-libs/openimageio/openimageio-2.5.4.0.ebuild +++ b/media-libs/openimageio/openimageio-2.5.4.0.ebuild @@ -108,6 +108,7 @@ pkg_setup() { } src_prepare() { + use dicom || rm -r "${S}/src/dicom.imageio/" || die cmake_src_prepare cmake_comment_add_subdirectory src/fonts @@ -162,9 +163,7 @@ src_configure() { if use gui; then mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else + if ! use qt6; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) fi else