summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD17
1 files changed, 11 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a1fdd07b2a58..88d70e78c46d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Fredrick Brennan <copypaste@kittens.ph>
# Submitter: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=blender-git
-pkgver=84454.690478027bd
+pkgname=blender-oidn-git
+pkgver=85418.65a3fe46b50
pkgrel=1
pkgdesc="A fully integrated 3D graphics creation suite (development)"
arch=('i686' 'x86_64')
url="http://blender.org/"
depends=('libgl' 'python' 'desktop-file-utils' 'hicolor-icon-theme'
'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio'
- 'openshadinglanguage' 'libtiff' 'libpng' 'python-numpy')
+ 'openshadinglanguage' 'libtiff' 'libpng' 'python-numpy' 'oidn')
optdepends=('cuda: CUDA support in Cycles')
makedepends=('git' 'cmake' 'boost' 'mesa')
provides=('blender')
-conflicts=('blender')
+conflicts=('blender' 'blender-git')
license=('GPL')
install=blender.install
# NOTE: the source array has to be kept in sync with .gitmodules
@@ -25,9 +25,11 @@ source=('git://git.blender.org/blender.git' \
'blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git' \
'blender-translations.git::git://git.blender.org/blender-translations.git' \
'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \
- blender.desktop)
+ 'blender.desktop' \
+ 'D4304.diff')
md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
- '47e5bbe93fc221066882947211ff7812')
+ '47e5bbe93fc221066882947211ff7812'
+ '77f1e909583a438205044d6b13114085')
# determine whether we can precompile CUDA kernels
_CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true
@@ -47,6 +49,9 @@ prepare() {
git submodule update --init --recursive
git submodule foreach git checkout master
git submodule foreach git pull --rebase origin master
+ git add -A
+ git reset --hard
+ patch -p0 --fuzz 3 < ../../D4304.diff
}
build() {