commit: 905a334b7296192ffc57b0fcad9644217dbebe39
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Sat Nov 30 16:44:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 08:33:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905a334b
media-gfx/blender: drop blender-4.0.2-r1
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-4.0.2-r1.ebuild | 586 ---------------------
.../files/blender-4.0.1-fix-cflags-cleaner.patch | 39 --
.../blender/files/blender-4.0.1-openvdb-11.patch | 75 ---
.../blender/files/blender-4.0.2-r1-osl-1.13.patch | 342 ------------
5 files changed, 1043 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index c56e4d00f3f9..74646405868e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,6 @@
DIST blender-3.6.15.tar.xz 67906200 BLAKE2B
8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185
SHA512
dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32
DIST blender-3.6.18.tar.xz 67900952 BLAKE2B
d4a619197abc3e4969846913f3c88cd64fd679bbefe007354af6ba2e83d47a8fcd27b3bcbaf6d850d28960eedeb3c50ff9336d0e61fd488d4916b6628bfd67dd
SHA512
48a8b3e8b2fe75305061d7cb9b7b8491cef4f23fbd809d1fc34663a4f97f487d6e7e6e92848110fe6aa5a2fed18a2c1a2a0c1c928aa813e2456f7786681eae60
DIST blender-3.6.8.tar.xz 70453744 BLAKE2B
5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7
SHA512
a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
-DIST blender-4.0.2.tar.xz 73281252 BLAKE2B
6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983
SHA512
c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
DIST blender-4.1.1.tar.xz 82146268 BLAKE2B
1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d
SHA512
13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e
DIST blender-4.2.1.tar.xz 72789532 BLAKE2B
74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82
SHA512
20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39
DIST blender-4.2.4.tar.xz 72804204 BLAKE2B
613ae4671cc9263d18fe988b07e8744eb04f67fe53f1c14ad3fbc7d80c58a577e7753871ca775cd40ab5f26ef2bc9030cda57012dda0c4785769f04263aea15b
SHA512
1f61c1866aaa680c91fc6e3402b1e10533c8cce32572ffb825c53dc7c15ca51f1157a32d10134ca9e612fbf719406421ccc920b2d8ddd2993675784797381c6a
diff --git a/media-gfx/blender/blender-4.0.2-r1.ebuild
b/media-gfx/blender/blender-4.0.2-r1.ebuild
deleted file mode 100644
index ae693845b6b7..000000000000
--- a/media-gfx/blender/blender-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-# matches media-libs/osl
-LLVM_COMPAT=( {15..17} )
-
-inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org";
-
-if [[ ${PV} = *9999* ]] ; then
- EGIT_LFS="yes"
- inherit git-r3
- EGIT_REPO_URI="https://projects.blender.org/blender/blender.git";
- EGIT_SUBMODULES=( '*' '-lib/*' )
-
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git";
- RESTRICT="!test? ( test )"
-else
- SRC_URI="
- https://download.blender.org/source/${P}.tar.xz
- "
- # test? (
- #
https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut
1-2)-release.tar.gz
- # )
- # "
- KEYWORDS="~amd64 ~arm ~arm64"
- RESTRICT="test" # the test archive returns LFS references.
-fi
-
-LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
-SLOT="${PV%.*}"
-IUSE="
- alembic +bullet collada +color-management cuda +cycles
+cycles-bin-kernels
- debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
- jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr
+openmp openpgl
- +opensubdiv +openvdb optix osl +pdf +potrace +pugixml pulseaudio
- renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff tbb )
- fluid? ( tbb )
- gnome? ( wayland )
- hip? ( cycles )
- nanovdb? ( openvdb )
- openvdb? ( tbb openexr )
- optix? ( cuda )
- osl? ( cycles pugixml )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/cmake/versions.cmake
-RDEPEND="${PYTHON_DEPS}
- app-arch/zstd
- dev-libs/boost:=[nls?]
- dev-libs/lzo:2=
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/zstandard[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- media-libs/freetype:=[brotli]
- media-libs/libepoxy:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libsamplerate
- >=media-libs/openimageio-2.4.6.0:=
- sys-libs/zlib:=
- virtual/glu
- virtual/libintl
- virtual/opengl
- alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
- collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( media-libs/opencolorio:= )
- cuda? ( dev-util/nvidia-cuda-toolkit:= )
- embree? ( media-libs/embree:=[raymask] )
- ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
- fftw? ( sci-libs/fftw:3.0= )
- gmp? ( dev-libs/gmp[cxx] )
- gnome? ( gui-libs/libdecor )
- hip? ( >=dev-util/hip-5.7:= )
- jack? ( virtual/jack )
- jemalloc? ( dev-libs/jemalloc:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- ndof? (
- app-misc/spacenavd
- dev-libs/libspnav
- )
- nls? ( virtual/libiconv )
- openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0 )
- oneapi? ( dev-libs/intel-compute-runtime[l0] )
- openexr? (
- >=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openexr-3:0=
- )
- openpgl? ( media-libs/openpgl:0/0.5 )
- opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
- openvdb? (
- >=media-gfx/openvdb-11.0.0:=[nanovdb?]
- dev-libs/c-blosc:=
- )
- optix? ( dev-libs/optix )
- osl? (
- >=media-libs/osl-1.13:=
- $(llvm_gen_dep '
- >=media-libs/osl-1.13[llvm_slot_${LLVM_SLOT}]
- media-libs/mesa[llvm_slot_${LLVM_SLOT}]
- ')
- )
- pdf? ( media-libs/libharu )
- potrace? ( media-gfx/potrace )
- pugixml? ( dev-libs/pugixml )
- pulseaudio? ( media-libs/libpulse )
- sdl? ( media-libs/libsdl2[sound,joystick] )
- sndfile? ( media-libs/libsndfile )
- tbb? ( dev-cpp/tbb:= )
- tiff? ( media-libs/tiff:= )
- valgrind? ( dev-debug/valgrind )
- wayland? (
- >=dev-libs/wayland-1.12
- >=dev-libs/wayland-protocols-1.15
- >=x11-libs/libxkbcommon-0.2.0
- dev-util/wayland-scanner
- media-libs/mesa[wayland]
- sys-apps/dbus
- )
- vulkan? (
- media-libs/shaderc
- dev-util/spirv-tools
- dev-util/glslang
- media-libs/vulkan-loader
- )
- renderdoc? (
- media-gfx/renderdoc
- )
- X? (
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXxf86vm
- )
-"
-
-DEPEND="${RDEPEND}
- dev-cpp/eigen:=
- vulkan? (
- dev-util/spirv-headers
- dev-util/vulkan-headers
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
- app-text/doxygen[dot]
- dev-python/sphinx[latex]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- nls? ( sys-devel/gettext )
- wayland? (
- dev-util/wayland-scanner
- )
- X? (
- x11-base/xorg-proto
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for
releases after Dec 8, 2023
- "${FILESDIR}/${PN}-4.0.1-openvdb-11.patch"
- "${FILESDIR}/${PN}-4.0.2-FindClang.patch"
- "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
- "${FILESDIR}/${PN}-4.0.2-r1-osl-1.13.patch"
-)
-
-blender_check_requirements() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
- if use doc; then
- CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
- fi
-}
-
-blender_get_version() {
- # Get blender version from blender itself.
- BV=$(grep "BLENDER_VERSION "
source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
- if ((${BV:0:1} < 3)) ; then
- # Add period (290 -> 2.90).
- BV=${BV:0:1}.${BV:1}
- else
- # Add period and skip the middle number (301 -> 3.1)
- BV=${BV:0:1}.${BV:2}
- fi
-}
-
-pkg_pretend() {
- blender_check_requirements
-}
-
-pkg_setup() {
- if use osl; then
- llvm-r1_pkg_setup
- fi
-
- blender_check_requirements
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} = *9999* ]] ; then
- if ! use test; then
- EGIT_SUBMODULES+=( '-tests/*' )
- fi
- git-r3_src_unpack
-
- git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
- git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
- else
- default
-
- if use test; then
- mkdir -p "${S}/tests/data/" || die
- mv blender-test-data/* "${S}/tests/data/" || die
- fi
- fi
-}
-
-src_prepare() {
- use cuda && cuda_src_prepare
-
- cmake_src_prepare
-
- blender_get_version
-
- # Disable MS Windows help generation. The variable doesn't do what it
- # it sounds like.
- sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
- -i doc/doxygen/Doxyfile || die
-
- # Prepare icons and .desktop files for slotting.
- sed \
- -e "s|blender.svg|blender-${BV}.svg|" \
- -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \
- -e "s|blender.desktop|blender-${BV}.desktop|" \
- -e
"s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \
- -i source/creator/CMakeLists.txt || die
-
- sed \
- -e "s|Name=Blender|Name=Blender ${BV}|" \
- -e "s|Exec=blender|Exec=blender-${BV}|" \
- -e "s|Icon=blender|Icon=blender-${BV}|" \
- -i release/freedesktop/blender.desktop || die
-
- sed -e
"s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i
source/creator/CMakeLists.txt || die
-
- mv \
- release/freedesktop/icons/scalable/apps/blender.svg \
- "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" ||
die
- mv \
- release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \
-
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
- mv release/freedesktop/blender.desktop
"release/freedesktop/blender-${BV}.desktop" || die
- mv release/freedesktop/org.blender.Blender.metainfo.xml
"release/freedesktop/blender-${BV}.metainfo.xml"
- mv release/freedesktop/org.blender.Blender.appdata.xml
"release/freedesktop/blender-${BV}.appdata.xml"
-
- if use test; then
- # Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
- sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR
${T}/usr)|g" -i tests/CMakeLists.txt || die
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
build_files/cmake/testing.cmake || die
- fi
-
- if use vulkan; then
- sed -e
"s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/"
-i source/blender/gpu/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- # -Werror=odr, -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/859607
- # https://projects.blender.org/blender/blender/issues/120444
- filter-lto
-
- # Workaround for bug #922600
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- append-lfs-flags
- blender_get_version
-
- local mycmakeargs=(
- -DWITH_LIBS_PRECOMPILED=no
- -DBUILD_SHARED_LIBS=no
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DPYTHON_VERSION="${EPYTHON/python/}"
- -DWITH_ALEMBIC=$(usex alembic)
- -DWITH_BOOST=yes
- -DWITH_BULLET=$(usex bullet)
- -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
- -DWITH_CODEC_SNDFILE=$(usex sndfile)
-
- -DWITH_CYCLES=$(usex cycles)
-
- -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda)
- -DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex
cycles-bin-kernels))"
- -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-
- -DWITH_CYCLES_DEVICE_HIP="$(usex hip)"
- -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex
cycles-bin-kernels))
-
- -DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)"
- -DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex
cycles-bin-kernels))"
-
- -DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra
- -DWITH_CYCLES_EMBREE="$(usex embree)"
- -DWITH_CYCLES_OSL=$(usex osl)
- -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
- -DWITH_CYCLES_STANDALONE=no
- -DWITH_CYCLES_STANDALONE_GUI=no
-
- -DWITH_DOC_MANPAGE=$(usex man)
- -DWITH_DRACO="no" # TODO: Package Draco
- -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
- -DWITH_FFTW3=$(usex fftw)
- -DWITH_GHOST_WAYLAND=$(usex wayland)
- -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
- -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
- -DWITH_GHOST_WAYLAND_DYNLOAD="$(usex gnome)" #
https://bugs.gentoo.org/930412 fixed in 4.1 # no
- -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
- -DWITH_GHOST_X11=$(usex X)
- -DWITH_GMP=$(usex gmp)
- -DWITH_GTESTS=$(usex test)
- -DWITH_HARU=$(usex pdf)
- -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo
ON)
- -DWITH_HYDRA="no" # TODO: Package Hydra
- -DWITH_IMAGE_OPENEXR=$(usex openexr)
- -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
- -DWITH_IMAGE_WEBP=$(usex webp)
- -DWITH_INPUT_NDOF=$(usex ndof)
- -DWITH_INSTALL_PORTABLE="no"
- -DWITH_INTERNATIONAL=$(usex nls)
- -DWITH_JACK=$(usex jack)
- -DWITH_MATERIALX="no" # TODO: Package MaterialX
- -DWITH_MEM_JEMALLOC=$(usex jemalloc)
- -DWITH_MEM_VALGRIND=$(usex valgrind)
- -DWITH_MOD_FLUID=$(usex fluid)
- -DWITH_MOD_OCEANSIM=$(usex fftw)
- -DWITH_NANOVDB=$(usex nanovdb)
- -DWITH_OPENAL=$(usex openal)
- -DWITH_OPENCOLLADA=$(usex collada)
- -DWITH_OPENCOLORIO=$(usex color-management)
- -DWITH_OPENIMAGEDENOISE=$(usex oidn)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_OPENSUBDIV=$(usex opensubdiv)
- -DWITH_OPENVDB=$(usex openvdb)
- -DWITH_OPENVDB_BLOSC=$(usex openvdb)
- -DWITH_POTRACE=$(usex potrace)
- -DWITH_PUGIXML=$(usex pugixml)
- -DWITH_PULSEAUDIO=$(usex pulseaudio)
- -DWITH_PYTHON_INSTALL=no
- -DWITH_PYTHON_INSTALL_NUMPY=no
- -DWITH_PYTHON_INSTALL_ZSTANDARD=no
- -DWITH_RENDERDOC="$(usex renderdoc)"
- -DWITH_SDL=$(usex sdl)
- -DWITH_STATIC_LIBS=no
- -DWITH_STRICT_BUILD_OPTIONS=yes
- -DWITH_SYSTEM_EIGEN3=yes
- -DWITH_SYSTEM_FREETYPE=yes
- -DWITH_SYSTEM_LZO=yes
- -DWITH_TBB=$(usex tbb)
- -DWITH_USD="no" # TODO: Package USD
- -DWITH_VULKAN_BACKEND="$(usex vulkan)"
- -DWITH_XR_OPENXR=no
- )
-
- # requires dev-vcs/git
- if [[ ${PV} = *9999* ]] ; then
- mycmakeargs+=( -DWITH_BUILDINFO="yes" )
- else
- mycmakeargs+=( -DWITH_BUILDINFO="no" )
- fi
-
- if use cuda; then
- mycmakeargs+=(
- -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
- )
- fi
-
- if use hip; then
- mycmakeargs+=(
- -DHIP_HIPCC_FLAGS="-fcf-protection=none"
- )
- fi
-
- if use optix; then
- mycmakeargs+=(
- -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
- -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
- )
- fi
-
- # This is currently needed on arm64 to get the NEON SIMD wrapper to
compile the code successfully
- use arm64 && append-flags -flax-vector-conversions
-
- append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
- append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
-
- if tc-is-gcc ; then
- # These options only exist when GCC is detected.
- # We disable these to respect the user's choice of linker.
- mycmakeargs+=(
- -DWITH_LINKER_GOLD=no
- -DWITH_LINKER_LLD=no
- )
- # Ease compiling with required gcc similar to cuda_sanitize but
for cmake
- use cuda && use cycles-bin-kernels && mycmakeargs+=(
-DCUDA_HOST_COMPILER="$(cuda_gccdir)" )
- fi
-
- if tc-is-clang || use osl; then
- mycmakeargs+=(
- -DWITH_CLANG=yes
- -DWITH_LLVM=yes
- )
- fi
-
- if use test ; then
- local CYCLES_TEST_DEVICES=( "CPU" )
- if use cycles-bin-kernels; then
- use cuda && CYCLES_TEST_DEVICES+=( "CUDA" )
- use optix && CYCLES_TEST_DEVICES+=( "OPTIX" )
- use hip && CYCLES_TEST_DEVICES+=( "HIP" )
- fi
- mycmakeargs+=(
- -DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo
"${CYCLES_TEST_DEVICES[*]}")"
- -DWITH_COMPOSITOR_REALTIME_TESTS=yes
- -DWITH_GPU_DRAW_TESTS=yes
- -DWITH_GPU_RENDER_TESTS=yes
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- # A lot of tests needs to have access to the installed data files.
- # So install them into the image directory now.
- DESTDIR="${T}" cmake_build install
-
- blender_get_version
- # Define custom blender data/script file paths not be able to find them
otherwise during testing.
- # (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
-
- # Sanity check that the script and datafile path is valid.
- # If they are not vaild, blender will fallback to the default path
which is not what we want.
- [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is
invalid, fix the ebuild!"
- [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is
invalid, fix the ebuild!"
-
- if use cuda; then
- cuda_add_sandbox -w
- addwrite "/dev/dri/renderD128"
- addwrite "/dev/char/"
- fi
-
- if use X; then
- xdg_environment_reset
- fi
-
- cmake_src_test
-
- # Clean up the image directory for src_install
- rm -fr "${T}/usr" || die
-}
-
-src_install() {
- blender_get_version
-
- # Pax mark blender for hardened support.
- pax-mark m "${BUILD_DIR}"/bin/blender
-
- if use man; then
- # XXX: Stupid temporary hack for bug #925254
- cmake_src_install -j1
-
- # Slot the man page
- mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
- else
- cmake_src_install
- fi
-
- if use doc; then
- # Define custom blender data/script file paths. Otherwise
Blender will not be able to find them during doc building.
- # (Because the data is in the image directory and it will
default to look in /usr/share)
- export
BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
- export
BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
-
- # Workaround for binary drivers.
- addpredict /dev/ati
- addpredict /dev/dri
- addpredict /dev/nvidiactl
-
- einfo "Generating Blender C/C++ API docs ..."
- cd "${CMAKE_USE_DIR}"/doc/doxygen || die
- doxygen -u Doxyfile || die
- doxygen || die "doxygen failed to build API docs."
-
- cd "${CMAKE_USE_DIR}" || die
- einfo "Generating (BPY) Blender Python API docs ..."
- "${BUILD_DIR}"/bin/blender --background --python
doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
- cd "${CMAKE_USE_DIR}"/doc/python_api || die
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
-
- docinto "html/API/python"
- dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
- docinto "html/API/blender"
- dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
- fi
-
- # Fix doc installdir
- docinto html
- dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
- rm -r "${ED}"/usr/share/doc/blender || die
-
- python_optimize "${ED}/usr/share/blender/${BV}/scripts"
-
- mv "${ED}/usr/bin/blender-thumbnailer"
"${ED}/usr/bin/blender-${BV}-thumbnailer" || die
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
-}
-
-pkg_postinst() {
- elog
- elog "Blender uses python integration. As such, may have some"
- elog "inherent risks with running unknown python scripts."
- elog
- elog "It is recommended to change your blender temp directory"
- elog "from /tmp to /home/user/tmp or another tmp file under your"
- elog "home directory. This can be done by starting blender, then"
- elog "changing the 'Temporary Files' directory in Blender preferences."
- elog
-
- if use osl; then
- ewarn ""
- ewarn "OSL is know to cause runtime segfaults if Mesa has been
linked to"
- ewarn "an other LLVM version than what OSL is linked to."
- ewarn "See https://bugs.gentoo.org/880671 for more details"
- ewarn ""
- fi
-
- if ! use python_single_target_python3_10; then
- elog "You are building Blender with a newer python version than"
- elog "supported by this version upstream."
- elog "If you experience breakages with e.g. plugins, please
switch to"
- elog "python_single_target_python3_10 instead."
- elog "Bug: https://bugs.gentoo.org/737388";
- elog
- fi
-
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-
- ewarn ""
- ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/${BV}/cache/"
- ewarn "It may contain extra render kernels not tracked by portage"
- ewarn ""
-}
diff --git a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
deleted file mode 100644
index d28db84d8c36..000000000000
--- a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6
arguments total to command.
-https://bugs.gentoo.org/922324
-https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
---- a/build_files/cmake/macros.cmake
-+++ b/build_files/cmake/macros.cmake
-@@ -750,11 +750,11 @@ macro(remove_c_flag
- _flag)
-
- foreach(f ${ARGV})
-- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE
${CMAKE_C_FLAGS_RELEASE})
-- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL
${CMAKE_C_FLAGS_MINSIZEREL})
-- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO
${CMAKE_C_FLAGS_RELWITHDEBINFO})
-+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE
"${CMAKE_C_FLAGS_RELEASE}")
-+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL
"${CMAKE_C_FLAGS_MINSIZEREL}")
-+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO}")
- endforeach()
- unset(f)
- endmacro()
-@@ -763,11 +763,11 @@ macro(remove_cxx_flag
- _flag)
-
- foreach(f ${ARGV})
-- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG
${CMAKE_CXX_FLAGS_DEBUG})
-- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE
${CMAKE_CXX_FLAGS_RELEASE})
-- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL
${CMAKE_CXX_FLAGS_MINSIZEREL})
-- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG}")
-+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE}")
-+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL
"${CMAKE_CXX_FLAGS_MINSIZEREL}")
-+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
- endforeach()
- unset(f)
- endmacro()
\ No newline at end of file
diff --git a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch
b/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch
deleted file mode 100644
index 1f1561e8e7db..000000000000
--- a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Paul Zander <[email protected]>
-Change lookup for OpenVDB-11
---- a/intern/cycles/scene/image_vdb.cpp 2023-11-23 14:42:38.772685628
+0100
-+++ b/intern/cycles/scene/image_vdb.cpp 2023-11-23 15:19:55.475804922
+0100
-@@ -11,7 +11,14 @@
- # include <openvdb/tools/Dense.h>
- #endif
- #ifdef WITH_NANOVDB
--# include <nanovdb/util/OpenToNanoVDB.h>
-+# include <nanovdb/NanoVDB.h>
-+# define NANOVDB_VERSION(major, minor, patch) (major << 21 | minor << 10 |
patch)
-+# if NANOVDB_VERSION(NANOVDB_MAJOR_VERSION_NUMBER,
NANOVDB_MINOR_VERSION_NUMBER, NANOVDB_PATCH_VERSION_NUMBER) >=
NANOVDB_VERSION(32, 6, 0)
-+# include <nanovdb/util/CreateNanoGrid.h>
-+# else
-+# include <nanovdb/util/OpenToNanoVDB.h>
-+# endif
-+# undef NANOVDB_VERSION
- #endif
-
- CCL_NAMESPACE_BEGIN
-@@ -55,20 +62,35 @@
- FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
- if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
- if (precision == 0) {
-- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-- typename
FloatGridType::TreeType,
-- nanovdb::FpN>(floatgrid);
-+ if constexpr (nanovdb::Version() >= nanovdb::Version(32,6,0)) {
-+ nanogrid = nanovdb::createNanoGrid(floatgrid);
-+ }
-+ else {
-+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-+ typename
FloatGridType::TreeType,
-+ nanovdb::FpN>(floatgrid);
-+ }
- return true;
- }
-- else if (precision == 16) {
-- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-- typename
FloatGridType::TreeType,
-- nanovdb::Fp16>(floatgrid);
-+ if (precision == 16) {
-+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) {
-+ nanogrid = nanovdb::createNanoGrid(floatgrid);
-+ }
-+ else {
-+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
-+ typename
FloatGridType::TreeType,
-+ nanovdb::Fp16>(floatgrid);
-+ }
- return true;
- }
- }
-
-- nanogrid = nanovdb::openToNanoVDB(floatgrid);
-+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) {
-+ nanogrid = nanovdb::createNanoGrid(floatgrid);
-+ }
-+ else {
-+ nanogrid = nanovdb::openToNanoVDB(floatgrid);
-+ }
- }
- catch (const std::exception &e) {
- VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " <<
e.what();
---- a/CMakeLists.txt 2023-11-23 15:59:58.715805024 +0100
-+++ b/CMakeLists.txt 2023-11-23 16:06:42.352711508 +0100
-@@ -1461,7 +1461,7 @@
- endif()
-
- if(WITH_OPENVDB)
-- list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB)
-+ list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB -DNANOVDB_USE_OPENVDB)
-
- if(WITH_OPENVDB_3_ABI_COMPATIBLE)
- list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE)
diff --git a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch
b/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch
deleted file mode 100644
index 064abf21c6a6..000000000000
--- a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From 798a0b301e640e73ae12e6f8a36a66746893bff1 Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <[email protected]>
-Date: Sun, 10 Dec 2023 17:08:47 +0100
-Subject: [PATCH] Cycles: update OSL to work with version 1.13.5
-
-This keeps compatibility with older stable versions, but not
-older unreleased versions in the 1.13.x series.
-
-Ref #113157
-
-Pull Request: https://projects.blender.org/blender/blender/pulls/116004
----
- intern/cycles/device/cpu/device_impl.cpp | 2 +-
- .../device/cpu/kernel_thread_globals.cpp | 6 ++-
- .../cycles/device/cpu/kernel_thread_globals.h | 3 +-
- intern/cycles/kernel/device/cpu/globals.h | 1 +
- intern/cycles/kernel/osl/closures.cpp | 52 ++++++++++++++++++-
- intern/cycles/kernel/osl/globals.cpp | 3 +-
- intern/cycles/kernel/osl/globals.h | 4 +-
- intern/cycles/kernel/osl/osl.h | 5 ++
- intern/cycles/kernel/osl/services.cpp | 27 ++++++++--
- intern/cycles/kernel/osl/services.h | 21 +++++++-
- intern/cycles/kernel/osl/types.h | 4 +-
- 11 files changed, 115 insertions(+), 13 deletions(-)
-
-diff --git a/intern/cycles/device/cpu/device_impl.cpp
b/intern/cycles/device/cpu/device_impl.cpp
-index cbbdb844323..ba838233855 100644
---- a/intern/cycles/device/cpu/device_impl.cpp
-+++ b/intern/cycles/device/cpu/device_impl.cpp
-@@ -313,7 +313,7 @@ void CPUDevice::get_cpu_kernel_thread_globals(
- kernel_thread_globals.clear();
- void *osl_memory = get_cpu_osl_memory();
- for (int i = 0; i < info.cpu_threads; i++) {
-- kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler);
-+ kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler,
i);
- }
- }
-
-diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp
b/intern/cycles/device/cpu/kernel_thread_globals.cpp
-index 546061a5086..998a63aa334 100644
---- a/intern/cycles/device/cpu/kernel_thread_globals.cpp
-+++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp
-@@ -12,14 +12,16 @@ CCL_NAMESPACE_BEGIN
-
- CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobalsCPU
&kernel_globals,
- void *osl_globals_memory,
-- Profiler &cpu_profiler)
-+ Profiler &cpu_profiler,
-+ const int thread_index)
- : KernelGlobalsCPU(kernel_globals), cpu_profiler_(cpu_profiler)
- {
- clear_runtime_pointers();
-
- #ifdef WITH_OSL
-- OSLGlobals::thread_init(this, static_cast<OSLGlobals
*>(osl_globals_memory));
-+ OSLGlobals::thread_init(this, static_cast<OSLGlobals
*>(osl_globals_memory), thread_index);
- #else
-+ (void)thread_index;
- (void)osl_globals_memory;
- #endif
-
-diff --git a/intern/cycles/device/cpu/kernel_thread_globals.h
b/intern/cycles/device/cpu/kernel_thread_globals.h
-index dc4b693702a..3dbc35fefa3 100644
---- a/intern/cycles/device/cpu/kernel_thread_globals.h
-+++ b/intern/cycles/device/cpu/kernel_thread_globals.h
-@@ -23,7 +23,8 @@ class CPUKernelThreadGlobals : public KernelGlobalsCPU {
- * without OSL support. Will avoid need to those unnamed pointers and
casts. */
- CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals,
- void *osl_globals_memory,
-- Profiler &cpu_profiler);
-+ Profiler &cpu_profiler,
-+ const int thread_index);
-
- ~CPUKernelThreadGlobals();
-
-diff --git a/intern/cycles/kernel/device/cpu/globals.h
b/intern/cycles/kernel/device/cpu/globals.h
-index 90a274b2bcf..d0495883e27 100644
---- a/intern/cycles/kernel/device/cpu/globals.h
-+++ b/intern/cycles/kernel/device/cpu/globals.h
-@@ -49,6 +49,7 @@ typedef struct KernelGlobalsCPU {
- OSLGlobals *osl = nullptr;
- OSLShadingSystem *osl_ss = nullptr;
- OSLThreadData *osl_tdata = nullptr;
-+ int osl_thread_index = 0;
- #endif
-
- #ifdef __PATH_GUIDING__
-diff --git a/intern/cycles/kernel/osl/closures.cpp
b/intern/cycles/kernel/osl/closures.cpp
-index 808e13f48d6..4a5906873af 100644
---- a/intern/cycles/kernel/osl/closures.cpp
-+++ b/intern/cycles/kernel/osl/closures.cpp
-@@ -110,7 +110,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const
KernelGlobalsCPU *kg,
- if (sd->object == OBJECT_NONE && sd->lamp == LAMP_NONE) {
- /* background */
- if (kg->osl->background_state) {
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ ss->execute(*octx,
-+ *(kg->osl->background_state),
-+ kg->osl_thread_index,
-+ 0,
-+ *globals,
-+ nullptr,
-+ nullptr);
-+#else
- ss->execute(octx, *(kg->osl->background_state), *globals);
-+#endif
- }
- }
- else {
-@@ -150,8 +160,18 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const
KernelGlobalsCPU *kg,
- globals->dPdy = TO_VEC3(tmp_dP.dy);
- }
-
-- /* execute bump shader */
-+/* execute bump shader */
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ ss->execute(*octx,
-+ *(kg->osl->bump_state[shader]),
-+ kg->osl_thread_index,
-+ 0,
-+ *globals,
-+ nullptr,
-+ nullptr);
-+#else
- ss->execute(octx, *(kg->osl->bump_state[shader]), *globals);
-+#endif
-
- /* reset state */
- sd->P = P;
-@@ -164,7 +184,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const
KernelGlobalsCPU *kg,
-
- /* surface shader */
- if (kg->osl->surface_state[shader]) {
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ ss->execute(*octx,
-+ *(kg->osl->surface_state[shader]),
-+ kg->osl_thread_index,
-+ 0,
-+ *globals,
-+ nullptr,
-+ nullptr);
-+#else
- ss->execute(octx, *(kg->osl->surface_state[shader]), *globals);
-+#endif
- }
- }
-
-@@ -208,7 +238,17 @@ void osl_eval_nodes<SHADER_TYPE_VOLUME>(const
KernelGlobalsCPU *kg,
- int shader = sd->shader & SHADER_MASK;
-
- if (kg->osl->volume_state[shader]) {
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ ss->execute(*octx,
-+ *(kg->osl->volume_state[shader]),
-+ kg->osl_thread_index,
-+ 0,
-+ *globals,
-+ nullptr,
-+ nullptr);
-+#else
- ss->execute(octx, *(kg->osl->volume_state[shader]), *globals);
-+#endif
- }
-
- /* flatten closure tree */
-@@ -245,7 +285,17 @@ void osl_eval_nodes<SHADER_TYPE_DISPLACEMENT>(const
KernelGlobalsCPU *kg,
- int shader = sd->shader & SHADER_MASK;
-
- if (kg->osl->displacement_state[shader]) {
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ ss->execute(*octx,
-+ *(kg->osl->displacement_state[shader]),
-+ kg->osl_thread_index,
-+ 0,
-+ *globals,
-+ nullptr,
-+ nullptr);
-+#else
- ss->execute(octx, *(kg->osl->displacement_state[shader]), *globals);
-+#endif
- }
-
- /* get back position */
-diff --git a/intern/cycles/kernel/osl/globals.cpp
b/intern/cycles/kernel/osl/globals.cpp
-index c4f055af7f7..573ddb6f362 100644
---- a/intern/cycles/kernel/osl/globals.cpp
-+++ b/intern/cycles/kernel/osl/globals.cpp
-@@ -14,7 +14,7 @@
-
- CCL_NAMESPACE_BEGIN
-
--void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals)
-+void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals,
const int thread_index)
- {
- /* no osl used? */
- if (!osl_globals->use) {
-@@ -37,6 +37,7 @@ void OSLGlobals::thread_init(KernelGlobalsCPU *kg,
OSLGlobals *osl_globals)
-
- kg->osl_ss = (OSLShadingSystem *)ss;
- kg->osl_tdata = tdata;
-+ kg->osl_thread_index = thread_index;
- }
-
- void OSLGlobals::thread_free(KernelGlobalsCPU *kg)
-diff --git a/intern/cycles/kernel/osl/globals.h
b/intern/cycles/kernel/osl/globals.h
-index 9656ef08306..cf24c62613b 100644
---- a/intern/cycles/kernel/osl/globals.h
-+++ b/intern/cycles/kernel/osl/globals.h
-@@ -45,7 +45,9 @@ struct OSLGlobals {
- }
-
- /* per thread data */
-- static void thread_init(struct KernelGlobalsCPU *kg, OSLGlobals
*osl_globals);
-+ static void thread_init(struct KernelGlobalsCPU *kg,
-+ OSLGlobals *osl_globals,
-+ const int thread_init);
- static void thread_free(struct KernelGlobalsCPU *kg);
-
- bool use;
-diff --git a/intern/cycles/kernel/osl/osl.h b/intern/cycles/kernel/osl/osl.h
-index 347b635632a..3238eb5096b 100644
---- a/intern/cycles/kernel/osl/osl.h
-+++ b/intern/cycles/kernel/osl/osl.h
-@@ -52,6 +52,11 @@ ccl_device_inline void
shaderdata_to_shaderglobals(KernelGlobals kg,
-
- /* shader data to be used in services callbacks */
- globals->renderstate = sd;
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ globals->shadingStateUniform = nullptr;
-+ globals->thread_index = 0;
-+ globals->shade_index = 0;
-+#endif
-
- /* hacky, we leave it to services to fetch actual object matrix */
- globals->shader2common = sd;
-diff --git a/intern/cycles/kernel/osl/services.cpp
b/intern/cycles/kernel/osl/services.cpp
-index 02dc1cd1aec..93595b0a458 100644
---- a/intern/cycles/kernel/osl/services.cpp
-+++ b/intern/cycles/kernel/osl/services.cpp
-@@ -1165,7 +1165,18 @@ bool OSLRenderServices::get_userdata(
- return false; /* disabled by lockgeom */
- }
-
--#if OSL_LIBRARY_VERSION_CODE >= 11100
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+TextureSystem::TextureHandle
*OSLRenderServices::get_texture_handle(OSLUStringHash filename,
-+
OSL::ShadingContext *context,
-+ const
TextureOpt *opt)
-+{
-+ return get_texture_handle(to_ustring(filename), context, opt);
-+}
-+
-+TextureSystem::TextureHandle
*OSLRenderServices::get_texture_handle(OSL::ustring filename,
-+
OSL::ShadingContext *,
-+ const
TextureOpt *)
-+#elif OSL_LIBRARY_VERSION_CODE >= 11100
- TextureSystem::TextureHandle
*OSLRenderServices::get_texture_handle(OSLUStringHash filename,
-
OSL::ShadingContext *)
- #else
-@@ -1616,7 +1627,17 @@ bool OSLRenderServices::environment(OSLUStringHash
filename,
- return status;
- }
-
--#if OSL_LIBRARY_VERSION_CODE >= 11100
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+bool OSLRenderServices::get_texture_info(OSLUStringHash filename,
-+ TextureHandle *texture_handle,
-+ TexturePerthread
*texture_thread_info,
-+ OSL::ShaderGlobals *,
-+ int subimage,
-+ OSLUStringHash dataname,
-+ TypeDesc datatype,
-+ void *data,
-+ OSLUStringHash *)
-+#elif OSL_LIBRARY_VERSION_CODE >= 11100
- bool OSLRenderServices::get_texture_info(OSLUStringHash filename,
- TextureHandle *texture_handle,
- TexturePerthread
*texture_thread_info,
-@@ -1627,7 +1648,7 @@ bool OSLRenderServices::get_texture_info(OSLUStringHash
filename,
- void *data,
- OSLUStringHash *)
- #else
--bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg,
-+bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *,
- OSLUStringHash filename,
- TextureHandle *texture_handle,
- int subimage,
-diff --git a/intern/cycles/kernel/osl/services.h
b/intern/cycles/kernel/osl/services.h
-index b674fa7c7a7..62d8a4c5416 100644
---- a/intern/cycles/kernel/osl/services.h
-+++ b/intern/cycles/kernel/osl/services.h
-@@ -189,7 +189,14 @@ class OSLRenderServices : public OSL::RendererServices {
- void *val,
- bool derivatives) override;
-
--#if OSL_LIBRARY_VERSION_CODE >= 11100
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ TextureSystem::TextureHandle *get_texture_handle(OSL::ustring filename,
-+ OSL::ShadingContext
*context,
-+ const TextureOpt *options)
override;
-+ TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename,
-+ OSL::ShadingContext
*context,
-+ const TextureOpt *options)
override;
-+#elif OSL_LIBRARY_VERSION_CODE >= 11100
- TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename,
- OSL::ShadingContext
*context) override;
- #else
-@@ -245,7 +252,17 @@ class OSLRenderServices : public OSL::RendererServices {
- float *dresultdt,
- OSLUStringHash *errormessage) override;
-
--#if OSL_LIBRARY_VERSION_CODE >= 11100
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
-+ bool get_texture_info(OSLUStringHash filename,
-+ TextureHandle *texture_handle,
-+ TexturePerthread *texture_thread_info,
-+ OSL::ShaderGlobals *sg,
-+ int subimage,
-+ OSLUStringHash dataname,
-+ TypeDesc datatype,
-+ void *data,
-+ OSLUStringHash *errormessage) override;
-+#elif OSL_LIBRARY_VERSION_CODE >= 11100
- bool get_texture_info(OSLUStringHash filename,
- TextureHandle *texture_handle,
- TexturePerthread *texture_thread_info,
-diff --git a/intern/cycles/kernel/osl/types.h
b/intern/cycles/kernel/osl/types.h
-index 71c808ff91b..8cb5779961a 100644
---- a/intern/cycles/kernel/osl/types.h
-+++ b/intern/cycles/kernel/osl/types.h
-@@ -86,8 +86,10 @@ struct ShaderGlobals {
- ccl_private void *tracedata;
- ccl_private void *objdata;
- void *context;
--#if OSL_LIBRARY_VERSION_CODE >= 11302
-+#if OSL_LIBRARY_VERSION_CODE >= 11304
- void *shadingStateUniform;
-+ int thread_index;
-+ int shade_index;
- #endif
- void *renderer;
- ccl_private void *object2common;
