From 2cf1f1d0987fa31faad2e8540155260540edbc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Sat, 11 Jun 2016 07:48:43 -0300 Subject: libre/blender: rebuild package --- libre/blender/PKGBUILD | 16 ++++++++-------- libre/blender/blender.install | 13 ------------- 2 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 libre/blender/blender.install diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 94a05f745..e91bcefb5 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -32,10 +32,10 @@ pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray") [[ "${_git}" = 'no' ]] && [[ -z "${_gittagrev}" ]] && pkgver="${_gittagver}" # official release [[ "${_git}" = 'no' ]] && [[ "${#_gittagrev}" > 1 ]] && pkgver="${_gittagver}${_gittagrev/-/}" # release candidate [[ "${_git}" = 'no' ]] && [[ "${#_gittagrev}" = 1 ]] && pkgver="${_gittagver}.${_gittagrev}" # revision -pkgrel='2.parabola1' +pkgrel='2.parabola2' epoch='17' _jpgver='1.5' -_llvmver='3.6' +_llvmver='3.8' _povver='3.7' _pyver='3.5' pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support' @@ -45,8 +45,8 @@ url="http://www.${pkgbase}.org" depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2' 'glew' 'hicolor-icon-theme' 'jack' 'jemalloc' 'libpng' 'libsndfile' 'libspnav' 'libtiff' 'log4cplus' 'openal' 'opencolorio' 'opencollada' 'openexr' - 'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb' 'ptex' - 'python' 'python-requests' 'shared-mime-info' 'xdg-utils') + 'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb' + 'python' 'python-requests' 'shared-mime-info' 'xdg-utils') # 'ptex' disabled temporary, due build failed makedepends=('boost' 'cmake' 'git' 'llvm' 'mesa') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) options=('!strip') [[ "${_git}" = 'no' ]] && source=("${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#tag=v${_gittagver}${_gittagrev}" # blender @@ -127,11 +127,12 @@ build() { -DWITH_CODEC_FFMPEG='ON' \ -DWITH_CODEC_SNDFILE='ON' \ -DWITH_COMPOSITOR='ON' \ + -DWITH_CPP11='ON' \ -DWITH_CXX_GUARDEDALLOC='OFF' \ -DWITH_CYCLES='ON' \ -DWITH_CYCLES_CUDA_BINARIES='OFF' \ -DWITH_CYCLES_OSL='ON' \ - -DWITH_CYCLES_PTEX='ON' \ + -DWITH_CYCLES_PTEX='OFF' \ -DWITH_CYCLES_STANDALONE='OFF' \ -DWITH_CYCLES_STANDALONE_GUI='OFF' \ -DWITH_FFTW3='ON' \ @@ -142,7 +143,7 @@ build() { -DWITH_GHOST_XDND='ON' \ -DWITH_GL_EGL='OFF' \ -DWITH_GL_PROFILE_COMPAT='ON' \ - -DWITH_GL_PROFILE_CORE='ON' \ + -DWITH_GL_PROFILE_CORE='OFF' \ -DWITH_GL_PROFILE_ES20='ON' \ -DWITH_GLEW_ES='OFF' \ -DWITH_GLEW_MX='OFF' \ @@ -199,7 +200,7 @@ build() { -DWITH_SYSTEM_OPENJPEG='ON' \ -DWITH_X11_XF86VMODE='ON' \ -DWITH_X11_XINPUT='ON' - make -j4 # -j5 needs 48 GB of RAM while -j9 needs 64 GB + make # -j5 needs 48 GB of RAM while -j9 needs 64 GB } package_blender() { @@ -213,7 +214,6 @@ package_blender() { "${pkgbase}-addon-yafaray: for optional renderer with YafaRay (pcr repo)") conflicts=("${pkgbase}-libre" "${pkgbase}-libre-spacenav" "${pkgbase}-spacenav-libre") replaces=( "${pkgbase}-libre" "${pkgbase}-libre-spacenav" "${pkgbase}-spacenav-libre") - install="${pkgbase}.install" cd "${srcdir}/${pkgbase}-${pkgver}/build" make DESTDIR="${pkgdir}" install diff --git a/libre/blender/blender.install b/libre/blender/blender.install deleted file mode 100644 index 724bfce00..000000000 --- a/libre/blender/blender.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.3-2-g168b