Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blender: bump to 3.3.1 #7277

Merged
merged 7 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion media-gfx/blender/additional-files/Blender3.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
MESA_GL_VERSION_OVERRIDE="4.1" `finddir B_APPS_DIRECTORY`/Blender3/Blender -p 50 50 1024 768
MESA_GL_VERSION_OVERRIDE="4.6" `finddir B_APPS_DIRECTORY`/Blender3/Blender -p 50 50 1024 768
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPYRIGHT="2002-2022 Blender Foundation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.xz"
CHECKSUM_SHA256="19bb0a96269e0a5c4b5d62b98363836054471c096b83d9755598b25b347d7441"
CHECKSUM_SHA256="2ada48f0bf8a0ca802b987d757452012e1f8f24acf4d23453b09c2d595118cca"
SOURCE_DIR="blender-$portVersion"
PATCHES="
blender3-$portVersion.patchset
Expand All @@ -25,7 +25,7 @@ ADDITIONAL_FILES="
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

PYTHON_VERSION="3.9"
PYTHON_VERSION="3.10"

PROVIDES="
blender3$secondaryArchSuffix = $portVersion
Expand All @@ -34,8 +34,8 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
numpy${secondaryArchSuffix}_python39
requests_python39
numpy${secondaryArchSuffix}_python310
requests_python310
lib:libalembic$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavdevice$secondaryArchSuffix
Expand Down Expand Up @@ -65,6 +65,8 @@ REQUIRES="
lib:libiex_3_0$secondaryArchSuffix
lib:libilmthread_3_0$secondaryArchSuffix
lib:libimath_3_0$secondaryArchSuffix
lib:libopenexr_3_0$secondaryArchSuffix
lib:libopenexrutil_3_0$secondaryArchSuffix
lib:libLLVM_9$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
lib:liblzo2$secondaryArchSuffix
Expand Down Expand Up @@ -95,7 +97,7 @@ REQUIRES="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
numpy${secondaryArchSuffix}_python39
numpy${secondaryArchSuffix}_python310
devel:eigen$secondaryArchSuffix
devel:libalembic$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
Expand Down Expand Up @@ -123,6 +125,8 @@ BUILD_REQUIRES="
devel:libiex_3_0$secondaryArchSuffix
devel:libilmthread_3_0$secondaryArchSuffix
devel:libimath_3_0$secondaryArchSuffix
devel:libopenexr_3_0$secondaryArchSuffix
devel:libopenexrutil_3_0$secondaryArchSuffix
devel:libllvm_9$secondaryArchSuffix
devel:liblzma$secondaryArchSuffix
devel:liblzo2$secondaryArchSuffix
Expand Down Expand Up @@ -152,8 +156,8 @@ BUILD_REQUIRES="
lib:libavdevice$secondaryArchSuffix # REQUIRED
"
BUILD_PREREQUIRES="
numpy${secondaryArchSuffix}_python39
requests_python39
numpy${secondaryArchSuffix}_python310
requests_python310
cmd:cmake
cmd:find
cmd:gcc$secondaryArchSuffix
Expand All @@ -167,7 +171,7 @@ BUILD_PREREQUIRES="

PATCH()
{
find . -type f -name "*.py" | xargs sed -i -e 's,python3,python3.9,g'
find . -type f -name "*.py" | xargs sed -i -e 's,python3,python3.10,g'
}

BUILD()
Expand Down
229 changes: 0 additions & 229 deletions media-gfx/blender/patches/blender3-3.0.1.patchset

This file was deleted.