Date: Wednesday, March 28, 2018 @ 22:19:52
Author: svenstaro
Revision: 313186
upgpkg: blender 17:2.79.a-1
Modified:
blender/trunk/PKGBUILD
Deleted:
blender/trunk/cuda9.patch
-------------+
PKGBUILD | 17 ++++++++---------
cuda9.patch | 40 ----------------------------------------
2 files changed, 8 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-28 22:01:50 UTC (rev 313185)
+++ PKGBUILD 2018-03-28 22:19:52 UTC (rev 313186)
@@ -11,13 +11,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
- _gittag=v2.79
+ _gittag=v2.79a
#_gitcommit=3c3d0898b0c1a1d7da70f4a1778d4360b3cfe5c8
pkgname=blender
-pkgver=2.79
+pkgver=2.79.a
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=10
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -28,7 +28,7 @@
'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
'alembic'
'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2')
-makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm35' 'gcc6')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc6')
makedepends_x86_64=('cuda')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
@@ -36,8 +36,7 @@
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
- "git://git.blender.org/scons.git"
- cuda9.patch)
+ "git://git.blender.org/scons.git")
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -48,7 +47,6 @@
'SKIP'
'SKIP'
'SKIP'
- '88f47cac4cac2977f006c0ce22f84e53'
'SKIP')
prepare() {
@@ -62,10 +60,11 @@
git config submodule."scons".url ${srcdir}/scons
git submodule update
- patch -Np1 < "${srcdir}"/cuda9.patch
-
# cuda 9.1 fixes
sed -i -e "s/sm_20;//" -e "s/sm_21;//"
build_files/cmake/config/blender_release.cmake
+
+ # openvdb 5 fix
+ sed -i "s/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER ==
3/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3/g"
intern/openvdb/intern/openvdb_writer.cc
}
build() {
Deleted: cuda9.patch
===================================================================
--- cuda9.patch 2018-03-28 22:01:50 UTC (rev 313185)
+++ cuda9.patch 2018-03-28 22:19:52 UTC (rev 313186)
@@ -1,40 +0,0 @@
-X-Git-Url:
https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/22ecea9e38e708056262f3d98b0d0c6210da75cf..f55735e533601b559d53fd1e2c5297092e844345:/intern/cycles/kernel/CMakeLists.txt
-
-diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
-index b4ca16bdb48..b10dd05cb9b 100644
---- a/intern/cycles/kernel/CMakeLists.txt
-+++ b/intern/cycles/kernel/CMakeLists.txt
-@@ -321,7 +321,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
- set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
-
- # warn for other versions
-- if(CUDA_VERSION MATCHES "80")
-+ if(CUDA_VERSION MATCHES "80" OR CUDA_VERSION MATCHES "90")
- else()
- message(WARNING
- "CUDA version
${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
-@@ -399,13 +399,17 @@ if(WITH_CYCLES_CUDA_BINARIES)
- endmacro()
-
- foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
-- # Compile regular kernel
-- CYCLES_CUDA_KERNEL_ADD(${arch} kernel "" "${cuda_sources}"
FALSE)
-- CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
--
-- if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
-- # Compile split kernel
-- CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
-+ if(CUDA_VERSION MATCHES "90" AND ${arch} MATCHES "sm_2.")
-+ message(STATUS "CUDA binaries for ${arch} disabled, not
supported by CUDA 9.")
-+ else()
-+ # Compile regular kernel
-+ CYCLES_CUDA_KERNEL_ADD(${arch} kernel ""
"${cuda_sources}" FALSE)
-+ CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
-+
-+ if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
-+ # Compile split kernel
-+ CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
-+ endif()
- endif()
- endforeach()
-
