diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-13 19:28:34 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-13 19:28:34 -0300 |
| commit | 4f82f50af8bd9151358cace4a7dca998f68aac18 (patch) | |
| tree | 8bed31706734e1e18af3ec40bf2020da95a0c833 /libre | |
| parent | 8973b4daa2e4d0ced497149a86d42ce6836821f9 (diff) | |
| parent | 092e9242359a1db0f1e4147aa10e0a60188f9eec (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/blender/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/openimageio/PKGBUILD | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index d1f8a9d6a..7f4fafb52 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -6,9 +6,10 @@ pkgbase=blender pkgname=blender pkgver=2.71 -pkgrel=2.parabola3 +pkgrel=2.parabola4 epoch=14 _jpgver=1.5 +_llvmver=3.5 _pyver=3.4 pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support' arch=('i686' 'x86_64' 'mips64el') @@ -16,9 +17,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' - 'llvm-libs' 'openal' 'opencolorio' 'opencollada=20140214' 'openexr' - 'openimageio' 'openshadinglanguage=1.4.2' 'python' 'shared-mime-info' - 'xdg-utils') + 'openal' 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' + 'python' 'shared-mime-info' 'xdg-utils') # 'openshadinglanguage=1.4.2' 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' @@ -79,7 +79,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCYCLES_OSL=/usr \ -DLLVM_STATIC=OFF \ - -DLLVM_VERSION=3.4 \ + -DLLVM_VERSION=$_llvmver \ -DOPENIMAGEIO_ROOT_DIR=/usr \ -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver \ -DOSL_INCLUDES=/usr/include/OSL \ @@ -124,7 +124,7 @@ build() { -DWITH_JACK=ON \ -DWITH_JACK_DYNLOAD=ON \ -DWITH_LIBMV=OFF \ - -DWITH_LLVM=ON \ + -DWITH_LLVM=OFF \ -DWITH_LZMA=ON \ -DWITH_LZO=ON \ -DWITH_MEM_JEMALLOC=OFF \ diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD index 86538c3f6..24a5b5990 100644 --- a/libre/openimageio/PKGBUILD +++ b/libre/openimageio/PKGBUILD @@ -4,12 +4,12 @@ pkgname=openimageio pkgver=1.4.12 -pkgrel=3.parabola2 +pkgrel=3.parabola3 pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender package)' arch=('i686' 'x86_64' 'mips64el') url="http://www.$pkgname.org/" license=('custom') -depends=('boost-libs' 'freetype2' 'glew' 'libtiff' 'libwebp' 'openjpeg' 'openexr') # 'opencolorio' +depends=('boost-libs' 'freetype2' 'glew' 'libtiff' 'libwebp' 'opencolorio' 'openjpeg' 'openexr') makedepends=('boost' 'cmake' 'git' 'python2' 'qt4') optdepends=('qt4: iv image viewer' 'python2: bindings support') @@ -35,7 +35,7 @@ prepare() { sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i ' src/make/detectplatform.mk - # fix for giflib 5.1 + # fix for giflib 5.1.x sed -i 's|DGifCloseFile [(]m_gif_file[)] == GIF_ERROR|DGifCloseFile (m_gif_file, 0) == GIF_ERROR|' src/gif.imageio/gifinput.cpp } |