diff --git a/extra/blender/.SRCINFO b/extra/blender/.SRCINFO index 58ff1a711..da7a751f8 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.0 - pkgrel = 2 + pkgrel = 3 epoch = 17 url = https://www.blender.org arch = x86_64 @@ -18,6 +18,7 @@ pkgbase = blender makedepends = cmake makedepends = cuda makedepends = git + makedepends = git-lfs makedepends = hip-runtime-amd makedepends = intel-oneapi-compiler-shared-runtime makedepends = intel-oneapi-dpcpp-cpp @@ -100,7 +101,7 @@ pkgbase = blender 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 = git+https://projects.blender.org/blender/blender-assets#tag=v4.1.0 source = https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip source = force-draco1.patch source = force-draco2.patch diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 4d442d295..612ccef3f 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -18,7 +18,7 @@ buildarch=8 pkgname=blender pkgver=4.1.0 -pkgrel=2 +pkgrel=3 epoch=17 pkgdesc="A fully integrated 3D graphics creation suite" arch=('x86_64') @@ -105,6 +105,7 @@ makedepends=( 'llvm' 'mesa' 'ninja' + 'git-lfs' 'subversion' 'wayland-protocols' ) @@ -114,7 +115,7 @@ 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" - "svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-${pkgver%%.[^.]}-release/lib/assets" + "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) @@ -129,12 +130,15 @@ sha512sums=('5243728ed80dd04eb2b2922e1e71b4d2cec3247c396ce5941e38f32e12bca40ac9e prepare() { cd "$pkgname" - # Create expected path for assets - mkdir -p "$srcdir"/lib - # Copy assets to expected location - cp -r "$srcdir"/assets "$srcdir"/lib/assets - # Remove this directory to prevent it being packaged - rm -r "$srcdir"/lib/assets/.makepkg/ + git submodule init + git config submodule.release/datafiles/assets.url "$srcdir/blender-assets" + git -c protocol.file.allow=always submodule update + + # Fetch assets from git-lfs + git -C release/datafiles/assets lfs install --local + git -C release/datafiles/assets remote add network-origin https://projects.blender.org/blender/blender-assets + 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