From f973a757dc7eece13f5abfd327a1634cf223342f Mon Sep 17 00:00:00 2001 From: kenmays Date: Fri, 12 Feb 2021 12:31:25 -0800 Subject: [PATCH] osl: bump to v1.10.13 (#5641) --- .../{osl-1.10.7.recipe => osl-1.10.13.recipe} | 40 ++++++++++--------- media-libs/osl/patches/osl-1.10.13-gcc2.patch | 23 +++++++++++ ...l-1.10.7.patchset => osl-1.10.13.patchset} | 8 ++-- 3 files changed, 48 insertions(+), 23 deletions(-) rename media-libs/osl/{osl-1.10.7.recipe => osl-1.10.13.recipe} (82%) create mode 100644 media-libs/osl/patches/osl-1.10.13-gcc2.patch rename media-libs/osl/patches/{osl-1.10.7.patchset => osl-1.10.13.patchset} (86%) diff --git a/media-libs/osl/osl-1.10.7.recipe b/media-libs/osl/osl-1.10.13.recipe similarity index 82% rename from media-libs/osl/osl-1.10.7.recipe rename to media-libs/osl/osl-1.10.13.recipe index 89c2a63ca..0b562d259 100644 --- a/media-libs/osl/osl-1.10.7.recipe +++ b/media-libs/osl/osl-1.10.13.recipe @@ -1,18 +1,20 @@ -SUMMARY="Advanced shading language for production GI renderers" +SUMMARY="Programable shading language for advanced renderers" DESCRIPTION="Open Shading Language (OSL) is a small but rich language for \ programmable shading in advanced renderers and other applications, ideal \ for describing materials, lights, displacement, and pattern generation." HOMEPAGE="https://github.com/imageworks/OpenShadingLanguage" -COPYRIGHT="2009-2017 Sony Pictures Imageworks Inc." +COPYRIGHT="2009-2020 Sony Pictures Imageworks Inc." LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="1" SOURCE_URI="$HOMEPAGE/archive/Release-$portVersion.tar.gz" -CHECKSUM_SHA256="0c4cce505e2803baa55db11744adb72fad854c2a4cc4f02592f79324ac5bfda1" +CHECKSUM_SHA256="c716b0743a9eec706f69c80dc55d2fcedbb53062dd6a1313f3822665b2ab9f5f" SOURCE_DIR="OpenShadingLanguage-Release-$portVersion" PATCHES="osl-$portVersion.patchset" - -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +if [ "$targetArchitecture" = x86_gcc2 ]; then +PATCHES_2="osl-$portVersion-gcc2.patch" +fi +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. commandSuffix=$secondaryArchSuffix @@ -49,11 +51,11 @@ REQUIRES=" lib:libboost_system$secondaryArchSuffix lib:libboost_thread$secondaryArchSuffix lib:libboost_wave$secondaryArchSuffix - lib:libHalf_2_4$secondaryArchSuffix - lib:libIex_2_4$secondaryArchSuffix - lib:libilmimf_2_4$secondaryArchSuffix - lib:libIlmThread_2_4$secondaryArchSuffix - lib:libImath_2_4$secondaryArchSuffix + lib:libHalf_2_5$secondaryArchSuffix + lib:libIex_2_5$secondaryArchSuffix + lib:libilmimf_2_5$secondaryArchSuffix + lib:libIlmThread_2_5$secondaryArchSuffix + lib:libImath_2_5$secondaryArchSuffix lib:libLLVM_9$secondaryArchSuffix lib:libopenimageio$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix @@ -75,7 +77,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - gcc_syslibs_devel$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs_devel devel:libboost_atomic$secondaryArchSuffix >= 1.69 devel:libboost_chrono$secondaryArchSuffix >= 1.69 devel:libboost_date_time$secondaryArchSuffix >= 1.69 @@ -84,11 +86,11 @@ BUILD_REQUIRES=" devel:libboost_system$secondaryArchSuffix >= 1.69 devel:libboost_thread$secondaryArchSuffix >= 1.69 devel:libboost_wave$secondaryArchSuffix >= 1.69 - devel:libHalf_2_4$secondaryArchSuffix - devel:libIex_2_4$secondaryArchSuffix - devel:libilmimf_2_4$secondaryArchSuffix - devel:libIlmThread_2_4$secondaryArchSuffix - devel:libImath_2_4$secondaryArchSuffix + devel:libHalf_2_5$secondaryArchSuffix + devel:libIex_2_5$secondaryArchSuffix + devel:libilmimf_2_5$secondaryArchSuffix + devel:libIlmThread_2_5$secondaryArchSuffix + devel:libImath_2_5$secondaryArchSuffix devel:libLLVM_9$secondaryArchSuffix devel:libopenimageio$secondaryArchSuffix >= 2.0 devel:libpartio$secondaryArchSuffix @@ -103,7 +105,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python " defineDebugInfoPackage osl$secondaryArchSuffix \ diff --git a/media-libs/osl/patches/osl-1.10.13-gcc2.patch b/media-libs/osl/patches/osl-1.10.13-gcc2.patch new file mode 100644 index 000000000..a6cae364d --- /dev/null +++ b/media-libs/osl/patches/osl-1.10.13-gcc2.patch @@ -0,0 +1,23 @@ +From 493df5691a40ee6d9a8b29653090281424b67187 Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Tue, 26 Jan 2021 14:58:40 +0000 +Subject: Fix pointcloud Partio::ParticleIndex for Haiku x86 + + +diff --git a/src/liboslexec/pointcloud.cpp b/src/liboslexec/pointcloud.cpp +index c0a0818..81c65e3 100644 +--- a/src/liboslexec/pointcloud.cpp ++++ b/src/liboslexec/pointcloud.cpp +@@ -383,8 +383,8 @@ RendererServices::pointcloud_get (ShaderGlobals *sg, + count = maxn; + } + +- static_assert (sizeof(size_t) == sizeof(Partio::ParticleIndex), +- "Only will work if Partio ParticleIndex is the size of a size_t"); ++// static_assert (sizeof(size_t) == sizeof(Partio::ParticleIndex), ++// "Only will work if Partio ParticleIndex is the size of a size_t"); + // FIXME -- if anybody cares about an architecture in which that is not + // the case, we can easily allocate local space to retrieve the indices, + // then copy them back to the caller's indices. +-- +2.30.0 diff --git a/media-libs/osl/patches/osl-1.10.7.patchset b/media-libs/osl/patches/osl-1.10.13.patchset similarity index 86% rename from media-libs/osl/patches/osl-1.10.7.patchset rename to media-libs/osl/patches/osl-1.10.13.patchset index b8067bc2a..d88d5289d 100644 --- a/media-libs/osl/patches/osl-1.10.7.patchset +++ b/media-libs/osl/patches/osl-1.10.13.patchset @@ -1,4 +1,4 @@ -From 240fc093a14484a4e2ce42bea8df394726796b56 Mon Sep 17 00:00:00 2001 +From ff9f32a97dd5bc4ddce3d9bd093c7c1dc175be29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 30 Dec 2017 16:59:09 +0100 Subject: Shaders install path @@ -15,10 +15,10 @@ index 9b263ff..1f30521 100644 - DESTINATION shaders) + DESTINATION data/osl/shaders) diff --git a/src/shaders/MaterialX/CMakeLists.txt b/src/shaders/MaterialX/CMakeLists.txt -index dc897a7..8664c4d 100644 +index 88b52f3..f343d42 100644 --- a/src/shaders/MaterialX/CMakeLists.txt +++ b/src/shaders/MaterialX/CMakeLists.txt -@@ -172,5 +172,5 @@ add_custom_target (mxshaders ALL +@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL SOURCES ${shader_source} ${mx_shader_headers}) install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls} @@ -26,5 +26,5 @@ index dc897a7..8664c4d 100644 + DESTINATION data/osl/shaders/MaterialX) -- -2.15.1 +2.30.0