aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-07-30 13:24:50 +0200
committerbartus2019-07-30 13:24:50 +0200
commitc52f2f5025d9b184df6dd64262e22bc1777dec89 (patch)
tree15afc57db2303c479e8dce17711a3baa3c2fdc4d
parente6c07f52ff192653477205e7bdacefdeb5695729 (diff)
downloadaur-c52f2f5025d9b184df6dd64262e22bc1777dec89.tar.gz
Drop conflicts as blender master is now 2.81-alpha.
This reverts commit d5bc8a15c859d2abcacac1265295922689244be6.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64154fdec529..693813b4247e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,8 +35,8 @@ pkgbase = blender-2.8-git
depends = libtiff
depends = libpng
optdepends = cuda: CUDA support in Cycles
- provides = blender=2.80
- conflicts = blender
+ provides = blender-2.81
+ conflicts = blender-2.81
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 6ae43eb8b75e..0295341fdf08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,8 @@ optdepends=('cuda: CUDA support in Cycles')
makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm')
((DISABLE_NINJA)) || makedepends+=('ninja')
((DISABLE_CUDA)) || makedepends+=('cuda')
-provides=('blender=2.80')
-conflicts=('blender')
+provides=('blender-2.81')
+conflicts=('blender-2.81')
license=('GPL')
install=blender.install
# NOTE: the source array has to be kept in sync with .gitmodules