diff options
author | bartus | 2019-10-15 13:16:17 +0200 |
---|---|---|
committer | bartus | 2019-10-15 13:16:17 +0200 |
commit | 1a328e5b5de7f4675cf44f8974f12189b8bfe74a (patch) | |
tree | 0edb2c66821ec890c1daa0ce352e2f6a3da87343 | |
parent | 88ca96fcdf12b5c2c22d103272d1693f2c2b3691 (diff) | |
download | aur-1a328e5b5de7f4675cf44f8974f12189b8bfe74a.tar.gz |
Update conflicts
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-2.8-git pkgdesc = Development version of Blender 2.8 branch - pkgver = 2.82.r91251.e2e95d56ffc + pkgver = 2.82.r91259.3cdcd1fa9f0 pkgrel = 1 url = https://blender.org/ install = blender.install @@ -35,8 +35,9 @@ pkgbase = blender-2.8-git depends = libtiff depends = libpng optdepends = cuda: CUDA support in Cycles - provides = blender-2.81 - conflicts = blender-2.81 + provides = blender-2.82 + conflicts = blender-2.82 + options = debug 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 @@ -8,8 +8,9 @@ pkgname=blender-2.8-git _fragment="#branch=master" -pkgver=2.82.r91251.e2e95d56ffc +pkgver=2.82.r91259.3cdcd1fa9f0 pkgrel=1 +options=(debug) pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') url="https://blender.org/" @@ -19,8 +20,8 @@ depends=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg' 'desktop-file-util makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm') ((DISABLE_NINJA)) || makedepends+=('ninja') ((DISABLE_CUDA)) && optdepends=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); } -provides=('blender-2.81') -conflicts=('blender-2.81') +provides=('blender-2.82') +conflicts=('blender-2.82') license=('GPL') install=blender.install # NOTE: the source array has to be kept in sync with .gitmodules |