diff --git a/media-libs/osl/osl-1.11.14.2.recipe b/media-libs/osl/osl-1.11.14.2.recipe index 823c25b40..866e16101 100644 --- a/media-libs/osl/osl-1.11.14.2.recipe +++ b/media-libs/osl/osl-1.11.14.2.recipe @@ -5,15 +5,11 @@ for describing materials, lights, displacement, and pattern generation." HOMEPAGE="https://github.com/imageworks/OpenShadingLanguage" COPYRIGHT="2009-2020 Sony Pictures Imageworks Inc." LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="$HOMEPAGE/archive/Release-$portVersion.tar.gz" CHECKSUM_SHA256="2bd4c7b29993499d0d0f011f71d0eb8e204b67e766b35462fdec1e3858dce981" SOURCE_DIR="OpenShadingLanguage-Release-$portVersion" PATCHES="osl-$portVersion.patchset" -if [ $effectiveTargetArchitecture = x86 ]; then - PATCHES+=" - osl-$portVersion-gcc2.patchset" -fi ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -60,7 +56,7 @@ REQUIRES=" lib:libOpenEXR_3_0$secondaryArchSuffix lib:libOpenEXRUtil_3_0$secondaryArchSuffix lib:libOpenImageIO$secondaryArchSuffix - lib:libpartio$secondaryArchSuffix +# lib:libpartio$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -97,7 +93,7 @@ BUILD_REQUIRES=" devel:libOpenEXR_3_0$secondaryArchSuffix devel:libOpenEXRUtil_3_0$secondaryArchSuffix devel:libOpenImageIO$secondaryArchSuffix >= 2.2 - devel:libpartio$secondaryArchSuffix +# devel:libpartio$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -131,7 +127,7 @@ BUILD() -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DUSE_PYTHON=OFF \ -DVERBOSE=ON \ - -DUSE_PARTIO=ON \ + -DUSE_PARTIO=OFF \ -DOSL_BUILD_TESTS=OFF \ -DOSL_BUILD_SHADERS=OFF \ -DINSTALL_DOCS=OFF -L diff --git a/media-libs/osl/patches/osl-1.11.14.2-gcc2.patchset b/media-libs/osl/patches/osl-1.11.14.2-gcc2.patchset deleted file mode 100644 index a18982a0c..000000000 --- a/media-libs/osl/patches/osl-1.11.14.2-gcc2.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 53d72d93b7264cb2ace080cee27d8b50bb08df78 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 cf7efa6..cea61cb 100644 ---- a/src/liboslexec/pointcloud.cpp -+++ b/src/liboslexec/pointcloud.cpp -@@ -244,8 +244,8 @@ RendererServices::pointcloud_search (ShaderGlobals *sg, - return 0; // No "position" attribute -- fail - } - -- static_assert (sizeof(size_t) == sizeof(Partio::ParticleIndex), -- "Partio ParticleIndex should be the size of a size_t"); -+// static_assert (sizeof(size_t) == sizeof(Partio::ParticleIndex), -+// "Partio ParticleIndex should be 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.2