public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/
Date: Fri, 27 Oct 2023 13:01:40 +0000 (UTC)	[thread overview]
Message-ID: <1698411679.65f587cba61d970bb72e086febe3edb50b175891.andrewammerlaan@gentoo> (raw)

commit:     65f587cba61d970bb72e086febe3edb50b175891
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Oct 27 11:13:56 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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


             reply	other threads:[~2023-10-27 13:01 UTC|newest]

Thread overview: 131+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27 13:01 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-10  5:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/ Sam James
2025-03-01 23:28 Conrad Kostecki
2024-12-31  9:08 Andreas Sturmlechner
2024-09-26 17:24 Eli Schwartz
2024-09-26 15:12 Sam James
2024-08-03  7:49 Andrew Ammerlaan
2024-06-05 12:57 Andrew Ammerlaan
2024-06-02  3:29 Sam James
2023-12-18  8:45 Andrew Ammerlaan
2023-10-27 13:01 Andrew Ammerlaan
2023-10-27 12:17 Sam James
2023-10-27  3:20 Sam James
2023-10-27  3:20 Sam James
2023-10-27  2:59 [gentoo-commits] repo/gentoo:master commit in: media-libs/OpenImageIO/ Sam James
2023-10-27  2:34 Sam James
2023-07-28 13:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/ Thomas Raschbacher
2023-07-16 18:46 Sam James
2023-06-27 11:38 Andrew Ammerlaan
2023-06-26 17:58 Andrew Ammerlaan
2023-06-10 20:47 Andreas Sturmlechner
2023-05-28 13:49 Pacho Ramos
2023-05-01  9:22 Sam James
2023-05-01  8:34 Sam James
2022-12-18  8:32 Sam James
2022-12-18  8:32 Sam James
2022-12-06 13:05 Arthur Zamarin
2022-12-03  2:04 Sam James
2022-11-03  6:15 Sam James
2022-11-03  6:15 Sam James
2022-11-03  6:15 Sam James
2022-10-02  6:21 Agostino Sarubbo
2022-10-02  6:17 Agostino Sarubbo
2022-10-02  2:26 Sam James
2022-10-02  2:26 Sam James
2022-10-02  2:26 Sam James
2022-09-02  1:51 Sam James
2022-08-17 20:01 Sam James
2022-08-01  8:01 Agostino Sarubbo
2022-07-02 20:34 Sam James
2022-06-06 15:54 Jakov Smolić
2022-06-06 11:02 Jakov Smolić
2022-06-06  1:40 Sam James
2022-06-06  1:25 Sam James
2022-06-06  1:25 Sam James
2022-06-06  1:20 Sam James
2022-05-07  7:17 Sam James
2022-04-10 21:02 Andreas Sturmlechner
2022-03-02  2:19 Sam James
2022-02-28 23:58 Sam James
2022-02-28  7:06 Yixun Lan
2022-02-28  5:21 Sam James
2022-02-20  4:45 Sam James
2022-02-12  4:43 Sam James
2022-02-12  3:55 Sam James
2022-02-12  3:55 Sam James
2022-01-09 15:48 Andreas Sturmlechner
2022-01-02  0:31 Sam James
2021-12-08  5:43 Sam James
2021-12-04  1:14 Sam James
2021-12-04  1:14 Sam James
2021-11-04 20:50 Sam James
2021-11-03 10:08 Agostino Sarubbo
2021-11-03 10:06 Agostino Sarubbo
2021-11-02 20:29 Sam James
2021-11-02 20:29 Sam James
2021-11-01 12:37 Sam James
2021-10-31  8:38 Sam James
2021-10-31  5:44 Sam James
2021-10-06  2:43 Sam James
2021-09-19  3:25 Sam James
2021-07-29  7:08 Agostino Sarubbo
2021-07-29  6:45 Agostino Sarubbo
2021-06-18  9:21 Andrew Ammerlaan
2021-06-03  0:10 John Helmert III
2021-06-01 19:28 Sam James
2021-05-31 23:49 Sam James
2021-05-31 23:47 Sam James
2021-05-31 23:47 Sam James
2021-05-31 23:47 Sam James
2021-05-31 23:47 Sam James
2021-05-01 14:07 Sam James
2021-04-18 21:20 Sam James
2021-03-04 10:42 Agostino Sarubbo
2021-03-01 23:37 Sam James
2021-03-01  9:20 Agostino Sarubbo
2021-02-22  7:12 Sam James
2021-02-19 20:12 Thomas Deutschmann
2021-02-05  4:20 Sam James
2021-01-20  7:41 Agostino Sarubbo
2021-01-11  8:00 Sam James
2021-01-01 22:53 Sam James
2020-12-21 18:07 Sam James
2020-12-03  5:20 Sam James
2020-12-03  5:20 Sam James
2020-12-02 21:54 Sam James
2020-11-13 18:32 Sam James
2020-11-13 18:30 Sam James
2020-11-12 16:26 Sam James
2020-11-12  0:35 Thomas Deutschmann
2020-11-03 12:47 Sam James
2020-10-15 15:58 Sam James
2020-10-10  4:41 Sam James
2020-10-10  4:34 Sam James
2020-03-01 18:36 Matthias Maier
2020-02-09 16:29 Michał Górny
2020-01-30 21:26 Michał Górny
2019-11-30 12:08 Andreas Sturmlechner
2019-07-18 15:30 Andreas Sturmlechner
2019-07-18 14:32 Thomas Deutschmann
2019-07-18  9:54 Agostino Sarubbo
2019-07-16 15:14 Andreas Sturmlechner
2019-07-16 15:14 Andreas Sturmlechner
2019-07-16 15:14 Andreas Sturmlechner
2019-07-15 13:36 Michał Górny
2019-06-10 19:51 Andreas Sturmlechner
2019-05-29  0:48 Aaron Bauman
2019-01-07 12:38 Lars Wendler
2019-01-07 12:38 Lars Wendler
2019-01-07 12:38 Lars Wendler
2018-08-15 20:08 Jonathan Scruggs
2018-03-30 16:04 Aaron Bauman
2018-01-22 21:52 Patrice Clement
2018-01-22 21:52 Patrice Clement
2017-12-21 20:32 Patrice Clement
2016-10-16  8:50 Pacho Ramos
2016-10-09 11:18 Pacho Ramos
2016-05-05 20:09 Michael Palimaka
2016-05-05 20:09 Michael Palimaka
2016-05-05 20:09 Michael Palimaka
2016-04-20 15:01 Ian Stakenvicius

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1698411679.65f587cba61d970bb72e086febe3edb50b175891.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox