| 1 |
commit: a4d45643e7cc8d701b4a089a49489da9283a2fa4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 19 05:16:52 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 19 05:20:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d45643 |
| 7 |
|
| 8 |
media-libs/osl: add 1.11.15.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/778005 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/osl/Manifest | 1 + |
| 14 |
media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch | 24 +++++ |
| 15 |
media-libs/osl/osl-1.11.15.0.ebuild | 108 +++++++++++++++++++++ |
| 16 |
3 files changed, 133 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest |
| 19 |
index d880f7d1d0f..a23760d3674 100644 |
| 20 |
--- a/media-libs/osl/Manifest |
| 21 |
+++ b/media-libs/osl/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201 |
| 24 |
+DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5 |
| 25 |
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65 |
| 26 |
DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010 |
| 27 |
|
| 28 |
diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..020370d54bc |
| 31 |
--- /dev/null |
| 32 |
+++ b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch |
| 33 |
@@ -0,0 +1,24 @@ |
| 34 |
+https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch |
| 35 |
+ |
| 36 |
+From: debaetsd <debaetsd@×××××.com> |
| 37 |
+Date: Tue, 29 Dec 2020 22:01:21 +0100 |
| 38 |
+Subject: [PATCH] fixed cmake setup when tests are disabled (#1319) |
| 39 |
+ |
| 40 |
+--- a/CMakeLists.txt |
| 41 |
++++ b/CMakeLists.txt |
| 42 |
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS |
| 43 |
+ FILE ${OSL_TARGETS_EXPORT_NAME} |
| 44 |
+ NAMESPACE ${PROJECT_NAME}::) |
| 45 |
+ |
| 46 |
+- |
| 47 |
+- |
| 48 |
+- |
| 49 |
+-osl_add_all_tests() |
| 50 |
+- |
| 51 |
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT) |
| 52 |
++ osl_add_all_tests() |
| 53 |
++endif () |
| 54 |
+ |
| 55 |
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) |
| 56 |
+ include (packaging) |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild |
| 60 |
new file mode 100644 |
| 61 |
index 00000000000..612465934cb |
| 62 |
--- /dev/null |
| 63 |
+++ b/media-libs/osl/osl-1.11.15.0.ebuild |
| 64 |
@@ -0,0 +1,108 @@ |
| 65 |
+# Copyright 1999-2021 Gentoo Authors |
| 66 |
+# Distributed under the terms of the GNU General Public License v2 |
| 67 |
+ |
| 68 |
+EAPI=7 |
| 69 |
+ |
| 70 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 71 |
+ |
| 72 |
+# check this on updates |
| 73 |
+LLVM_MAX_SLOT=13 |
| 74 |
+ |
| 75 |
+inherit cmake llvm toolchain-funcs python-single-r1 |
| 76 |
+ |
| 77 |
+DESCRIPTION="Advanced shading language for production GI renderers" |
| 78 |
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage" |
| 79 |
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" |
| 80 |
+ |
| 81 |
+LICENSE="BSD" |
| 82 |
+SLOT="0/11" |
| 83 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 84 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 85 |
+ |
| 86 |
+X86_CPU_FEATURES=( |
| 87 |
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 |
| 88 |
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c |
| 89 |
+) |
| 90 |
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) |
| 91 |
+ |
| 92 |
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" |
| 93 |
+ |
| 94 |
+RDEPEND=" |
| 95 |
+ dev-libs/boost:= |
| 96 |
+ dev-libs/pugixml |
| 97 |
+ media-libs/openexr:= |
| 98 |
+ media-libs/openimageio:= |
| 99 |
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= |
| 100 |
+ sys-libs/zlib |
| 101 |
+ partio? ( media-libs/partio ) |
| 102 |
+ python? ( |
| 103 |
+ ${PYTHON_DEPS} |
| 104 |
+ $(python_gen_cond_dep ' |
| 105 |
+ dev-python/pybind11[${PYTHON_USEDEP}] |
| 106 |
+ ') |
| 107 |
+ ) |
| 108 |
+ qt5? ( |
| 109 |
+ dev-qt/qtcore:5 |
| 110 |
+ dev-qt/qtgui:5 |
| 111 |
+ dev-qt/qtwidgets:5 |
| 112 |
+ ) |
| 113 |
+" |
| 114 |
+DEPEND="${RDEPEND}" |
| 115 |
+BDEPEND=" |
| 116 |
+ sys-devel/bison |
| 117 |
+ sys-devel/flex |
| 118 |
+ virtual/pkgconfig |
| 119 |
+" |
| 120 |
+ |
| 121 |
+PATCHES=( |
| 122 |
+ "${FILESDIR}"/${P}-fix-cmake.patch |
| 123 |
+) |
| 124 |
+ |
| 125 |
+CMAKE_REMOVE_MODULES_LIST=() |
| 126 |
+ |
| 127 |
+# Restricting tests as Make file handles them differently |
| 128 |
+RESTRICT="test" |
| 129 |
+ |
| 130 |
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" |
| 131 |
+ |
| 132 |
+llvm_check_deps() { |
| 133 |
+ has_version -r "sys-devel/clang:${LLVM_SLOT}" |
| 134 |
+} |
| 135 |
+ |
| 136 |
+pkg_setup() { |
| 137 |
+ use python && python-single-r1_pkg_setup |
| 138 |
+ llvm_pkg_setup |
| 139 |
+} |
| 140 |
+ |
| 141 |
+src_configure() { |
| 142 |
+ local cpufeature |
| 143 |
+ local mysimd=() |
| 144 |
+ for cpufeature in "${CPU_FEATURES[@]}"; do |
| 145 |
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") |
| 146 |
+ done |
| 147 |
+ |
| 148 |
+ # If no CPU SIMDs were used, completely disable them |
| 149 |
+ [[ -z ${mysimd} ]] && mysimd=("0") |
| 150 |
+ |
| 151 |
+ local gcc=$(tc-getCC) |
| 152 |
+ |
| 153 |
+ local mycmakeargs=( |
| 154 |
+ # LLVM 10+ needs C++14 |
| 155 |
+ -DCMAKE_CXX_STANDARD=14 |
| 156 |
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
| 157 |
+ -DINSTALL_DOCS=$(usex doc) |
| 158 |
+ -DUSE_CCACHE=OFF |
| 159 |
+ -DLLVM_STATIC=OFF |
| 160 |
+ -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})" |
| 161 |
+ -DOSL_BUILD_TESTS=$(usex test) |
| 162 |
+ -DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders" |
| 163 |
+ -DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx" |
| 164 |
+ -DSTOP_ON_WARNING=OFF |
| 165 |
+ -DUSE_PARTIO=$(usex partio) |
| 166 |
+ -DUSE_QT=$(usex qt5) |
| 167 |
+ -DUSE_PYTHON=$(usex python) |
| 168 |
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" |
| 169 |
+ ) |
| 170 |
+ |
| 171 |
+ cmake_src_configure |
| 172 |
+} |
Archives