public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/
Date: Sat, 26 Feb 2022 23:06:55 +0000 (UTC)	[thread overview]
Message-ID: <1645916740.949005d1a1d77647a097371ba116be2f740c4b8c.sam@gentoo> (raw)

commit:     949005d1a1d77647a097371ba116be2f740c4b8c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 23:03:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 23:05:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949005d1

media-libs/opencolorio: avoid automagic OSL test dependency

If OSL has not yet been rebuilt against new OpenEXR and so on,
it might lead to a build failure. Let's just avoid the test dep
entirely.

Closes: https://bugs.gentoo.org/833933
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
index b8551efefa43..16fb18b5889c 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -64,6 +64,10 @@ src_prepare() {
 
 	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
 	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+
+	# Avoid automagic test dependency on OSL, bug #833933
+	# Can cause problems during e.g. OpenEXR unsplitting migration
+	cmake_run_in tests cmake_comment_add_subdirectory osl
 }
 
 src_configure() {


             reply	other threads:[~2022-02-26 23:06 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-26 23:06 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-28 12:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/ Sam James
2024-03-18 16:35 Sam James
2023-10-29 20:52 Sam James
2023-10-28 21:46 Sam James
2023-10-28 21:46 Sam James
2023-10-27  5:15 Sam James
2023-10-27  3:20 Sam James
2023-10-27  2:59 [gentoo-commits] repo/gentoo:master commit in: media-libs/OpenColorIO/ Sam James
2023-10-27  2:34 Sam James
2023-09-26 20:48 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/ Sam James
2023-09-26 20:48 Sam James
2023-06-10 21:12 Andreas Sturmlechner
2023-06-10 21:11 Sam James
2023-06-10 20:47 Andreas Sturmlechner
2023-06-10 20:47 Andreas Sturmlechner
2023-05-14  8:19 Andreas Sturmlechner
2023-04-09 12:35 Arthur Zamarin
2022-12-03  8:37 Joonas Niilola
2022-08-27 11:38 Sam James
2022-06-06  1:20 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:49 Sam James
2022-02-20  4:45 Sam James
2022-02-18  2:14 Sam James
2022-02-15 22:39 Sam James
2022-01-09 15:48 Andreas Sturmlechner
2022-01-02  0:31 Sam James
2021-12-17  2:52 Sam James
2021-12-17  2:52 Sam James
2021-11-02 22:54 Sam James
2021-11-01 13:07 Sam James
2021-10-31  5:53 Sam James
2021-10-31  5:49 Sam James
2021-10-22  2:47 Sam James
2021-10-17  3:04 Sam James
2021-10-11  3:16 Sam James
2021-09-19  3:30 Sam James
2021-09-19  3:25 Sam James
2021-09-19  3:09 Sam James
2021-09-19  3:09 Sam James
2021-09-19  3:09 Sam James
2021-08-30  2:58 Sam James
2021-07-20 11:04 Joonas Niilola
2021-07-20 11:00 Joonas Niilola
2021-07-20 11:00 Joonas Niilola
2021-06-12  5:18 Sam James
2021-06-10  0:51 Sam James
2021-06-07  8:33 Joonas Niilola
2021-05-31 23:19 Sam James
2021-02-22  7:12 Sam James
2020-12-23 21:56 Sam James
2020-12-21 18:07 Sam James
2020-11-17 19:17 Agostino Sarubbo
2020-11-17  0:02 Sam James
2020-10-10 13:50 Sergei Trofimovich
2020-10-10  4:34 Sam James
2020-06-06  0:02 Andreas Sturmlechner
2020-04-13  9:21 Andreas Sturmlechner
2020-02-11 19:50 Agostino Sarubbo
2020-02-11 19:43 Agostino Sarubbo
2020-02-09 16:29 Michał Górny
2020-01-30 21:26 Michał Górny
2019-05-19 17:54 Andreas Sturmlechner
2018-05-25 23:58 Thomas Deutschmann
2018-05-24 14:31 Agostino Sarubbo
2017-09-23 11:14 David Seifert
2017-04-26 14:35 Sergey Popov
2017-04-23 11:29 David Seifert
2016-06-02  8:26 Sergey Popov
2016-05-30 20:16 Sergey Popov

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=1645916740.949005d1a1d77647a097371ba116be2f740c4b8c.sam@gentoo \
    --to=sam@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