Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/
Date: Sat, 26 Feb 2022 23:06:59
Message-Id: 1645916740.949005d1a1d77647a097371ba116be2f740c4b8c.sam@gentoo
1 commit: 949005d1a1d77647a097371ba116be2f740c4b8c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 26 23:03:45 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 26 23:05:40 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949005d1
7
8 media-libs/opencolorio: avoid automagic OSL test dependency
9
10 If OSL has not yet been rebuilt against new OpenEXR and so on,
11 it might lead to a build failure. Let's just avoid the test dep
12 entirely.
13
14 Closes: https://bugs.gentoo.org/833933
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild | 4 ++++
18 1 file changed, 4 insertions(+)
19
20 diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
21 index b8551efefa43..16fb18b5889c 100644
22 --- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
23 +++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
24 @@ -64,6 +64,10 @@ src_prepare() {
25
26 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
27 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
28 +
29 + # Avoid automagic test dependency on OSL, bug #833933
30 + # Can cause problems during e.g. OpenEXR unsplitting migration
31 + cmake_run_in tests cmake_comment_add_subdirectory osl
32 }
33
34 src_configure() {