[arch-commits] Commit in blender/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Friday, September 4, 2020 @ 20:18:24
  Author: svenstaro
Revision: 698581

upgpkg: blender 17:2.90.0-2: Explicitly set current tag version for all submodules

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-04 20:18:16 UTC (rev 698580)
+++ PKGBUILD	2020-09-04 20:18:24 UTC (rev 698581)
@@ -2,25 +2,13 @@
 # Contributor: John Sowiak <john at archlinux.org>
 # Contributor: tobias <tobias at archlinux.org>
 
-# Sometimes blender.org takes some time to release patch releases and because Arch users
-# are impatient, we sometimes need to build from git directly.
-# Update because I get so many queries on this:
-# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases.
-# More often than not, a new openshadinglanguage breaks it and I could either backport fixes
-# or simply roll with a new version. I usually choose the latter when the former seems
-# unreasonable.
-
 # For legal reasons, we can't separately package the Optix headers so we'll
 # just build the package against them. I checked with NVIDIA and this way is
 # fine with them.
 
-_gittag=v2.90.0
-# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
-
 pkgname=blender
 pkgver=2.90.0
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -34,7 +22,8 @@
 makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
-source=("git://git.blender.org/blender-addons.git"
+source=("git://git.blender.org/blender.git#tag=v$pkgver"
+        "git://git.blender.org/blender-addons.git"
         "git://git.blender.org/blender-addons-contrib.git"
         "git://git.blender.org/blender-translations.git"
         "git://git.blender.org/blender-dev-tools.git"
@@ -41,22 +30,17 @@
         https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/91aeb452ab251b307311fe869e8e14df945ec6bc
         cuda11.patch
         https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
-if [[ -n $_gittag ]]; then
-    source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
-elif [[ -n $_gitcommit ]]; then
-    source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
-fi
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '46358fe7dab620eb9a7414baa851e7d28818b7c2845f723f7dd0f4b0f721902583a6b57c9c2d5e153c5057cc958727489d301c5195dfd3befee96cde539d813a'
             '76d55f49cf0475d3050a3ff534da47345aae862fd5ee0e336143c041ef58c5d4ebd6e922eb8a23c01cc35d19537c46698910b0b52a090cdcea4e5f67e4fb5650'
-            'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
-            'SKIP')
+            'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname"
 
   git submodule init
   git config submodule."release/scripts/addons".url "${srcdir}/blender-addons"
@@ -64,6 +48,7 @@
   git config submodule."release/datafiles/locale".url "${srcdir}/blender-translations"
   git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
   git submodule update
+  git submodule foreach git checkout v${pkgver}
 
   patch -Np1 -i "$srcdir"/91aeb452ab251b307311fe869e8e14df945ec6bc
   patch -Np1 -i "$srcdir"/cuda11.patch
@@ -70,7 +55,7 @@
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname"
 
   cmake . \
     -Bbuild \
@@ -90,7 +75,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname"
 
   DESTDIR="${pkgdir}" ninja -C build install
   install -Dm755 release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl"