summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22afcd2a384f..915c357ffb8e 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.210620.3da25dc625c8
+ pkgver = 3.0.211215.f1cca3055776
pkgrel = 1
url = https://www.blender.org
arch = x86_64
@@ -42,7 +42,7 @@ pkgbase = blender-3.0-bin
depends = sdl2
depends = embree
optdepends = cuda: cycles renderer cuda support
- source = daily.210619.html::https://builder.blender.org/download/
+ source = daily.211215.html::https://builder.blender.org/download/
md5sums = SKIP
pkgname = blender-3.0-bin
diff --git a/PKGBUILD b/PKGBUILD
index c8fa9a928f58..6748a7f67962 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.210620.3da25dc625c8
+pkgver=3.0.211215.f1cca3055776
pkgrel=1
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -29,7 +29,7 @@ _setvars() {
_full=${BASH_REMATCH[0]}
_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 ]]
+ local regex="([A-Za-z]+ [0-9]+, [0-9]+:[0-9]+:[0-9]+) - $_commit" && [[ $(cat $_webpage) =~ $regex ]]
_date=$(date --date="${BASH_REMATCH[1]//,}" "+%y%m%d")
}
@@ -44,17 +44,16 @@ build() {
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-21)
- rm -rf "$_upstreamversion/python"
+ # Remove included Python installation, so system Python is used instead. (python 3.10) (broken 2021-12-15)
+ #rm -rf "$_upstreamversion/python"
sed -i "s/=blender/=blender-$_upstreamversion/" blender.desktop
sed -i "s/=Blender/=Blender-$_upstreamversion/" blender.desktop
#for f in datafiles/icons/*/apps/blender.* ; do chmod 644 $f && mv $f "${f%.*}-$_upstreamversion.${f#*.}" ; done
echo -n "[Thumbnailer Entry]
-TryExec=blender-$_upstreamversion-thumbnailer.py
-Exec=blender-$_upstreamversion-thumbnailer.py %u %o
+TryExec=blender-$_upstreamversion-thumbnailer
+Exec=blender-$_upstreamversion-thumbnailer %u %o
MimeType=application/x-blender;
" > blender.thumbnailer
- sed -i '1s;^;#!/usr/share/blender/'"$_upstreamversion"'/python/bin/python3.7m\n;' blender-thumbnailer.py
echo -e "#!/bin/bash\nexec /usr/share/blender/blender-$_upstreamversion \$@" > blender-$_upstreamversion
echo -e "#!/bin/bash\nexec /usr/share/blender/blender-softwaregl-$_upstreamversion \$@" > blender-$_upstreamversion-softwaregl
}
@@ -75,5 +74,5 @@ package() {
install -Dm755 blender-$_upstreamversion "$pkgdir/usr/bin/blender-$_upstreamversion"
install -Dm755 blender-softwaregl "$pkgdir/usr/share/blender/blender-softwaregl-$_upstreamversion"
install -Dm755 blender-$_upstreamversion-softwaregl "$pkgdir/usr/bin/blender-$_upstreamversion-softwaregl"
- install -Dm755 blender-thumbnailer.py "$pkgdir/usr/bin/blender-$_upstreamversion-thumbnailer.py"
+ install -Dm755 blender-thumbnailer "$pkgdir/usr/bin/blender-$_upstreamversion-thumbnailer"
}