* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/
@ 2020-07-30 22:11 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-07-30 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 119c07b35e1c47c67cff033ffcf2ce30dfca0662
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 11:44:37 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 22:09:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=119c07b3
media-libs/osl: Remove old (LLVM 8)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
....5-upstream-patch-to-find-openexr-version.patch | 76 -------------------
media-libs/osl/osl-1.10.5.ebuild | 88 ----------------------
3 files changed, 165 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1ccafafa6ad..2001775196d 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1 @@
DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
-DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
diff --git a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch b/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
deleted file mode 100644
index cc270ff5281..00000000000
--- a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9efdcfafcdfbb7666171b6016b725183a71fceb0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Tue, 25 Jun 2019 19:44:14 +0200
-Subject: [PATCH] src/cmake/modules/FindOpenEXR.cmake: patch to find openexr
-
-This upstream patch (see
-https://github.com/imageworks/OpenShadingLanguage/pull/1022/files)
-uses pkg-config variables to get the correct versions for openexr
-on multilib installations.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- src/cmake/modules/FindOpenEXR.cmake | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
-index 6c6b39c..4a9de4b 100644
---- a/src/cmake/modules/FindOpenEXR.cmake
-+++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -25,8 +25,12 @@ endif ()
- # Attempt to find OpenEXR with pkgconfig
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
-- pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
-- pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+ if (NOT ILMBASE_ROOT_DIR)
-+ pkg_check_modules(_ILMBASE QUIET QUIET IlmBase>=2.0.0)
-+ endif()
-+ if (NOT OPENEXR_ROOT_DIR)
-+ pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+ endif()
- endif (PKG_CONFIG_FOUND)
-
- # List of likely places to find the headers -- note priority override of
-@@ -60,7 +64,11 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
-
- # Try to figure out version number
--if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-+ set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
-+ string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-+ string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
- # Must be at least 2.0
- file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
-@@ -93,6 +101,8 @@ set (GENERIC_LIBRARY_PATHS
- /opt/local/lib
- $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
-
-+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
-+
- # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
- # We will restore it at the end of this file.
- set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -114,14 +124,14 @@ foreach (COMPONENT ${_openexr_components})
- # First try with the version embedded
- set (FULL_COMPONENT_NAME ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
-- PATHS ${OPENEXR_LIBRARY_DIR}
-+ PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
- ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
- # Again, with no directory restrictions
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
- # Try again without the version
- set (FULL_COMPONENT_NAME ${COMPONENT})
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
-- PATHS ${OPENEXR_LIBRARY_DIR}
-+ PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
- ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
- # One more time, with no restrictions
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
---
-2.22.0
-
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
deleted file mode 100644
index b5c979d4f30..00000000000
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=8
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-X86_CPU_FEATURES=(
- sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
-
-# >=clang-3.4 is needed, but at least llvm:5 if both are installed
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-libs/pugixml
- >=media-libs/openexr-2.2.0:=
- >=media-libs/openimageio-1.8.5
- >=sys-devel/clang-5:=
- <sys-devel/clang-9:=
- sys-libs/zlib:=
- partio? ( media-libs/partio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-upstream-patch-to-find-openexr-version.patch"
- "${FILESDIR}/${P}-fix-install-shaders.patch"
-)
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local gcc=$(tc-getCC)
- # LLVM needs CPP11. Do not disable.
- local mycmakeargs=(
- -DENABLERTTI=OFF
- -DINSTALL_DOCS=$(usex doc)
- -DLLVM_STATIC=ON
- -DOSL_BUILD_TESTS=$(usex test)
- -DSTOP_ON_WARNING=OFF
- -DUSE_PARTIO=$(usex partio)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/
@ 2021-06-10 0:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-06-10 0:51 UTC (permalink / raw
To: gentoo-commits
commit: 7da3d02dd4d346906f0bdf7cd0df04f542706bb8
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Tue Apr 27 23:42:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 00:19:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da3d02d
media-libs/osl: bump to 1.12.0.2
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/files/osl-1.12.0.2-llvm-11.patch | 29 +++
media-libs/osl/files/osl-1.12.0.2-llvm-12.patch | 240 ++++++++++++++++++++++++
media-libs/osl/osl-1.12.0.2.ebuild | 88 +++++++++
4 files changed, 358 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index db1eb09c70c..d880f7d1d0f 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
+DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
new file mode 100644
index 00000000000..a47bcd4e47d
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
@@ -0,0 +1,29 @@
+From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel <brecht@blender.org>
+Date: Mon, 19 Apr 2021 13:49:22 +0200
+Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
+
+Generating code for prepare_closure and gen_closure was crashing.
+The code now matches the implementation of the removed LLVM function.
+
+Signed-off-by: Brecht Van Lommel <brecht@blender.org>
+---
+ src/liboslexec/llvm_util.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f64000..3d468de27 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
+ #endif
+ //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+- OSL_DASSERT(llvm::isa<llvm::Function>(func));
+- llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
++ llvm::Value* r = builder().CreateCall(
++ llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
++ llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
+ #else
+ llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
+ #endif
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
new file mode 100644
index 00000000000..dcf9ac863f7
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
@@ -0,0 +1,240 @@
+commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
+Author: Euan Haahr <euanhaahrmail2@gmail.com>
+Date: Fri Feb 5 22:51:14 2021 +0000
+
+ Various fixes for LLVM 12 compatibility (1351)
+
+ Removed use of options.PrintMachineCode since this has been removed as
+ of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
+ it has been deprecated and removed as of llvm 12.
+
+ PrintMachine code will only be used if llvm is lower than version 12.
+ TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
+ have time to figure this out right now.)
+
+ Pass adjustment as various things have been deprecated or changed
+ names. (LG)
+
+ Signed-off-by: Euan Haahr <euanhaahrmail2@gmail.com>
+ Signed-off-by: Larry Gritz <lg@larrygritz.com>
+
+diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
+index 4ec3489c..7c14fc76 100644
+--- a/src/liboslexec/llvm_passes.h
++++ b/src/liboslexec/llvm_passes.h
+@@ -73,9 +73,14 @@ public:
+ // 16 bit and 32 bit native mask representation to be passed as a
+ // livein.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
++# if OSL_LLVM_VERSION >= 112
++ m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++ llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
++# else
+ m_wide_zero_initializer = llvm::ConstantVector::getSplat(
+ llvm::ElementCount(WidthT, false),
+ llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
++# endif
+ #else
+ m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
+ m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
+@@ -341,9 +346,8 @@ public:
+ // of the mask promotion will always be correct here. Should 16 bit
+ // support be needed, this pass could be extended.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
+- m_wide_zero_initializer = llvm::ConstantVector::getSplat(
+- llvm::ElementCount(WidthT, false),
+- llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
++ m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++ llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
+ #else
+ m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
+ m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index fed8c5ec..b2a02f61 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -20,6 +20,7 @@
+ #include "llvm_passes.h"
+
+ #include <llvm/InitializePasses.h>
++#include <llvm/Pass.h>
+ #include <llvm/IR/Constant.h>
+ #include <llvm/IR/Constants.h>
+ #include <llvm/IR/DebugInfo.h>
+@@ -59,6 +60,7 @@
+ #include <llvm/Analysis/BasicAliasAnalysis.h>
+ #include <llvm/Analysis/TypeBasedAliasAnalysis.h>
+ #include <llvm/Analysis/TargetTransformInfo.h>
++#include <llvm/IR/Function.h>
+ #include <llvm/IR/Verifier.h>
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Target/TargetOptions.h>
+@@ -74,10 +76,9 @@
+ #include <llvm/Transforms/Scalar/GVN.h>
+ #include <llvm/Transforms/Utils.h>
+
+-
+-#include <llvm/Pass.h>
+-#include <llvm/IR/Function.h>
+-#include <llvm/Support/raw_ostream.h>
++#if OSL_LLVM_VERSION >= 120
++#include <llvm/CodeGen/Passes.h>
++#endif
+
+ // additional includes for PTX generation
+ #include <llvm/Transforms/Utils/SymbolRewriter.h>
+@@ -129,6 +130,11 @@ static bool setup_done = false;
+ static std::unique_ptr<std::vector<std::shared_ptr<LLVMMemoryManager> >> jitmm_hold;
+ static int jit_mem_hold_users = 0;
+
++
++#if OSL_LLVM_VERSION >= 120
++llvm::raw_os_ostream raw_cout(std::cout);
++#endif
++
+ }; // end anon namespace
+
+
+@@ -701,7 +707,8 @@ LLVM_Util::debug_pop_function()
+ // that has been finalized, point it back to the compilation unit
+ OSL_ASSERT(m_builder);
+ OSL_ASSERT(m_builder->getCurrentDebugLocation().get() != nullptr);
+- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
++ static_cast<unsigned int>(1),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ getCurrentDebugScope()));
+
+@@ -776,7 +783,8 @@ LLVM_Util::debug_set_location(ustring sourcefile, int sourceline)
+ }
+ if (newDebugLocation) {
+ llvm::DebugLoc debug_location =
+- llvm::DebugLoc::get(static_cast<unsigned int>(sourceline),
++ llvm::DILocation::get(sp->getContext(),
++ static_cast<unsigned int>(sourceline),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ sp,
+ inlineSite);
+@@ -958,7 +966,8 @@ LLVM_Util::new_builder (llvm::BasicBlock *block)
+ m_builder = new IRBuilder (block);
+ if (this->debug_is_enabled()) {
+ OSL_ASSERT(getCurrentDebugScope());
+- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
++ static_cast<unsigned int>(1),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ getCurrentDebugScope()));
+ }
+@@ -1386,7 +1395,13 @@ LLVM_Util::make_jit_execengine (std::string *err,
+ options.RelaxELFRelocations = false;
+ //options.DebuggerTuning = llvm::DebuggerKind::GDB;
+
++ // TODO: Find equivalent function for PrintMachineCode post LLVM 12
++#if OSL_LLVM_VERSION < 120
++ // This option disappeared from the TargetOptions struct in LLVM 12.
++ // It is instead accomplished with a MachineFunctionPrinterPass.
+ options.PrintMachineCode = dumpasm();
++#endif
++
+ engine_builder.setTargetOptions(options);
+
+ detect_cpu_features(requestedISA, !jit_fma());
+@@ -1715,14 +1730,14 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+
+ mpm.add(llvm::createReassociatePass());
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+ mpm.add(llvm::createAggressiveDCEPass());
+
+ mpm.add(llvm::createInstructionCombiningPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createJumpThreadingPass());
+ mpm.add(llvm::createSROAPass());
+@@ -1746,8 +1761,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+
+ // Eliminate and remove as much as possible up front
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+@@ -1784,7 +1801,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createInstructionCombiningPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createGlobalDCEPass());
+ mpm.add(llvm::createConstantMergePass());
+@@ -1803,8 +1820,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createLowerExpectIntrinsicPass());
+
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+@@ -1814,7 +1833,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ // optimizations, should attempt to reduce the number of times it is
+ // executed, if at all
+ mpm.add(llvm::createInstructionCombiningPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createSROAPass());
+ mpm.add(llvm::createInstructionCombiningPass());
+@@ -1822,7 +1841,16 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+ mpm.add(llvm::createGlobalOptimizerPass());
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createIPConstantPropagationPass());
++#else
++ // createIPConstantPropagationPass disappeared with LLVM 12.
++ // Comments in their PR indicate that IPSCCP is better, but I don't
++ // know if that means such a pass should be *right here*. I leave it
++ // to others who use opt==13 to continue to curate this particular
++ // list of passes.
++ mpm.add(llvm::createIPSCCPPass());
++#endif
+
+ mpm.add(llvm::createDeadArgEliminationPass());
+ mpm.add(llvm::createInstructionCombiningPass());
+@@ -1831,8 +1859,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createPostOrderFunctionAttrsLegacyPass());
+ mpm.add(llvm::createReversePostOrderFunctionAttrsPass());
+ mpm.add(llvm::createFunctionInliningPass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createArgumentPromotionPass());
+@@ -1845,8 +1875,9 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createTailCallEliminationPass());
+
+ mpm.add(llvm::createFunctionInliningPass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+-
++#endif
+
+ mpm.add(llvm::createIPSCCPPass());
+ mpm.add(llvm::createDeadArgEliminationPass());
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
new file mode 100644
index 00000000000..a312fa3bc86
--- /dev/null
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=12
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <=sys-devel/clang-13:=
+ sys-libs/zlib:=
+ dev-python/pybind11
+ partio? ( media-libs/partio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ ${FILESDIR}/${P}-llvm-11.patch
+ ${FILESDIR}/${P}-llvm-12.patch
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local gcc=$(tc-getCC)
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DLLVM_STATIC=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/
@ 2021-12-02 4:54 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-12-02 4:54 UTC (permalink / raw
To: gentoo-commits
commit: 4a75e3cc1b8326d387b156282e4f9635b4a97197
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 04:54:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 04:54:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a75e3cc
media-libs/osl: try again to force ilmbase
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 +++++++++++++++++++++++
media-libs/osl/osl-1.11.16.0-r2.ebuild | 7 ++--
2 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
new file mode 100644
index 000000000000..a8e5c1f23116
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
@@ -0,0 +1,49 @@
+Force finding OpenEXR / IlmBase instead of imath for now.
+--- a/src/cmake/modules/FindOpenEXR.cmake
++++ b/src/cmake/modules/FindOpenEXR.cmake
+@@ -39,43 +39,10 @@
+ #
+
+ # First, try to fine just the right config files
+-find_package(Imath CONFIG)
+-if (NOT TARGET Imath::Imath)
+- # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
+- find_package(IlmBase CONFIG)
+-endif ()
++find_package(IlmBase CONFIG)
+ find_package(OpenEXR CONFIG)
+
+-if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
+- # OpenEXR 3.x if both of these targets are found
+- set (FOUND_OPENEXR_WITH_CONFIG 1)
+- if (NOT OpenEXR_FIND_QUIETLY)
+- message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})")
+- endif ()
+-
+- # Mimic old style variables
+- set (OPENEXR_VERSION ${OpenEXR_VERSION})
+- get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+- get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+- get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES)
+- get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES)
+- set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
+- set (ILMBASE_FOUND true)
+-
+- get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES)
+- set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
+- set (OPENEXR_FOUND true)
+-
+- # Link with pthreads if required
+- find_package (Threads)
+- if (CMAKE_USE_PTHREADS_INIT)
+- list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+- endif ()
+-
+-elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
++if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
+ (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4))
+ # OpenEXR 2.4 or 2.5 with exported config
+ set (FOUND_OPENEXR_WITH_CONFIG 1)
diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
index ceada4f92ae6..3dd9f84f2cf7 100644
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -63,6 +63,10 @@ RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch
+)
+
llvm_check_deps() {
has_version -r "sys-devel/clang:${LLVM_SLOT}"
}
@@ -85,9 +89,6 @@ src_configure() {
local gcc=$(tc-getCC)
local mycmakeargs=(
- # Force use of OpenEXR/ilmbase
- -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON
-
# LLVM 10+ needs C++14
-DCMAKE_CXX_STANDARD=14
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/
@ 2022-02-15 19:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 967d8224791b0c4f99b837c84f17a4bb8b34f6c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 18:15:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967d8224
media-libs/osl: adjust to unslotted OpenEXR
Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../osl/files/osl-1.11.16.0-openexr-3-imath.patch | 126 ---------------------
.../osl/files/osl-1.12.4.1-openexr-3-imath.patch | 126 ---------------------
...1.11.17.0-r1.ebuild => osl-1.11.17.0-r2.ebuild} | 6 +-
3 files changed, 1 insertion(+), 257 deletions(-)
diff --git a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
deleted file mode 100644
index 10bb23fffa0e..000000000000
--- a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index f735b0f..8063f68 100644
---- a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -13,9 +13,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@
- #if OSL_USING_IMATH >= 3
--# include <Imath/ImathVec.h>
--# include <Imath/ImathMatrix.h>
--# include <Imath/ImathColor.h>
-+# include <Imath-3/ImathVec.h>
-+# include <Imath-3/ImathMatrix.h>
-+# include <Imath-3/ImathColor.h>
- #else
- // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
- // Imath files in OSL/Imathx, adding the decorations needed for them to
-diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
-index ee8284f..4988b44 100644
---- a/src/liboslquery/py_osl.h
-+++ b/src/liboslquery/py_osl.h
-@@ -26,7 +26,7 @@
- #include <OSL/oslquery.h>
-
- #if OSL_USING_IMATH >= 3
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
-diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h
-index d0b035f..1cbb28f 100644
---- a/src/include/OSL/Imathx/ImathColor.h
-+++ b/src/include/OSL/Imathx/ImathColor.h
-@@ -44,7 +44,7 @@
- //----------------------------------------------------
-
- #include "ImathVec.h"
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- // #include "half.h"
-
- #ifndef IMATH_HOSTDEVICE
-diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h
-index 1413c48..576b588 100644
---- a/src/include/OSL/Imathx/ImathFun.h
-+++ b/src/include/OSL/Imathx/ImathFun.h
-@@ -43,10 +43,10 @@
- //
- //-----------------------------------------------------------------------------
-
--#include <OpenEXR/ImathExport.h>
-+#include <OpenEXR-3/ImathExport.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathInt64.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathInt64.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
-
-diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h
-index 09fa419..ed19eaa 100644
---- a/src/include/OSL/Imathx/ImathLimits.h
-+++ b/src/include/OSL/Imathx/ImathLimits.h
-@@ -43,7 +43,7 @@
- //
- //----------------------------------------------------------------
-
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- #include <float.h>
- #include <limits.h>
-
-diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h
-index 65f386b..f2b10cc 100644
---- a/src/include/OSL/Imathx/ImathMatrix.h
-+++ b/src/include/OSL/Imathx/ImathMatrix.h
-@@ -43,12 +43,12 @@
- //
- //----------------------------------------------------------------
-
--#include <OpenEXR/ImathPlatform.h>
-+#include <OpenEXR-3/ImathPlatform.h>
- #include "ImathFun.h"
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathVec.h"
--#include <OpenEXR/ImathShear.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathShear.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- #include <cstring>
- #include <iostream>
-diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h
-index e52af61..4cd696b 100644
---- a/src/include/OSL/Imathx/ImathVec.h
-+++ b/src/include/OSL/Imathx/ImathVec.h
-@@ -43,10 +43,10 @@
- //
- //----------------------------------------------------
-
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathMath.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathMath.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- #include <iostream>
- #include <limits>
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 1d36ff1..6fc9d38 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -27,7 +27,7 @@
- using namespace OSL;
- using namespace OSL::pvt;
-
--#include <OpenEXR/ImfChannelList.h> // Just for OPENEXR_VERSION_STRING
-+#include <OpenEXR-3/ImfChannelList.h> // Just for OPENEXR_VERSION_STRING
-
- // avoid naming conflicts with MSVC macros
- #ifdef _MSC_VER
diff --git a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
deleted file mode 100644
index ffee5d8a543d..000000000000
--- a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index 29abe88..b9de57c 100644
---- a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -12,9 +12,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@
- #if OSL_USING_IMATH >= 3
--# include <Imath/ImathVec.h>
--# include <Imath/ImathMatrix.h>
--# include <Imath/ImathColor.h>
-+# include <Imath-3/ImathVec.h>
-+# include <Imath-3/ImathMatrix.h>
-+# include <Imath-3/ImathColor.h>
- #else
- // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
- // Imath files in OSL/Imathx, adding the decorations needed for them to
-diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h
-index d0b035f..1cbb28f 100644
---- a/src/include/OSL/Imathx/ImathColor.h
-+++ b/src/include/OSL/Imathx/ImathColor.h
-@@ -44,7 +44,7 @@
- //----------------------------------------------------
-
- #include "ImathVec.h"
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- // #include "half.h"
-
- #ifndef IMATH_HOSTDEVICE
-diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h
-index 1413c48..576b588 100644
---- a/src/include/OSL/Imathx/ImathFun.h
-+++ b/src/include/OSL/Imathx/ImathFun.h
-@@ -43,10 +43,10 @@
- //
- //-----------------------------------------------------------------------------
-
--#include <OpenEXR/ImathExport.h>
-+#include <OpenEXR-3/ImathExport.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathInt64.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathInt64.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
-
-diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h
-index 09fa419..ed19eaa 100644
---- a/src/include/OSL/Imathx/ImathLimits.h
-+++ b/src/include/OSL/Imathx/ImathLimits.h
-@@ -43,7 +43,7 @@
- //
- //----------------------------------------------------------------
-
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathNamespace.h>
- #include <float.h>
- #include <limits.h>
-
-diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h
-index a4063dd..678f970 100644
---- a/src/include/OSL/Imathx/ImathMatrix.h
-+++ b/src/include/OSL/Imathx/ImathMatrix.h
-@@ -43,12 +43,12 @@
- //
- //----------------------------------------------------------------
-
--#include <OpenEXR/ImathPlatform.h>
-+#include <OpenEXR-3/ImathPlatform.h>
- #include "ImathFun.h"
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathVec.h"
--#include <OpenEXR/ImathShear.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathShear.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- #include <cstring>
- #include <iostream>
-diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h
-index e52af61..4cd696b 100644
---- a/src/include/OSL/Imathx/ImathVec.h
-+++ b/src/include/OSL/Imathx/ImathVec.h
-@@ -43,10 +43,10 @@
- //
- //----------------------------------------------------
-
--#include <OpenEXR/ImathExc.h>
-+#include <OpenEXR-3/ImathExc.h>
- #include "ImathLimits.h"
--#include <OpenEXR/ImathMath.h>
--#include <OpenEXR/ImathNamespace.h>
-+#include <OpenEXR-3/ImathMath.h>
-+#include <OpenEXR-3/ImathNamespace.h>
-
- #include <iostream>
- #include <limits>
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 74dc557..74762ab 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -30,7 +30,7 @@
- using namespace OSL;
- using namespace OSL::pvt;
-
--#include <OpenEXR/ImfChannelList.h> // Just for OPENEXR_VERSION_STRING
-+#include <OpenEXR-3/ImfChannelList.h> // Just for OPENEXR_VERSION_STRING
-
- // avoid naming conflicts with MSVC macros
- #ifdef _MSC_VER
-diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
-index ee8284f..4988b44 100644
---- a/src/liboslquery/py_osl.h
-+++ b/src/liboslquery/py_osl.h
-@@ -26,7 +26,7 @@
- #include <OSL/oslquery.h>
-
- #if OSL_USING_IMATH >= 3
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
diff --git a/media-libs/osl/osl-1.11.17.0-r1.ebuild b/media-libs/osl/osl-1.11.17.0-r2.ebuild
similarity index 96%
rename from media-libs/osl/osl-1.11.17.0-r1.ebuild
rename to media-libs/osl/osl-1.11.17.0-r2.ebuild
index 31e118f6baa9..8b62492f3cd0 100644
--- a/media-libs/osl/osl-1.11.17.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r2.ebuild
@@ -34,7 +34,7 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
- media-libs/openexr:3=
+ media-libs/openexr:=
dev-libs/imath:=
>=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
@@ -64,10 +64,6 @@ RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.16.0-openexr-3-imath.patch
-)
-
llvm_check_deps() {
has_version -r "sys-devel/clang:${LLVM_SLOT}"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-15 19:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02 4:54 [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-02-15 19:51 Sam James
2021-06-10 0:51 Sam James
2020-07-30 22:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox