summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-10-04 01:11:48 +0100
committerSam James <sam@gentoo.org>2021-10-04 01:11:48 +0100
commitb8f26837493d36eee145c656abfabf3d99581c19 (patch)
treecb7d7245aa739b1f6e1abcfe09583d24a62de458
parentmedia-libs/osl: needs <= LLVM 12 (diff)
downloadgentoo-b8f26837.tar.gz
gentoo-b8f26837.tar.bz2
gentoo-b8f26837.zip
media-libs/osl: fix MisplacedEclassVar
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-libs/osl/osl-1.10.13.ebuild4
-rw-r--r--media-libs/osl/osl-1.11.15.0.ebuild4
-rw-r--r--media-libs/osl/osl-1.11.9.0-r1.ebuild2
-rw-r--r--media-libs/osl/osl-1.11.9.0.ebuild6
-rw-r--r--media-libs/osl/osl-1.12.0.2-r1.ebuild2
-rw-r--r--media-libs/osl/osl-1.12.0.2.ebuild2
6 files changed, 9 insertions, 11 deletions
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
index fdab29afa48e..57d75feb4aaf 100644
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,7 +49,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
index 7b33287ed3f8..2874e67dd898 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -60,9 +60,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-cmake.patch
)
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
index 10bd18b8492e..2c050efe222c 100644
--- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
PATCHES=()
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index ea80a9490447..eafd2f78c74c 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -7,6 +7,8 @@ inherit cmake llvm toolchain-funcs
# check this on updates
LLVM_MAX_SLOT=10
+CMAKE_REMOVE_MODULES_LIST=()
+
DESCRIPTION="Advanced shading language for production GI renderers"
HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
@@ -51,9 +53,7 @@ BDEPEND="
PATCHES=()
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
index 8c235e4a1086..11944da63f69 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -60,7 +60,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 7532e89f4dd6..155cb0665f23 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"