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: bf433d027633
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 88a51c48fe1b
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Jul 25, 2021

  1. osl, bump version (#6097)

    @Begasus
    Begasus authored Jul 25, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    88a51c4 View commit details
97 changes: 48 additions & 49 deletions media-libs/osl/osl-1.10.13.recipe → media-libs/osl/osl-1.11.14.2.recipe
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,10 @@ COPYRIGHT="2009-2020 Sony Pictures Imageworks Inc."
LICENSE="BSD (3-clause)"
REVISION="2"
SOURCE_URI="$HOMEPAGE/archive/Release-$portVersion.tar.gz"
CHECKSUM_SHA256="c716b0743a9eec706f69c80dc55d2fcedbb53062dd6a1313f3822665b2ab9f5f"
CHECKSUM_SHA256="2bd4c7b29993499d0d0f011f71d0eb8e204b67e766b35462fdec1e3858dce981"
SOURCE_DIR="OpenShadingLanguage-Release-$portVersion"
PATCHES="osl-$portVersion.patchset"
if [ $effectiveTargetArchitecture = x86 ]; then
PATCHES+="
osl-$portVersion-gcc2.patch"
fi

ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"

@@ -25,21 +22,21 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi

libVersion="$portVersion"
libVersion="1.11.14"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

PROVIDES="
osl$secondaryArchSuffix = $libVersionCompat
osl$secondaryArchSuffix = $portVersion
cmd:oslc$commandSuffix
cmd:oslinfo$commandSuffix
cmd:testrender$commandSuffix
cmd:testshade$commandSuffix
cmd:testshade_dso$commandSuffix
# cmd:testrender$commandSuffix
# cmd:testshade$commandSuffix
# cmd:testshade_dso$commandSuffix
lib:liboslcomp$secondaryArchSuffix
lib:liboslexec$secondaryArchSuffix
lib:liboslnoise$secondaryArchSuffix
lib:liboslquery$secondaryArchSuffix
lib:libtestshade$secondaryArchSuffix
# lib:libtestshade$secondaryArchSuffix
lib:osl.imageio$secondaryArchSuffix
"
REQUIRES="
@@ -52,24 +49,26 @@ 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:libIex_3_0$secondaryArchSuffix
lib:libIlmThread_3_0$secondaryArchSuffix
lib:libImath_3_0$secondaryArchSuffix
lib:libOpenEXR_3_0$secondaryArchSuffix
lib:libOpenEXRUtil_3_0$secondaryArchSuffix
lib:libpartio$secondaryArchSuffix
lib:libLLVM_9$secondaryArchSuffix
lib:libopenimageio$secondaryArchSuffix
lib:libpugixml$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"

PROVIDES_devel="
osl${secondaryArchSuffix}_devel = $libVersionCompat
osl${secondaryArchSuffix}_devel = $portVersion
devel:liboslcomp$secondaryArchSuffix
devel:liboslexec$secondaryArchSuffix
devel:liboslnoise$secondaryArchSuffix
devel:liboslquery$secondaryArchSuffix
devel:libtestshade$secondaryArchSuffix
# devel:libtestshade$secondaryArchSuffix
devel:osl.imageio$secondaryArchSuffix
"
REQUIRES_devel="
@@ -79,23 +78,24 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
gcc${secondaryArchSuffix}_syslibs_devel
devel:libboost_atomic$secondaryArchSuffix >= 1.69
devel:libboost_chrono$secondaryArchSuffix >= 1.69
devel:libboost_date_time$secondaryArchSuffix >= 1.69
devel:libboost_filesystem$secondaryArchSuffix >= 1.69
devel:libboost_serialization$secondaryArchSuffix >= 1.69
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:libboost_atomic$secondaryArchSuffix >= 1.70.0
devel:libboost_chrono$secondaryArchSuffix >= 1.70.0
devel:libboost_date_time$secondaryArchSuffix >= 1.70.0
devel:libboost_filesystem$secondaryArchSuffix >= 1.70.0
devel:libboost_serialization$secondaryArchSuffix >= 1.70.0
devel:libboost_system$secondaryArchSuffix >= 1.70.0
devel:libboost_thread$secondaryArchSuffix >= 1.70.0
devel:libboost_wave$secondaryArchSuffix >= 1.70.0
devel:libIex_3_0$secondaryArchSuffix
devel:libIlmThread_3_0$secondaryArchSuffix
devel:libImath_3_0$secondaryArchSuffix
devel:libOpenEXR_3_0$secondaryArchSuffix
devel:libOpenEXRUtil_3_0$secondaryArchSuffix
devel:libLLVM_9$secondaryArchSuffix
devel:libopenimageio$secondaryArchSuffix >= 2.0
devel:libopenimageio$secondaryArchSuffix >= 2.2
devel:libpartio$secondaryArchSuffix
devel:libpugixml$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -114,47 +114,46 @@ defineDebugInfoPackage osl$secondaryArchSuffix \
$libDir/liboslexec.so.$libVersion \
$libDir/liboslnoise.so.$libVersion \
$libDir/liboslquery.so.$libVersion \
$libDir/libtestshade.so.$libVersion \
$libDir/osl.imageio.so.$libVersion \
$libDir/osl.imageio.so \
$commandBinDir/oslc$commandSuffix \
$commandBinDir/oslinfo$commandSuffix \
$commandBinDir/testrender$commandSuffix \
$commandBinDir/testshade$commandSuffix \
$commandBinDir/testshade_dso$commandSuffix
$commandBinDir/oslinfo$commandSuffix

BUILD()
{
mkdir -p build
cd build
cmake .. \
export LDFLAGS=-lnetwork
cmake -B build -S . \
$cmakeDirArgs \
-DCMAKE_CXX_FLAGS="-DBOOST_NO_CXX11_CONSTEXPR" \
-DCMAKE_INSTALL_BINDIR=$commandBinDir
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DUSE_PYTHON=OFF \
-DVERBOSE=ON \
-DUSE_PARTIO=ON \
-DOSL_BUILD_TESTS=OFF \
-DOSL_BUILD_SHADERS=OFF \
-DINSTALL_DOCS=OFF -L

make $jobArgs
make -C build $jobArgs
}

INSTALL()
{
cd build
make install
make -C build install

prepareInstalledDevelLibs \
liboslcomp \
liboslexec \
liboslnoise \
liboslquery \
libtestshade \
osl.imageio

fixPkgconfig

packageEntries devel \
$developDir
$developDir \
$libDir/cmake
}

TEST()
{
cd build
make test
make -C build test
}
23 changes: 0 additions & 23 deletions media-libs/osl/patches/osl-1.10.13-gcc2.patch
View file

This file was deleted.

30 changes: 0 additions & 30 deletions media-libs/osl/patches/osl-1.10.13.patchset
View file

This file was deleted.

28 changes: 28 additions & 0 deletions media-libs/osl/patches/osl-1.11.14.2.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From ac34a29ade87e44b2ac9abf068bf5e527bf2b656 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 14 Jul 2021 13:37:00 +0000
Subject: Import upstream patch


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1031903..1d0e406 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
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)
--
2.30.2