Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88a51c48fe1b
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e16ba3e5ea98
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 25, 2021

  1. osl, revbump for x86 (#6098)

    @Begasus
    Begasus authored Jul 25, 2021
    Copy the full SHA
    e16ba3e View commit details
Showing with 32 additions and 5 deletions.
  1. +9 −5 media-libs/osl/osl-1.11.14.2.recipe
  2. +23 −0 media-libs/osl/patches/osl-1.11.14.2-gcc2.patchset
14 changes: 9 additions & 5 deletions media-libs/osl/osl-1.11.14.2.recipe
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,15 @@ 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="2"
REVISION="3"
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"
@@ -52,11 +56,11 @@ REQUIRES="
lib:libIex_3_0$secondaryArchSuffix
lib:libIlmThread_3_0$secondaryArchSuffix
lib:libImath_3_0$secondaryArchSuffix
lib:libLLVM_9$secondaryArchSuffix
lib:libOpenEXR_3_0$secondaryArchSuffix
lib:libOpenEXRUtil_3_0$secondaryArchSuffix
lib:libOpenImageIO$secondaryArchSuffix
lib:libpartio$secondaryArchSuffix
lib:libLLVM_9$secondaryArchSuffix
lib:libopenimageio$secondaryArchSuffix
lib:libpugixml$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
@@ -89,10 +93,10 @@ BUILD_REQUIRES="
devel:libIex_3_0$secondaryArchSuffix
devel:libIlmThread_3_0$secondaryArchSuffix
devel:libImath_3_0$secondaryArchSuffix
devel:libLLVM_9$secondaryArchSuffix
devel:libOpenEXR_3_0$secondaryArchSuffix
devel:libOpenEXRUtil_3_0$secondaryArchSuffix
devel:libLLVM_9$secondaryArchSuffix
devel:libopenimageio$secondaryArchSuffix >= 2.2
devel:libOpenImageIO$secondaryArchSuffix >= 2.2
devel:libpartio$secondaryArchSuffix
devel:libpugixml$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
23 changes: 23 additions & 0 deletions media-libs/osl/patches/osl-1.11.14.2-gcc2.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 53d72d93b7264cb2ace080cee27d8b50bb08df78 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
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