From f28ae8db61ef149bb61330c8c16ea23083fe1791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Wed, 11 Jun 2025 05:23:17 +0100 Subject: [PATCH] openshadinglanguage: Use llvm-16 (static) OSL doesn't build with LLVM-20, see https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1963 --- mingw-w64-openshadinglanguage/PKGBUILD | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mingw-w64-openshadinglanguage/PKGBUILD b/mingw-w64-openshadinglanguage/PKGBUILD index 9059f756e9..88510cdf7f 100644 --- a/mingw-w64-openshadinglanguage/PKGBUILD +++ b/mingw-w64-openshadinglanguage/PKGBUILD @@ -4,7 +4,7 @@ _realname=openshadinglanguage pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.14.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced shading language for production GI renderers (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -13,20 +13,22 @@ msys2_references=( 'archlinux: openshadinglanguage' ) license=("spdx:BSD-3-Clause") -depends=("${MINGW_PACKAGE_PREFIX}-boost-libs" - "${MINGW_PACKAGE_PREFIX}-clang-libs" - "${MINGW_PACKAGE_PREFIX}-openexr" +depends=("${MINGW_PACKAGE_PREFIX}-cc-libs" + #"${MINGW_PACKAGE_PREFIX}-clang-libs" "${MINGW_PACKAGE_PREFIX}-openimageio" "${MINGW_PACKAGE_PREFIX}-partio" "${MINGW_PACKAGE_PREFIX}-pugixml" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-zstd") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-boost" + "${MINGW_PACKAGE_PREFIX}-imath" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-pybind11" - "${MINGW_PACKAGE_PREFIX}-clang" + "${MINGW_PACKAGE_PREFIX}-robin-map" + "${MINGW_PACKAGE_PREFIX}-clang-16" + #"${MINGW_PACKAGE_PREFIX}-llvm-tools" "${MINGW_PACKAGE_PREFIX}-qt6-base") optdepends=("${MINGW_PACKAGE_PREFIX}-python: Python module" "${MINGW_PACKAGE_PREFIX}-qt6-base: for osltoy") @@ -76,7 +78,7 @@ build() { fi export OPENIMAGEIOHOME=${MINGW_PREFIX} - export LLVM_DIRECTORY=${MINGW_PREFIX} + export LLVM_DIRECTORY=${MINGW_PREFIX}/opt/llvm-16 CFLAGS+=" -Wno-attributes" CXXFLAGS+=" -Wno-attributes -DTINYFORMAT_ALLOW_WCHAR_STRINGS" @@ -93,8 +95,8 @@ build() { -DOSL_BUILD_TESTS=OFF \ -DSTOP_ON_WARNING=OFF \ -DLLVM_STATIC=OFF \ - -DLLVM_ROOT=${MINGW_PREFIX} \ - -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \ + -DLLVM_ROOT=${MINGW_PREFIX}/opt/llvm-16 \ + -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \ "${_extra_config[@]}" \ ../OpenShadingLanguage-${pkgver}