aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-03-10 08:01:33 +0100
committerbartus2020-03-10 08:01:33 +0100
commit69ad5501effd9b3facdd41687283a789da68373b (patch)
treed096feac793ebaadf1bd343cb2bb006c61130686
parent7b3c9950425ae9426a317263b54be58c9214e8f8 (diff)
downloadaur-69ad5501effd9b3facdd41687283a789da68373b.tar.gz
Add `blender-git` conflict when same version.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99454c91dba5..aedd2c92c2d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-2.8-git
pkgdesc = Development version of Blender 2.8 branch
- pkgver = 2.83.r93980.g598ab525da3
+ pkgver = 2.83.r94036.g7b8ac04d86e
pkgrel = 1
url = https://blender.org/
changelog = blender.changelog
@@ -34,8 +34,8 @@ pkgbase = blender-2.8-git
depends = libpng
depends = openimagedenoise
optdepends = cuda: CUDA support in Cycles
- provides = blender-2.83
- conflicts = blender-2.83
+ provides = blender=2.83
+ conflicts = blender=2.83
source = git://git.blender.org/blender.git#branch=master
source = blender-addons.git::git://git.blender.org/blender-addons.git
source = blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git
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