diff options
Diffstat (limited to 'graphics/OpenShadingLanguage')
-rw-r--r-- | graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild | 8 | ||||
-rw-r--r-- | graphics/OpenShadingLanguage/OpenShadingLanguage.info | 10 | ||||
-rw-r--r-- | graphics/OpenShadingLanguage/README | 15 | ||||
-rw-r--r-- | graphics/OpenShadingLanguage/llvm-20.patch | 37 |
4 files changed, 58 insertions, 12 deletions
diff --git a/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild b/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild index b523911764..4cf361461f 100644 --- a/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild +++ b/graphics/OpenShadingLanguage/OpenShadingLanguage.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for OpenShadingLanguage -# Copyright 2023 Giancarlo Dessi, Cagliari, IT +# Copyright 2023-2025 Giancarlo Dessi, Cagliari, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OpenShadingLanguage -VERSION=${VERSION:-1.12.14.0} +VERSION=${VERSION:-1.13.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/llvm-20.patch + mkdir -p build cd build cmake \ @@ -99,6 +101,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/share/doc/OSL/* $PKG/usr/doc/$PRGNAM-$VERSION rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.md rm -r $PKG/usr/share/doc +rm -r $PKG/usr/cmake +rm -r $PKG/usr/build-scripts cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/OpenShadingLanguage/OpenShadingLanguage.info b/graphics/OpenShadingLanguage/OpenShadingLanguage.info index 45c7382837..ad85778743 100644 --- a/graphics/OpenShadingLanguage/OpenShadingLanguage.info +++ b/graphics/OpenShadingLanguage/OpenShadingLanguage.info @@ -1,10 +1,10 @@ PRGNAM="OpenShadingLanguage" -VERSION="1.12.14.0" +VERSION="1.13.12.0" HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" -DOWNLOAD="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v1.12.14.0/OpenShadingLanguage-1.12.14.0.tar.gz" -MD5SUM="0948e423177f7279b5e231d58bf358aa" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v1.13.12.0/OpenShadingLanguage-1.13.12.0.tar.gz" +MD5SUM_x86_64="ac8cc5c448eea7da03022e5f2f7de530" REQUIRES="openimageio pugixml" MAINTAINER="Giancarlo Dessì" EMAIL="slack@giand.it" diff --git a/graphics/OpenShadingLanguage/README b/graphics/OpenShadingLanguage/README index a1d99c32fe..74de497390 100644 --- a/graphics/OpenShadingLanguage/README +++ b/graphics/OpenShadingLanguage/README @@ -12,8 +12,13 @@ the industry in many commercial and studio- proprietary renderers. Cuda and OptIx are optional dependencies but they are not tested. -OSL is an optional dependency for Blender. - -Warning for Slackware current users: since the current's LLVM is -updated to version 17, this version of OSL cannot be built on Slackware -current because versions of LLVM greater than 15 are out of range. +Warning +OSL is an optional dependency for Blender autodetected. Unfortunately +the build of Blender version available in this repository (3.3.10) +with the support to OSL fails, perhaps because Slackware 15.0 +development packages could be outdated. In order to prevent compilation +errors, the slackbuild of Blender will disable the support to OSL if +this dependency is installed in your system, so you can install OSL +without conflicts with the build of Blender. +In Slackware current Blender 4.4.3 builds fine against OSL 1.14.6 and +OpenImageIO 3.0.7.0. diff --git a/graphics/OpenShadingLanguage/llvm-20.patch b/graphics/OpenShadingLanguage/llvm-20.patch new file mode 100644 index 0000000000..6b2387dec8 --- /dev/null +++ b/graphics/OpenShadingLanguage/llvm-20.patch @@ -0,0 +1,37 @@ +--- ./src/cmake/externalpackages.cmake 2024-12-05 05:29:41.000000000 +0100 ++++ ./src/cmake/fix-externalpackages.cmake 2025-06-29 21:05:17.517569272 +0200 +@@ -117,7 +117,7 @@ + # LLVM library setup + checked_find_package (LLVM REQUIRED + VERSION_MIN 9.0 +- VERSION_MAX 19.9 ++ VERSION_MAX 20.9 + PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES) + # ensure include directory is added (in case of non-standard locations + include_directories (BEFORE SYSTEM "${LLVM_INCLUDES}") + +--- ./src/include/OSL/platform.h 2024-12-05 05:29:41.000000000 +0100 ++++ ./src/include/OSL/fix-platform.h 2025-06-29 21:08:25.389584349 +0200 +@@ -20,6 +20,7 @@ + + #include <cstring> + #include <memory> ++#include <cstdint> + + #include <OSL/oslversion.h> + + +--- ./src/liboslexec/llvm_util.cpp 2025-06-29 21:12:28.283603841 +0200 ++++ ./src/liboslexec/fix-llvm_util.cpp 2025-06-29 21:12:47.262605365 +0200 +@@ -3204,7 +3204,11 @@ + llvm::Type* + LLVM_Util::type_union(cspan<llvm::Type*> types) + { ++#if OSL_LLVM_VERSION >= 200 ++ llvm::DataLayout target(module()->getDataLayout()); ++#else + llvm::DataLayout target(module()); ++#endif + size_t max_size = 0; + size_t max_align = 1; + for (auto t : types) { |