From 13532b276fa487a250aaeaebe70502082338d378 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Mon, 6 Oct 2014 11:31:26 -0200 Subject: update blender package --- libre/blender/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 19 deletions(-) (limited to 'libre/blender/PKGBUILD') diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 7f4fafb52..b5f22e6d2 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -3,10 +3,22 @@ # Maintainer (Arch): Sven-Hendrik Haase # Maintainer: Márcio Silva +# Sometimes blender.org takes some time to release patch releases and because the blender package +# is broke, we sometimes need to build from git directly. +# Update because I get so many queries on this: +# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases. +# More often than not, a new openshadinglanguage breaks it and I could either backport fixes +# or simply roll with a new version. I usually choose the latter when the former seems +# unreasonable. + +_gittag=v2.72 +#_gitcommit=d42c08 + pkgbase=blender -pkgname=blender -pkgver=2.71 -pkgrel=2.parabola4 +pkgname=("$pkgbase") # "$pkgbase-addon-gimp" "$pkgbase-addon-povray") +pkgver=2.72 +[[ -n $_gitcommit ]] && pkgver=$pkgver.git1.$_gitcommit +pkgrel=1.parabola1 epoch=14 _jpgver=1.5 _llvmver=3.5 @@ -17,8 +29,8 @@ license=('GPL') url="http://www.$pkgbase.org" depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew' 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libspnav' 'libtiff' - 'openal' 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' - 'python' 'shared-mime-info' 'xdg-utils') # 'openshadinglanguage=1.4.2' + 'openal' 'opencolorio' 'opencollada' 'openexr' 'openimageio' + 'openshadinglanguage' 'python' 'shared-mime-info' 'xdg-utils') makedepends=('boost' 'cmake' 'git' 'llvm') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) optdepends=('bullet: for Rigid Bodies and Physics Simulation' #'mesa-libcl: for rendering with optional Mesa OpenCL' @@ -32,17 +44,31 @@ conflicts=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") replaces=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") options=('!strip') install="$pkgbase.install" -source=("http://download.$pkgbase.org/source/$pkgbase-$pkgver.tar.gz") -md5sums=('fc1112adb493ea62e9587ca0e86d6b0d') +source=("git://git.$pkgbase.org/$pkgbase-addons.git" + "git://git.$pkgbase.org/$pkgbase-addons-contrib.git" + "git://git.$pkgbase.org/$pkgbase-translations.git" + "git://git.$pkgbase.org/scons.git") +if [[ -n $_gittag ]]; then + source+=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#tag=$_gittag") +else + source+=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#commit=$_gitcommit") +fi +md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') prepare() { - cd $srcdir/$pkgbase-v$pkgver + cd $srcdir/$pkgbase-$pkgver + + git submodule init + git config submodule.'release/scripts/addons'.url $srcdir/$pkgbase-addons + git config submodule.'release/scripts/addons_contrib'.url $srcdir/$pkgbase-addons-contrib + git config submodule.'release/datafiles/locale'.url $srcdir/$pkgbase-translations + git config submodule.'scons'.url $srcdir/scons + git submodule update msg 'renaming wrong OS name' - _OS=$(uname -o) - [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c - [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c - [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c + [[ $(uname -o) == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c + [[ $(uname -o) == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c + [[ $(uname -o) == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD| s|Linux, FreeBSD|GNU and BSD| s|Unpack the archive, Then run the Blender executable.|Install from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| @@ -69,7 +95,7 @@ prepare() { } build() { - cd $srcdir/$pkgbase-v$pkgver/build + cd $srcdir/$pkgbase-$pkgver/build [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF cmake .. \ @@ -87,8 +113,8 @@ build() { -DPYTHON_LIBPATH=/usr/lib \ -DPYTHON_LIBRARY=python${_pyver}m \ -DPYTHON_VERSION=$_pyver \ - -DSUPPORT_SSE_BUILD=$_SSE \ - -DSUPPORT_SSE2_BUILD=$_SSE2 \ + -DSUPPORT_SSE_BUILD=ON \ + -DSUPPORT_SSE2_BUILD=ON \ -DWITH_AUDASPACE=ON \ -DWITH_BLENDER=ON \ -DWITH_BOOST=ON \ @@ -101,7 +127,7 @@ build() { -DWITH_COMPOSITOR=ON \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_CUDA_BINARIES=OFF \ - -DWITH_CYCLES_OSL=OFF \ + -DWITH_CYCLES_OSL=ON \ -DWITH_CYCLES_STANDALONE=ON \ -DWITH_CYCLES_STANDALONE_GUI=ON \ -DWITH_FFTW3=ON \ @@ -124,7 +150,7 @@ build() { -DWITH_JACK=ON \ -DWITH_JACK_DYNLOAD=ON \ -DWITH_LIBMV=OFF \ - -DWITH_LLVM=OFF \ + -DWITH_LLVM=ON \ -DWITH_LZMA=ON \ -DWITH_LZO=ON \ -DWITH_MEM_JEMALLOC=OFF \ @@ -156,12 +182,20 @@ build() { -DWITH_X11_XINPUT=ON #-DWITH_MOD_CLOTH_ELTOPO=ON\ #-DWITH_SYSTEM_BULLET=ON\ + + #-DSUPPORT_SSE_BUILD=$_SSE \ + #-DSUPPORT_SSE2_BUILD=$_SSE2 \ + + # Note: Fix for gcc 4.9 :/ + # -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" + # -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" make } -package() { - cd $srcdir/$pkgbase-v$pkgver/build +package_blender() { + cd $srcdir/$pkgbase-$pkgver/build make DESTDIR=$pkgdir install python -m compileall $pkgdir/usr/share/$pkgbase + python -O -m compileall $pkgdir/usr/share/$pkgbase } -- cgit v1.2.3-54-g00ecf