extra/blender to 4.1.0-1

This commit is contained in:
Kevin Mihelich 2024-03-28 01:33:07 +00:00
parent b3996db31c
commit 2e9bdc7911
2 changed files with 16 additions and 42 deletions

View file

@ -1,7 +1,7 @@
pkgbase = blender
pkgdesc = A fully integrated 3D graphics creation suite
pkgver = 4.0.2
pkgrel = 22
pkgver = 4.1.0
pkgrel = 1
epoch = 17
url = https://www.blender.org
arch = x86_64
@ -80,7 +80,6 @@ pkgbase = blender
depends = opensubdiv
depends = openvdb
depends = openxr
depends = pcre
depends = potrace
depends = pugixml
depends = pystring
@ -98,25 +97,19 @@ pkgbase = blender
optdepends = intel-compute-runtime: Cycles renderer Intel OneAPI support
optdepends = libdecor: wayland support
options = !lto
source = git+https://projects.blender.org/blender/blender.git#tag=v4.0.2
source = git+https://projects.blender.org/blender/blender-addons.git#tag=v4.0.2
source = git+https://projects.blender.org/blender/blender-addons-contrib#tag=v4.0.2
source = svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-4.0-release/lib/assets
source = git+https://projects.blender.org/blender/blender.git#tag=v4.1.0
source = git+https://projects.blender.org/blender/blender-addons.git#tag=v4.1.0
source = git+https://projects.blender.org/blender/blender-addons-contrib#tag=v4.1.0
source = svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-4.1-release/lib/assets
source = https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip
source = https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
source = blender-openpgl6-r1.patch::https://projects.blender.org/blender/blender/commit/5d06b7b906b3.patch
source = force-draco1.patch
source = force-draco2.patch
source = blender-rocm-6.patch
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
sha512sums = 5243728ed80dd04eb2b2922e1e71b4d2cec3247c396ce5941e38f32e12bca40ac9e3945ea1e6362529b0d85a2fba995870ed9b047c95448449b50b00e3949d1c
sha512sums = f0894c620319f450a2a59f84e6d8d5884a61e648b3441a69f6e4c1ffdd61bff65928cbc41c2531df56a69c8f6a195d59a943d8b75380c816bfb101a55ff0c2b1
sha512sums = 877ed9ced417c5879b0bc6a7d3d87aa68a3e4015df9c08945c468dfab59a513bdd03523b7593e556fc9d0e22dbad25d980238e25583ea34a77ffcae3693cd0e7
sha512sums = SKIP
sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
sha512sums = 375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a
sha512sums = 016a8da844396ba1912a556fc1ff763c781ba6ce17375c9ef778352aa91e9f8af3cd66d552339eb2d65dce84c0e871ab167944ddbf75619aebc0dd82cec4ca58
sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
sha512sums = c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f
sha512sums = dc694c655690913701dba92281724671c14f7305cc8f4de6071056f4608837532194178fdddcbcf500d330a0b804d26cd9599b88ff71f9c799664e941809813a
pkgname = blender

View file

@ -17,8 +17,8 @@ buildarch=8
# fine with them.
pkgname=blender
pkgver=4.0.2
pkgrel=22
pkgver=4.1.0
pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@ -80,7 +80,6 @@ depends=(
'opensubdiv'
'openvdb'
'openxr'
'pcre'
'potrace'
# 'ptex'
'pugixml'
@ -117,21 +116,15 @@ source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"
"git+https://projects.blender.org/blender/blender-addons-contrib#tag=v$pkgver"
"svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-${pkgver%%.[^.]}-release/lib/assets"
https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip
https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
blender-openpgl6-r1.patch::https://projects.blender.org/blender/blender/commit/5d06b7b906b3.patch
force-draco1.patch
force-draco2.patch
blender-rocm-6.patch)
sha512sums=('SKIP'
'SKIP'
'SKIP'
force-draco2.patch)
sha512sums=('5243728ed80dd04eb2b2922e1e71b4d2cec3247c396ce5941e38f32e12bca40ac9e3945ea1e6362529b0d85a2fba995870ed9b047c95448449b50b00e3949d1c'
'f0894c620319f450a2a59f84e6d8d5884a61e648b3441a69f6e4c1ffdd61bff65928cbc41c2531df56a69c8f6a195d59a943d8b75380c816bfb101a55ff0c2b1'
'877ed9ced417c5879b0bc6a7d3d87aa68a3e4015df9c08945c468dfab59a513bdd03523b7593e556fc9d0e22dbad25d980238e25583ea34a77ffcae3693cd0e7'
'SKIP'
'5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
'375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a'
'016a8da844396ba1912a556fc1ff763c781ba6ce17375c9ef778352aa91e9f8af3cd66d552339eb2d65dce84c0e871ab167944ddbf75619aebc0dd82cec4ca58'
'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f'
'dc694c655690913701dba92281724671c14f7305cc8f4de6071056f4608837532194178fdddcbcf500d330a0b804d26cd9599b88ff71f9c799664e941809813a')
'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f')
prepare() {
cd "$pkgname"
@ -147,21 +140,9 @@ prepare() {
cp -r "$srcdir"/blender-addons scripts/addons
cp -r "$srcdir"/blender-addons-contrib scripts/addons_contrib
# Disable openexr core
# https://projects.blender.org/blender/blender/issues/117145
git cherry-pick -n eb99895c972b6c713294f68a34798aa51d36034a
# Fix compatibility with OSL 1.13.5
# https://projects.blender.org/blender/blender/issues/113157
git cherry-pick -n 798a0b301e640e73ae12e6f8a36a66746893bff1
patch -Np1 -i "$srcdir"/blender-openpgl6-r1.patch
# fix draco
patch -p1 -i "$srcdir"/force-draco1.patch
patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch
patch -Np1 -i "$srcdir/blender-rocm-6.patch"
}
_get_pyver() {