diff --git a/media-libs/osl/osl-1.11.14.2.recipe b/media-libs/osl/osl1.11-1.11.17.0.recipe similarity index 66% rename from media-libs/osl/osl-1.11.14.2.recipe rename to media-libs/osl/osl1.11-1.11.17.0.recipe index 8b0593a6c..a0a7eab74 100644 --- a/media-libs/osl/osl-1.11.14.2.recipe +++ b/media-libs/osl/osl1.11-1.11.17.0.recipe @@ -5,11 +5,10 @@ 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="4" +REVISION="1" SOURCE_URI="$HOMEPAGE/archive/Release-$portVersion.tar.gz" -CHECKSUM_SHA256="2bd4c7b29993499d0d0f011f71d0eb8e204b67e766b35462fdec1e3858dce981" +CHECKSUM_SHA256="4d23cf742f7917ea534408a1a491da8cfa245eed66b32f32d1a2785cb6a95735" SOURCE_DIR="OpenShadingLanguage-Release-$portVersion" -PATCHES="osl-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -22,11 +21,11 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="1.11.14" +libVersion="1.11.17" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - osl$secondaryArchSuffix = $portVersion + osl1.11$secondaryArchSuffix = $portVersion cmd:oslc$commandSuffix cmd:oslinfo$commandSuffix # cmd:testrender$commandSuffix @@ -49,12 +48,12 @@ REQUIRES=" lib:libboost_system$secondaryArchSuffix lib:libboost_thread$secondaryArchSuffix lib:libboost_wave$secondaryArchSuffix - 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:libIex_3_2$secondaryArchSuffix + lib:libIlmThread_3_2$secondaryArchSuffix + lib:libImath_3_1$secondaryArchSuffix + lib:libLLVM_12$secondaryArchSuffix + lib:libOpenEXR_3_2$secondaryArchSuffix + lib:libOpenEXRUtil_3_2$secondaryArchSuffix lib:libOpenImageIO$secondaryArchSuffix # lib:libpartio$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix @@ -63,7 +62,7 @@ REQUIRES=" " PROVIDES_devel=" - osl${secondaryArchSuffix}_devel = $portVersion + osl1.11${secondaryArchSuffix}_devel = $portVersion devel:liboslcomp$secondaryArchSuffix devel:liboslexec$secondaryArchSuffix devel:liboslnoise$secondaryArchSuffix @@ -72,27 +71,29 @@ PROVIDES_devel=" devel:osl.imageio$secondaryArchSuffix " REQUIRES_devel=" - osl$secondaryArchSuffix == $portVersion base + osl1.11$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel gcc${secondaryArchSuffix}_syslibs_devel - 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:libLLVM_9$secondaryArchSuffix - devel:libOpenEXR_3_0$secondaryArchSuffix - devel:libOpenEXRUtil_3_0$secondaryArchSuffix - devel:libOpenImageIO$secondaryArchSuffix >= 2.2 + devel:libboost_atomic$secondaryArchSuffix >= 1.83.0 + devel:libboost_chrono$secondaryArchSuffix >= 1.83.0 + devel:libboost_date_time$secondaryArchSuffix >= 1.83.0 + devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0 + devel:libboost_serialization$secondaryArchSuffix >= 1.83.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libboost_thread$secondaryArchSuffix >= 1.83.0 + devel:libboost_wave$secondaryArchSuffix >= 1.83.0 + devel:libdeflate$secondaryArchSuffix + devel:libfmt$secondaryArchSuffix + devel:libIex_3_2$secondaryArchSuffix + devel:libIlmThread_3_2$secondaryArchSuffix + devel:libImath_3_1$secondaryArchSuffix + devel:libLLVM_12$secondaryArchSuffix + devel:libOpenEXR_3_2$secondaryArchSuffix + devel:libOpenEXRUtil_3_2$secondaryArchSuffix + devel:libOpenImageIO$secondaryArchSuffix >= 2.3 # devel:libpartio$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix devel:libxml2$secondaryArchSuffix @@ -100,16 +101,17 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:bison - cmd:clang_9 + cmd:clang_12 cmd:cmake cmd:flex cmd:gcc$secondaryArchSuffix + cmd:iconvert # move tools back into main OIIO? cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python + cmd:python3 " -defineDebugInfoPackage osl$secondaryArchSuffix \ +defineDebugInfoPackage osl1.11$secondaryArchSuffix \ $libDir/liboslcomp.so.$libVersion \ $libDir/liboslexec.so.$libVersion \ $libDir/liboslnoise.so.$libVersion \ @@ -118,11 +120,19 @@ defineDebugInfoPackage osl$secondaryArchSuffix \ $commandBinDir/oslc$commandSuffix \ $commandBinDir/oslinfo$commandSuffix +PATCH() +{ + # Use python3 binary instead of unversioned python + sed -i -e "s|COMMAND python|COMMAND python3|" $(find . -iname CMakeLists.txt) +} + BUILD() { export LDFLAGS=-lnetwork cmake -B build -S . \ $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_FLAGS="-DBOOST_NO_CXX11_CONSTEXPR" \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DUSE_PYTHON=OFF \ @@ -130,8 +140,7 @@ BUILD() -DUSE_PARTIO=OFF \ -DOSL_BUILD_TESTS=OFF \ -DOSL_BUILD_SHADERS=OFF \ - -DINSTALL_DOCS=OFF -L - + -DINSTALL_DOCS=OFF make -C build $jobArgs } diff --git a/media-libs/osl/osl1.13-1.13.10.0.recipe b/media-libs/osl/osl1.13-1.13.10.0.recipe new file mode 100644 index 000000000..7b7cbafc1 --- /dev/null +++ b/media-libs/osl/osl1.13-1.13.10.0.recipe @@ -0,0 +1,175 @@ +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/AcademySoftwareFoundation/OpenShadingLanguage" +COPYRIGHT="2009-2020 Sony Pictures Imageworks Inc." +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz" +CHECKSUM_SHA256="302f573d21c700d859fb36497d377656cb51213309d95bebda941bb0993a7f42" +SOURCE_DIR="OpenShadingLanguage-$portVersion" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +libVersion="1.13.10" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + osl1.13$secondaryArchSuffix = $portVersion + cmd:oslc$commandSuffix + cmd:oslinfo$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:osl.imageio$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libboost_atomic$secondaryArchSuffix + lib:libboost_chrono$secondaryArchSuffix + lib:libboost_date_time$secondaryArchSuffix + lib:libboost_filesystem$secondaryArchSuffix + lib:libboost_serialization$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libboost_thread$secondaryArchSuffix + lib:libboost_wave$secondaryArchSuffix + lib:libclang_cpp$secondaryArchSuffix + lib:libIex_3_2$secondaryArchSuffix + lib:libIlmThread_3_2$secondaryArchSuffix + lib:libImath_3_1$secondaryArchSuffix + lib:libLLVM$secondaryArchSuffix + lib:libOpenEXR_3_2$secondaryArchSuffix + lib:libOpenEXRUtil_3_2$secondaryArchSuffix + lib:libOpenImageIO$secondaryArchSuffix +# lib:libpartio$secondaryArchSuffix + lib:libpugixml$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + osl1.13${secondaryArchSuffix}_devel = $portVersion + devel:liboslcomp$secondaryArchSuffix + devel:liboslexec$secondaryArchSuffix + devel:liboslnoise$secondaryArchSuffix + devel:liboslquery$secondaryArchSuffix +# devel:libtestshade$secondaryArchSuffix + " +REQUIRES_devel=" + osl1.13$secondaryArchSuffix == $portVersion base + " +CONFLICTS_devel=" + osl1.11$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + gcc${secondaryArchSuffix}_syslibs_devel + devel:libboost_atomic$secondaryArchSuffix >= 1.83.0 + devel:libboost_chrono$secondaryArchSuffix >= 1.83.0 + devel:libboost_date_time$secondaryArchSuffix >= 1.83.0 + devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0 + devel:libboost_serialization$secondaryArchSuffix >= 1.83.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libboost_thread$secondaryArchSuffix >= 1.83.0 + devel:libboost_wave$secondaryArchSuffix >= 1.83.0 + devel:libdeflate$secondaryArchSuffix + devel:libfmt$secondaryArchSuffix + devel:libIex_3_2$secondaryArchSuffix + devel:libIlmThread_3_2$secondaryArchSuffix + devel:libImath_3_1$secondaryArchSuffix + devel:libLLVM_18$secondaryArchSuffix + devel:libOpenEXR_3_2$secondaryArchSuffix + devel:libOpenEXRUtil_3_2$secondaryArchSuffix + devel:libOpenImageIO$secondaryArchSuffix >= 2.5 +# devel:libpartio$secondaryArchSuffix + devel:libpugixml$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:bison + cmd:clang_18 + cmd:cmake + cmd:flex + cmd:gcc$secondaryArchSuffix +# cmd:iconvert # move tools back into main OIIO? + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:python3 + cmd:testtex + " + +defineDebugInfoPackage osl1.13$secondaryArchSuffix \ + $libDir/liboslcomp.so.$libVersion \ + $libDir/liboslexec.so.$libVersion \ + $libDir/liboslnoise.so.$libVersion \ + $libDir/liboslquery.so.$libVersion \ + $libDir/osl.imageio.so \ + $commandBinDir/oslc$commandSuffix \ + $commandBinDir/oslinfo$commandSuffix + +PATCH() +{ + # Use python3 binary instead of unversioned python + sed -i -e "s|COMMAND python|COMMAND python3|" $(find . -iname CMakeLists.txt) +} + +BUILD() +{ + export LDFLAGS=-lnetwork + cmake -B build -S . \ + $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_FLAGS="-DBOOST_NO_CXX11_CONSTEXPR" \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DUSE_PYTHON=OFF \ + -DVERBOSE=ON \ + -DUSE_PARTIO=OFF \ + -DOSL_BUILD_TESTS=OFF \ + -DOSL_BUILD_SHADERS=ON \ + -DINSTALL_DOCS=OFF + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # Remove unneeded files + rm -fr $prefix/build-scripts + rm -fr $prefix/cmake + + prepareInstalledDevelLibs \ + liboslcomp \ + liboslexec \ + liboslnoise \ + liboslquery + + fixPkgconfig + + packageEntries devel \ + $developDir \ + $libDir/cmake +} + +TEST() +{ + make -C build test +} diff --git a/media-libs/osl/patches/osl-1.11.14.2.patchset b/media-libs/osl/patches/osl-1.11.14.2.patchset deleted file mode 100644 index 24349dee6..000000000 --- a/media-libs/osl/patches/osl-1.11.14.2.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From ac34a29ade87e44b2ac9abf068bf5e527bf2b656 Mon Sep 17 00:00:00 2001 -From: Begasus -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 -