summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
2 files changed, 9 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c5bc6352cea..48b960eae775 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-3.0-bin
pkgdesc = A fully integrated 3D graphics creation suite
- pkgver = 3.0.210513.d70cfb90e0fa
+ pkgver = 3.0.210525.0606a37e1a8c
pkgrel = 1
url = https://www.blender.org
arch = x86_64
@@ -40,7 +40,7 @@ pkgbase = blender-3.0-bin
depends = sdl2
depends = embree
optdepends = cuda: cycles renderer cuda support
- source = daily.210514.html::https://builder.blender.org/download/
+ source = daily.210525.html::https://builder.blender.org/download/
md5sums = SKIP
pkgname = blender-3.0-bin
diff --git a/PKGBUILD b/PKGBUILD
index 77f260b2993e..6acaf008cba0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Oliver Mangold <o.mangold@gmail.com>
# Contributor: Adam Brunnmeier <adam.brunnmeier@gmail.com>
pkgname=blender-3.0-bin
-pkgver=3.0.210513.d70cfb90e0fa
+pkgver=3.0.210525.0606a37e1a8c
pkgrel=1
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -25,10 +25,11 @@ md5sums=('SKIP')
_setvars() {
cd "$srcdir"
_upstreamversion=$(echo $pkgname | cut -d '-' -f2)
- local regex="blender-${_upstreamversion}[^-]*-([^-]+)-linux64.tar.xz" && [[ $(cat $_webpage) =~ $regex ]]
+ local regex="blender-${_upstreamversion}[^-]*[^\+]+\+([^.]+).([^-]+)-linux.x86_64-release.tar.xz" && [[ $(cat $_webpage) =~ $regex ]]
_full=${BASH_REMATCH[0]}
- _commit=${BASH_REMATCH[1]}
- local regex="([A-Za-z]+ [0-9]+, [0-9]+:[0-9]+:[0-9]+)[^-]*-\s*$_commit" && [[ $(cat $_webpage) =~ $regex ]]
+ _branch=${BASH_REMATCH[1]}
+ _commit=${BASH_REMATCH[2]}
+ local regex="([A-Za-z]+ [0-9]+, [0-9]+:[0-9]+:[0-9]+) - $_branch - $_commit" && [[ $(cat $_webpage) =~ $regex ]]
_date=$(date --date="${BASH_REMATCH[1]//,}" "+%y%m%d")
}
@@ -40,10 +41,10 @@ pkgver() {
build() {
_setvars
cd "$srcdir"
- wget -nc "https://builder.blender.org/download/$_full"
+ wget -nc "https://builder.blender.org/download/daily/$_full"
tar -xJ -f "$_full"
cd "${_full%.tar.xz}"
- # Remove included Python installation, so system Python is used instead. (python 3.9) (working 2021-05-14)
+ # Remove included Python installation, so system Python is used instead. (python 3.9) (working 2021-05-21)
rm -rf "$_upstreamversion/python"
sed -i "s/=blender/=blender-$_upstreamversion/" blender.desktop
sed -i "s/=Blender/=Blender-$_upstreamversion/" blender.desktop