aboutsummarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorbartus2020-03-10 08:01:33 +0100
committerbartus2020-03-10 08:01:33 +0100
commit69ad5501effd9b3facdd41687283a789da68373b (patch)
treed096feac793ebaadf1bd343cb2bb006c61130686 /PKGBUILD
parent7b3c9950425ae9426a317263b54be58c9214e8f8 (diff)
downloadaur-69ad5501effd9b3facdd41687283a789da68373b.tar.gz
Add `blender-git` conflict when same version.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5a27e8320c56..a72b03d0810e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ _CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
pkgname=blender-2.8-git
-pkgver=2.83.r93980.g598ab525da3
+pkgver=2.83.r94036.g7b8ac04d86e
pkgrel=1
pkgdesc="Development version of Blender 2.8 branch"
changelog=blender.changelog
@@ -37,8 +37,8 @@ depends+=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg'
'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
depends+=('openimagedenoise')
makedepends+=('git' 'cmake' 'boost' 'mesa' 'llvm')
-provides=("blender-${pkgver%%.r*}")
-conflicts=("blender-${pkgver%%.r*}")
+provides=("blender=${pkgver%%.r*}")
+conflicts=("blender=${pkgver%%.r*}")
license=('GPL')
# NOTE: the source array has to be kept in sync with .gitmodules
# the submodules has to be stored in path ending with git to match