haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

blender: bump to 3.3.21 (#11631)

Browse Source
This commit is contained in:
kenmays
2025-01-10 09:02:12 -08:00
committed by GitHub
parent 63174ca26e
commit 4bb2942978
2 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
media-gfx/blender/blender3-3.3.12.recipe → media-gfx/blender/blender3-3.3.21.recipe
View File

@@ -8,11 +8,11 @@ application and write specialized tools; often these are included in Blender’s
future releases. Blender is well suited to individuals and small studios who \
benefit from its unified pipeline and responsive development process."
HOMEPAGE="https://www.blender.org/"
COPYRIGHT="2002-2023 Blender Foundation"
COPYRIGHT="2002-2024 Blender Foundation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.xz"
CHECKSUM_SHA256="dd5ecf5f37aeb708f46796fb2e16b7b2a5556c929f3bb4a1b0df3c8d0768afd3"
CHECKSUM_SHA256="4a9c4c49673ea051e265f97a87cfd20f5e3cd77bab719f3a4a1191c8958d34eb"
SOURCE_DIR="blender-$portVersion"
PATCHES="
blender3-$portVersion.patchset
@@ -22,8 +22,7 @@ ADDITIONAL_FILES="
Blender3.sh
"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="!all x86_64"
PYTHON_VERSION="3.10"
@@ -50,6 +49,7 @@ REQUIRES="
lib:libembree3$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libfftw3$secondaryArchSuffix
lib:libfmt$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
lib:libgl$secondaryArchSuffix
@@ -59,6 +59,7 @@ REQUIRES="
lib:libgmpxx$secondaryArchSuffix
lib:libgomp$secondaryArchSuffix
lib:libhdf5$secondaryArchSuffix
lib:libhpdf$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libicui18n$secondaryArchSuffix
lib:libicuuc$secondaryArchSuffix
@@ -67,7 +68,7 @@ REQUIRES="
lib:libimath_3_0$secondaryArchSuffix
lib:libopenexr_3_0$secondaryArchSuffix
lib:libopenexrutil_3_0$secondaryArchSuffix
lib:libLLVM_12$secondaryArchSuffix
lib:libLLVM$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
lib:liblzo2$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
@@ -75,20 +76,20 @@ REQUIRES="
lib:libopencolorio$secondaryArchSuffix
lib:libopenimageio$secondaryArchSuffix
lib:libopenjp2$secondaryArchSuffix
# lib:libopenvdb$secondaryArchSuffix
lib:libosdCPU$secondaryArchSuffix
lib:libosdGPU$secondaryArchSuffix
# lib:liboslcomp$secondaryArchSuffix
lib:libpcre$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpotrace$secondaryArchSuffix
lib:libpugixml$secondaryArchSuffix
lib:libpython${PYTHON_VERSION}$secondaryArchSuffix
lib:libpystring$secondaryArchSuffix
lib:libsdl2_2.0$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libtinyxml$secondaryArchSuffix
lib:libturbojpeg$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libyaml_cpp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
@@ -102,17 +103,18 @@ BUILD_REQUIRES="
devel:libalembic$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavdevice$secondaryArchSuffix
devel:libboost_atomic$secondaryArchSuffix >= 1.69.0
devel:libboost_chrono$secondaryArchSuffix >= 1.69.0
devel:libboost_date_time$secondaryArchSuffix >= 1.69.0
devel:libboost_filesystem$secondaryArchSuffix >= 1.69.0
devel:libboost_locale$secondaryArchSuffix >= 1.69.0
devel:libboost_regex$secondaryArchSuffix >= 1.69.0
devel:libboost_system$secondaryArchSuffix >= 1.69.0
devel:libboost_thread$secondaryArchSuffix >= 1.69.0
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_locale$secondaryArchSuffix >= 1.83.0
devel:libboost_regex$secondaryArchSuffix >= 1.83.0
devel:libboost_system$secondaryArchSuffix >= 1.83.0
devel:libboost_thread$secondaryArchSuffix >= 1.83.0
devel:libembree3$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libfftw3$secondaryArchSuffix
devel:libfmt$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgl$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
@@ -120,6 +122,7 @@ BUILD_REQUIRES="
devel:libgmp$secondaryArchSuffix
devel:libgomp$secondaryArchSuffix
devel:libhdf5$secondaryArchSuffix
devel:libhpdf$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libicuuc$secondaryArchSuffix
devel:libiex_3_0$secondaryArchSuffix
@@ -127,28 +130,28 @@ BUILD_REQUIRES="
devel:libimath_3_0$secondaryArchSuffix
devel:libopenexr_3_0$secondaryArchSuffix
devel:libopenexrutil_3_0$secondaryArchSuffix
devel:libllvm_12$secondaryArchSuffix
devel:libllvm$secondaryArchSuffix >= 18.1
devel:liblzma$secondaryArchSuffix
devel:liblzo2$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libopencolladabaseutils$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix
devel:libopenimageio$secondaryArchSuffix
devel:libopencolorio$secondaryArchSuffix >= 2.3
devel:libopenimageio$secondaryArchSuffix >= 2.5
devel:libopenjp2$secondaryArchSuffix
# devel:libopenvdb$secondaryArchSuffix
devel:libosdCPU$secondaryArchSuffix
devel:libosdGPU$secondaryArchSuffix
# devel:liboslcomp$secondaryArchSuffix
devel:libpcre$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpotrace$secondaryArchSuffix
devel:libpugixml$secondaryArchSuffix
devel:libpython${PYTHON_VERSION}$secondaryArchSuffix
devel:libpystring$secondaryArchSuffix
devel:libsdl2_2.0$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libtinyxml$secondaryArchSuffix
devel:libturbojpeg$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libyaml_cpp$secondaryArchSuffix
devel:libz$secondaryArchSuffix
@@ -220,7 +223,6 @@ BUILD()
# Release settings breaks build on Haiku
BLENDER_BUGOUS="-DWITH_CYCLES_LOGGING=OFF \
-DWITH_GAMEENGINE_DECKLINK=OFF \
-DWITH_GTESTS=OFF \
-DWITH_SYSTEM_EIGEN3=ON \
-DWITH_SYSTEM_LZO=ON"
@@ -281,7 +283,7 @@ INSTALL()
rm -rf blender.desktop
addAppDeskbarSymlink $appsDir/Blender3/Blender.sh Blender-3.0
addAppDeskbarSymlink $appsDir/Blender3/Blender.sh Blender-3.3
mkdir -p $binDir
ln -s $appsDir/Blender3/blender_thumbnailer.py \

44
media-gfx/blender/patches/blender3-3.3.12.patchset → media-gfx/blender/patches/blender3-3.3.21.patchset
View File

@@ -1,4 +1,4 @@
From 6583012905fca0fb2042727b1addb84964f72dc9 Mon Sep 17 00:00:00 2001
From ae315815a64b27bc0830563dd8f8a07468f9d7e1 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 19 Mar 2021 08:13:09 +1000
Subject: Fix for Haiku
@@ -52,17 +52,17 @@ index becc2d8..9b5f808 100644
return result;
}
--
2.42.0
2.45.2
From 2180101b5d8be3a3c84ae862a60a24bc177a2419 Mon Sep 17 00:00:00 2001
From 580ba17d9d8732474d979006eeb2ccf1123de859 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 26 Dec 2021 20:55:05 +1000
Subject: Link with icu
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 148a10f..0437328 100644
index 3e56fb9..1fe5fd0 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -551,7 +551,7 @@ endif()
@@ -75,10 +75,10 @@ index 148a10f..0437328 100644
list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)
endif()
--
2.42.0
2.45.2
From b9c9da44873dbe9a5339acde877eea3ca7192c7f Mon Sep 17 00:00:00 2001
From da114511f85de0af201e30139935ef9a90b6ef77 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 26 Dec 2021 20:55:26 +1000
Subject: Use clock_gettime for Haiku
@@ -98,10 +98,10 @@ index 890a721..6fb1275 100644
* supported by Blender, use another function to get the timespec.
*
--
2.42.0
2.45.2
From 37be4c2209936f5b232ad7645a69d6df2127c318 Mon Sep 17 00:00:00 2001
From e8ecb075ab30a27ef00b15d82576fd391ec7b546 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Sun, 9 Oct 2022 05:07:14 +1000
Subject: Fix for OpenEXR 3.0.x
@@ -121,5 +121,31 @@ index 9107b56..a699628 100644
)
ELSE()
--
2.42.0
2.45.2
From 1393b23fbfb85a82671d76d13995e757d87306bd Mon Sep 17 00:00:00 2001
From: DigitalBox <user@shredder.home>
Date: Thu, 19 Sep 2024 12:53:42 +0000
Subject: OpenColorIO patch
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index 150ed1a..68f4228 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -319,8 +319,10 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures,
unsigned int height = 0;
GpuShaderCreator::TextureType channel = GpuShaderCreator::TEXTURE_RGB_CHANNEL;
Interpolation interpolation = INTERP_LINEAR;
+ GpuShaderDesc::TextureDimensions _textureDim =
+ GpuShaderDesc::TextureDimensions::TEXTURE_1D;
shader_desc->getTexture(
- index, texture_name, sampler_name, width, height, channel, interpolation);
+ index, texture_name, sampler_name, width, height, channel, _textureDim, interpolation);
const float *values;
shader_desc->getTextureValues(index, values);
--
2.45.2