diff --git a/extra/blender/.SRCINFO b/extra/blender/.SRCINFO index b6e3a94a5..6c3c77776 100644 --- a/extra/blender/.SRCINFO +++ b/extra/blender/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = blender pkgdesc = A fully integrated 3D graphics creation suite - pkgver = 4.1.1 - pkgrel = 11 + pkgver = 4.2.0 + pkgrel = 2 epoch = 17 url = https://www.blender.org arch = x86_64 @@ -98,23 +98,17 @@ 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.1.1 - source = git+https://projects.blender.org/blender/blender-addons.git#tag=v4.1.1 - source = git+https://projects.blender.org/blender/blender-addons-contrib#tag=v4.1.1 - source = git+https://projects.blender.org/blender/blender-assets#tag=v4.1.1 + source = git+https://projects.blender.org/blender/blender.git#tag=v4.2.0 + source = git+https://projects.blender.org/blender/blender-assets#tag=v4.2.0 source = https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip source = force-draco1.patch - source = force-draco2.patch source = blender-4.11-mantaflow-python-3.12.patch source = ffmpeg-7-1.patch source = ffmpeg-7-2.patch - sha512sums = 194274ee62c2a3b96e81af92520d424fb7bda24902cffcf2cd9a2e343c0627fe74cdd08d52709c8f181df72f7e36fc64f6144412c459f5a5a0b4497babd2fe07 - sha512sums = 4476c93942e5efc5a8ee7c4ef1caea2e77dc6e40eb825e35c0120f7e9f714ff8bdb873bb83d47ac27f8616eedac8e52f15804ed603c093044490f89e626baa80 - sha512sums = 877ed9ced417c5879b0bc6a7d3d87aa68a3e4015df9c08945c468dfab59a513bdd03523b7593e556fc9d0e22dbad25d980238e25583ea34a77ffcae3693cd0e7 - sha512sums = 2eaa05da22d4a304d1db310bd8c04358e70fdd927cbaadd574e179a86bf288c7b4fa1188d15f1928788ce9c5d2b15b512d47743a230e703f44c07cb7bbc39c5b + sha512sums = 21346666b2cc462f2d11ddfdd69fde176cd4025fa9dc39ea4c414601801030081e04e724380607784ba12fa60708cc01c521012a454740144e6935011477dd00 + sha512sums = c66cf633fafcf93f0e570d173c0a290a5cf573888da1170949981ff878aaaf28d6274b3175ae29b16d962fabd7902e93711a0deed743a3f5f0fe9d61f08d2faf sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483 sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0 - sha512sums = c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f sha512sums = 59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9 sha512sums = ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e sha512sums = e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9 diff --git a/extra/blender/.nvchecker.toml b/extra/blender/.nvchecker.toml new file mode 100644 index 000000000..36a4552ee --- /dev/null +++ b/extra/blender/.nvchecker.toml @@ -0,0 +1,4 @@ +[blender] +source = "git" +git = "https://projects.blender.org/blender/blender-assets" +prefix = "v" diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index bfd03557b..a493b4bc3 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -17,8 +17,8 @@ buildarch=8 # fine with them. pkgname=blender -pkgver=4.1.1 -pkgrel=11 +pkgver=4.2.0 +pkgrel=2 epoch=17 pkgdesc="A fully integrated 3D graphics creation suite" arch=('x86_64') @@ -112,22 +112,16 @@ optdepends=('libdecor: wayland support') # We're using !lto here as otherwise we get stuff such as FS#77557 options=('!lto') source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver" - "git+https://projects.blender.org/blender/blender-addons.git#tag=v$pkgver" - "git+https://projects.blender.org/blender/blender-addons-contrib#tag=v$pkgver" "git+https://projects.blender.org/blender/blender-assets#tag=v$pkgver" https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip force-draco1.patch - force-draco2.patch blender-4.11-mantaflow-python-3.12.patch ffmpeg-7-1.patch ffmpeg-7-2.patch) -sha512sums=('194274ee62c2a3b96e81af92520d424fb7bda24902cffcf2cd9a2e343c0627fe74cdd08d52709c8f181df72f7e36fc64f6144412c459f5a5a0b4497babd2fe07' - '4476c93942e5efc5a8ee7c4ef1caea2e77dc6e40eb825e35c0120f7e9f714ff8bdb873bb83d47ac27f8616eedac8e52f15804ed603c093044490f89e626baa80' - '877ed9ced417c5879b0bc6a7d3d87aa68a3e4015df9c08945c468dfab59a513bdd03523b7593e556fc9d0e22dbad25d980238e25583ea34a77ffcae3693cd0e7' - '2eaa05da22d4a304d1db310bd8c04358e70fdd927cbaadd574e179a86bf288c7b4fa1188d15f1928788ce9c5d2b15b512d47743a230e703f44c07cb7bbc39c5b' +sha512sums=('21346666b2cc462f2d11ddfdd69fde176cd4025fa9dc39ea4c414601801030081e04e724380607784ba12fa60708cc01c521012a454740144e6935011477dd00' + 'c66cf633fafcf93f0e570d173c0a290a5cf573888da1170949981ff878aaaf28d6274b3175ae29b16d962fabd7902e93711a0deed743a3f5f0fe9d61f08d2faf' '5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483' 'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0' - 'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f' '59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9' 'ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e' 'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9') @@ -145,13 +139,8 @@ prepare() { git -C release/datafiles/assets lfs fetch network-origin git -C release/datafiles/assets lfs checkout - # Copy addons to expected location - cp -r "$srcdir"/blender-addons scripts/addons - cp -r "$srcdir"/blender-addons-contrib scripts/addons_contrib - # fix draco patch -p1 -i "$srcdir"/force-draco1.patch - patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch # fix fluid sim domain with python 3.12 # https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/18 @@ -210,9 +199,6 @@ package() { install -Dm644 release/freedesktop/org.blender.Blender.metainfo.xml "${pkgdir}/usr/share/metainfo/org.blender.Blender.metainfo.xml" - # Manually install additional scripts (See FS#69351) - cp -r scripts/addons_contrib/* "${pkgdir}"/usr/share/blender/4*/scripts/addons_contrib/ - # Manually install draco bindings (See FS#73415) mkdir -p "${pkgdir}/usr/lib/python$(_get_pyver)"/ mv "${pkgdir}"/usr/share/blender/4*/python/lib/* "${pkgdir}"/usr/lib/