From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- media-libs/osl/Manifest | 5 +- media-libs/osl/files/osl-1.11.17.0-llvm14.patch | 35 ++++++++ media-libs/osl/osl-1.11.16.0-r2.ebuild | 111 ----------------------- media-libs/osl/osl-1.11.17.0-r3.ebuild | 108 ----------------------- media-libs/osl/osl-1.11.17.0-r4.ebuild | 112 ++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 222 deletions(-) create mode 100644 media-libs/osl/files/osl-1.11.17.0-llvm14.patch delete mode 100644 media-libs/osl/osl-1.11.16.0-r2.ebuild delete mode 100644 media-libs/osl/osl-1.11.17.0-r3.ebuild create mode 100644 media-libs/osl/osl-1.11.17.0-r4.ebuild (limited to 'media-libs/osl') diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index 070fa2980d2e..6d258574a2cb 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,8 +1,7 @@ AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953 -DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b +AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16 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 2635 BLAKE2B 24f64387c1eae64bfeb8268d1116244d1e0c848c977aa3c5a6df23dc8f345a13c3ea9d9bc31a41ecd5931b43945ceb0cd89693cc4c0f7d8257822d21aa05baa3 SHA512 ad335e35b5d2e99bc552511fe7192e19b73fb5cc8382ce935db31540362bcd7961566a432c2d527dbf57bf793f8229b7202700a53aa090150f249465dc453233 -EBUILD osl-1.11.17.0-r3.ebuild 2704 BLAKE2B 53468c8ae8a018fd9ceffba0e0c4879119eb0666a3be713dcc174e73e09cdd1cd7ccdb1851de77ebf752a29d9b4f45aeedf85138e580912cfc2fe2bf2eea65e5 SHA512 51cc54c36da4769594d578c0832fa9229b396f1df7b6ffaf7c110f98fbe3356a35d663840874a3a6e5c9cc372b56f6ecda24c28bed68308316d921df9f17400c +EBUILD osl-1.11.17.0-r4.ebuild 2761 BLAKE2B a8cb219690f439bb93af1d8f88e7fc6c66762d07c0ab01022df7c68150c6bbcd4ce7beeedcc6ea158946c6f20e4afd45378cd2a62aa25a9be754f604b23f894a SHA512 9b34d2a55c0151ff812966e91e300f52c41be8cc22922640eb240d8c4a3fddde4221660134bcfd3f4177f1b3d5acf0a232b7f9b7d432beaba32fc9d839219246 EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce diff --git a/media-libs/osl/files/osl-1.11.17.0-llvm14.patch b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch new file mode 100644 index 000000000000..6a20ce31c589 --- /dev/null +++ b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch @@ -0,0 +1,35 @@ +Backport of the following patch from git main to 1.11.17.0: + +From 8a8c2fd5e6c016eb2d22d2522bdeb9f165f319fa Mon Sep 17 00:00:00 2001 +From: Larry Gritz +Date: Mon, 18 Apr 2022 11:45:34 -0700 +Subject: [PATCH 1/3] Support for LLVM 14 + +API changes we had to take into account: +* TargetRegistry.h location +* No more DisableTailCalls field in PassManagerBuilder. + +Signed-off-by: Larry Gritz +--- + .github/workflows/ci.yml | 10 +++++----- + INSTALL.md | 2 +- + src/build-scripts/build_llvm.bash | 2 +- + src/liboslexec/llvm_util.cpp | 7 ++++++- + 4 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index b30c89318..22d4134ba 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -45,7 +45,11 @@ + #include + #include + #include ++#if OSL_LLVM_VERSION < 140 + #include ++#else ++#include ++#endif + + #include + #include diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild deleted file mode 100644 index fe9c14961b1f..000000000000 --- a/media-libs/osl/osl-1.11.16.0-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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=13 - -CMAKE_REMOVE_MODULES_LIST=() - -inherit cmake llvm toolchain-funcs python-single-r1 - -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" - -LICENSE="BSD" -SLOT="0/11" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -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[@]%:*} python" - -# See bug #821202 for openimageio < dep -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - media-libs/openexr:0= - media-libs/ilmbase:= - 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=( - 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[@]%:*} python" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openimageio-2.3.12.0:= - 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=( + 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[@]%:*} python" + +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=dev-libs/imath-3.1.4-r2:= + >=media-libs/openimageio-2.3.12.0:= +