gentoo resync : 20.03.2022

7 files changed, 26 insertions, 415 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index ebc112f9c7ed..881f9d19e134 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,12 +1,8 @@
-AUX osl-1.11.15.0-fix-cmake.patch 644 BLAKE2B cd51bc2f59a59a80981d357c38a89ea2b7d4e128470616e9851ef28a0c55f3292e9ace6c681b7f15c5752b41ce1f07266adb97fffa5f1923c55242207a674fe9 SHA512 10546e4771f055fb06824113c9c77ec8cc8ea9929343a8a5a68a3ea7fc7d7e2ccb983269eed66782569275e6262fde872b56ce30008ee797ed65566f0f1359ba
 AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953
-AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
-AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
-DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
 DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
-DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
-EBUILD osl-1.11.15.0-r1.ebuild 2562 BLAKE2B 40df90315638c1651e2c5ab0e141de50eb59146baf900808a2db9757706f79e585f2904697fe479144d960f2c800c0d615203c1ba72904fc71589f39266e24a1 SHA512 108fc337ed3b098c32c8fa1a4c2f6d695b605aea00f4b65786413f722cbb04e77b4e9df64d76d181d4d123eed896d7603873fa0dff30e72ed429917638568004
+DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
+DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
 EBUILD osl-1.11.16.0-r2.ebuild 2633 BLAKE2B d1e43e8757c4e1ef6ff3ba2a4f1a7fd6e49ba6ca8c184255ca3c37ff48d72cbebf71f6bd264788dff705510122940e1513e624b6dbad3f26faa301032e1965b3 SHA512 8e100f80a8d7ab1c9fdaa17f0c0b7416db60097a3f1210771f0eff9f4fc83294fc81dae7a80331071a8018a5e48de8929da252acb997a9bae0b28c72c6ba7670
-EBUILD osl-1.12.0.2-r3.ebuild 2343 BLAKE2B b8bed7e7922021e888578a3471858097f8a4a30813922ed4c9e5ce8dec9def9c97f90fac719290f3be6d86b7d1ac8458838b78e9aa499a8f838c15c013572abb SHA512 1c8b2863239a25734e3638b052ffb3a0fcf3f3229652dc7e8b2c22b173c9b51342c335c315b9e4063b9aaa296a78cabb4e139fa5b66110d0b2e717a209182d67
-EBUILD osl-1.12.0.2.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
+EBUILD osl-1.11.17.0-r3.ebuild 2704 BLAKE2B 53468c8ae8a018fd9ceffba0e0c4879119eb0666a3be713dcc174e73e09cdd1cd7ccdb1851de77ebf752a29d9b4f45aeedf85138e580912cfc2fe2bf2eea65e5 SHA512 51cc54c36da4769594d578c0832fa9229b396f1df7b6ffaf7c110f98fbe3356a35d663840874a3a6e5c9cc372b56f6ecda24c28bed68308316d921df9f17400c
+EBUILD osl-1.12.4.1-r2.ebuild 2286 BLAKE2B d801190905ee4c7ef888fee39b1aeb6ecb3a9548bc58c5413b8f2fa1c9bbdf1abec6fff4cefcbec8f6784631461b38594c82eb8139c0c50fd29cbfdd239a7f19 SHA512 ac65dc72efd04d7b1078a66e19f3aa67c08dd50c5aaf451b8149650238bc5da3a83cefb1d274ae6441862379da7d0a59c0aa48d31ca4689d63be9c0b173c54da
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
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
deleted file mode 100644
index 020370d54bca..000000000000
--- a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
-
-From: debaetsd <debaetsd@gmail.com>
-Date: Tue, 29 Dec 2020 22:01:21 +0100
-Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
-         FILE ${OSL_TARGETS_EXPORT_NAME}
-         NAMESPACE ${PROJECT_NAME}::)
- 
--
--
--
--osl_add_all_tests()
--
-+if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-+	osl_add_all_tests()
-+endif ()
- 
- if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-     include (packaging)
-
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
deleted file mode 100644
index a47bcd4e47da..000000000000
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index dcf9ac863f73..000000000000
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-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.11.15.0-r1.ebuild b/media-libs/osl/osl-1.11.17.0-r3.ebuild
index 5f806806db4c..3f98563dd7a0 100644
--- a/media-libs/osl/osl-1.11.15.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 # check this on updates
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
 CMAKE_REMOVE_MODULES_LIST=()
 
@@ -17,8 +17,10 @@ HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/
 SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
+# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
+SLOT="0/$(ver_cut 2).1"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 X86_CPU_FEATURES=(
@@ -29,12 +31,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 
-# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:=
-	<media-libs/openimageio-2.3:=
+	>=media-libs/openexr-3:0=
+	>=dev-libs/imath-3.1.4-r2:=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib
 	partio? ( media-libs/partio )
@@ -57,10 +59,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-cmake.patch
-)
-
 # Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
@@ -85,7 +83,7 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	local gcc=$(tc-getCC)
+	local gcc="$(tc-getCC)"
 
 	local mycmakeargs=(
 		# LLVM 10+ needs C++14
@@ -95,7 +93,8 @@ src_configure() {
 		-DUSE_CCACHE=OFF
 		-DLLVM_STATIC=OFF
 		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DOSL_BUILD_TESTS=$(usex test)
+		# Breaks build for now: bug #827949
+		#-DOSL_BUILD_TESTS=$(usex test)
 		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
 		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
 		-DSTOP_ON_WARNING=OFF
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
deleted file mode 100644
index 155cb0665f23..000000000000
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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 ~arm ~arm64 ~ppc64 ~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 Makefile 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
-}
diff --git a/media-libs/osl/osl-1.12.0.2-r3.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
index 1006a0b16368..8678e5483bcb 100644
--- a/media-libs/osl/osl-1.12.0.2-r3.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-# check this on updates
-LLVM_MAX_SLOT=12
+# Check this on updates
+LLVM_MAX_SLOT=13
 
 inherit cmake llvm toolchain-funcs python-single-r1
 
 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"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}-dev.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}-dev"
 
 LICENSE="BSD"
 SLOT="0"
@@ -27,12 +28,11 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:=
-	<media-libs/openimageio-2.3:=
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.3.12.0:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (
@@ -56,15 +56,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	${FILESDIR}/${P}-llvm-11.patch
-	${FILESDIR}/${P}-llvm-12.patch
-)
-
 # Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch
+)
 
 llvm_check_deps() {
 	has_version -r "sys-devel/clang:${LLVM_SLOT}"