Version 3.6.r122604.g0323f8d1d9c

3 files changed, 20 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3cddde17bc2..7bc442decd8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-git
 	pkgdesc = A fully integrated 3D graphics creation suite (development)
-	pkgver = 3.6.r122562.gd8a439ebaf2
+	pkgver = 3.6.r122604.g0323f8d1d9c
 	pkgrel = 1
 	url = https://blender.org/
 	arch = i686
@@ -51,6 +51,7 @@ pkgbase = blender-git
 	source = blender-dev-tools::git+https://github.com/blender/blender-dev-tools
 	source = usd_python.patch
 	source = embree.patch
+	source = user-blender.slice.sh
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -58,5 +59,6 @@ pkgbase = blender-git
 	sha256sums = SKIP
 	sha256sums = c2db51a83a8d573aa76c760f10e541c84b108d64d05c9647681c4e633b3d0397
 	sha256sums = d587135fd9b815d60e8b7f48976aa835472922fc8f64c256dc397bfcd3c2642a
+	sha256sums = a62b23567d520984f36d6a3158fd99f463e3187f2ad062ead418c260fac5ea8a
 
 pkgname = blender-git
diff --git a/PKGBUILD b/PKGBUILD
index c6d298007fa6..59cd89b03d00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _fragment="${FRAGMENT:-#branch=main}"
 _CMAKE_FLAGS+=( -DWITH_CYCLES_NETWORK=OFF )
 
 pkgname=blender-git
-pkgver=3.6.r122562.gd8a439ebaf2
+pkgver=3.6.r122604.g0323f8d1d9c
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (development)"
 arch=('i686' 'x86_64')
@@ -46,6 +46,7 @@ source=("blender::git+https://github.com/blender/blender${_fragment}"
         'blender-dev-tools::git+https://github.com/blender/blender-dev-tools'
         usd_python.patch #add missing python headers when building against python enabled usd.
         embree.patch #add missing embree link.
+        user-blender.slice.sh #generate systemd compilation unit
         )
 sha256sums=('SKIP'
             'SKIP'
@@ -53,7 +54,8 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'c2db51a83a8d573aa76c760f10e541c84b108d64d05c9647681c4e633b3d0397'
-            'd587135fd9b815d60e8b7f48976aa835472922fc8f64c256dc397bfcd3c2642a')
+            'd587135fd9b815d60e8b7f48976aa835472922fc8f64c256dc397bfcd3c2642a'
+            'a62b23567d520984f36d6a3158fd99f463e3187f2ad062ead418c260fac5ea8a')
 
 pkgver() {
   blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)
@@ -65,7 +67,9 @@ pkgver() {
 }
 
 prepare() {
-  cd "$srcdir/blender"
+  cd "$srcdir"
+  ../user-blender.slice.sh > user-`id -u`-blender.slice
+  cd "blender"
   # update the submodules
   git -c protocol.file.allow=always submodule update --init --recursive --remote
   git apply -v "${srcdir}"/{embree,usd_python}.patch
@@ -114,13 +118,12 @@ build() {
         "${_CMAKE_FLAGS[@]}"
   NINJA_CMD="ninja -C ""$srcdir/build"
   if [[ "x$BLENDER_GIT_USE_SLICE_AUR" == "xy" ]]; then
-    ./../user-blender.slice.sh > user-blender.slice
-    mv user-blender.slice user-`id -u`-blender.slice
     killninja() { killall ninja; }
     trap killninja INT
     systemd-run --uid=`whoami` --slice=user-`id -u`-blender.slice -P --working-directory="$PWD" --wait --send-sighup bash -c "$NINJA_CMD"
   else
-    $NINJA_CMD
+    warning 'If you use systemd, consider trying `BLENDER_GIT_USE_SLICE_AUR=y`.'
+    $NINJA_CMD ${MAKEFLAGS:--j1}
   fi
 }
 
diff --git a/user-blender.slice.sh b/user-blender.slice.sh
new file mode 100755
index 000000000000..aef55a0a8dd1
--- /dev/null
+++ b/user-blender.slice.sh
@@ -0,0 +1,8 @@
+mem_divide_by() {
+	(bc <<< "(`cat /proc/meminfo | grep ^MemTotal: | awk '{print $2}'` * 1000) * $1" | perl -pe 's/\\.[0-9]*$') || \
+		exit 1
+}
+echo [Service]
+echo MemoryMax=$(mem_divide_by 0.75)
+echo MemoryHigh=$(mem_divide_by 0.66)
+echo CPUQuota=75%