summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-29 03:29:13 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-29 03:29:13 -0300
commit3e5edf747a4ecc7f968713870fb0b3fc0a014b03 (patch)
tree5a7697f17e5fdf94f648b8e5edc215bc71561946
parentcc1a189d2869b460f7660bbd3ad2d86324d06f81 (diff)
parent132e049696241ac9edff0fed126437e3c0279395 (diff)
downloadabslibre-3e5edf747a4ecc7f968713870fb0b3fc0a014b03.tar.gz
abslibre-3e5edf747a4ecc7f968713870fb0b3fc0a014b03.tar.bz2
abslibre-3e5edf747a4ecc7f968713870fb0b3fc0a014b03.zip
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
-rw-r--r--libre/opencollada-parabola/PKGBUILD4
-rw-r--r--libre/opencolorio-parabola/PKGBUILD2
-rw-r--r--libre/openimageio-parabola/PKGBUILD4
-rw-r--r--libre/openshadinglanguage-parabola/PKGBUILD39
4 files changed, 37 insertions, 12 deletions
diff --git a/libre/opencollada-parabola/PKGBUILD b/libre/opencollada-parabola/PKGBUILD
index 73afdc2b0..c22bf3a3e 100644
--- a/libre/opencollada-parabola/PKGBUILD
+++ b/libre/opencollada-parabola/PKGBUILD
@@ -4,14 +4,14 @@
_pkgname=opencollada
pkgname=$_pkgname-parabola
pkgver=20140214
-pkgrel=1
+pkgrel=1.1
pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-parabola package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/KhronosGroup/OpenCOLLADA'
license=('GPL')
depends=('libxml2' 'pcre')
makedepends=('git' 'cmake')
-provides=("$_pkgname")
+provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
replaces=("$_pkgname")
source=('git://github.com/KhronosGroup/OpenCOLLADA.git')
diff --git a/libre/opencolorio-parabola/PKGBUILD b/libre/opencolorio-parabola/PKGBUILD
index bfe4da9fb..66e74a823 100644
--- a/libre/opencolorio-parabola/PKGBUILD
+++ b/libre/opencolorio-parabola/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname=opencolorio
pkgname=$_pkgname-parabola
pkgver=1.0.9
-pkgrel=6
+pkgrel=2.6
pkgdesc='A color management framework for visual effects and animation (built for the blender-parabola package)'
arch=('i686' 'x86_64' 'mips64el')
url="http://$pkgname.org"
diff --git a/libre/openimageio-parabola/PKGBUILD b/libre/openimageio-parabola/PKGBUILD
index dff92555b..ad8104e89 100644
--- a/libre/openimageio-parabola/PKGBUILD
+++ b/libre/openimageio-parabola/PKGBUILD
@@ -5,12 +5,12 @@
_pkgname=openimageio
pkgname=$_pkgname-parabola
pkgver=1.4.12
-pkgrel=3
+pkgrel=3.2
pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender-parabola package)'
arch=('i686' 'x86_64' 'mips64el')
url="http://www.$_pkgname.org/"
license=('custom')
-depends=('boost-libs' 'glew' 'libtiff' 'libwebp' 'opencolorio' 'openexr' 'giflib-lts') # add giflib-lts to build pkg
+depends=('boost-libs' 'freetype2' 'glew' 'libtiff' 'libwebp' 'openjpeg' 'opencolorio' 'openexr' 'giflib-lts') # add giflib-lts to build pkg
makedepends=('boost' 'cmake' 'git' 'python2' 'qt4')
optdepends=('qt4: iv image viewer'
'python2: bindings support')
diff --git a/libre/openshadinglanguage-parabola/PKGBUILD b/libre/openshadinglanguage-parabola/PKGBUILD
index 630a0573c..ce04f74c1 100644
--- a/libre/openshadinglanguage-parabola/PKGBUILD
+++ b/libre/openshadinglanguage-parabola/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=openshadinglanguage
pkgname=$_pkgname-parabola
-pkgver=1.5.10
+pkgver=1.4.2 # 1.5.10 for blender 2.72
pkgrel=1
pkgdesc='Advanced shading language for production GI renderers (built for the blender-parabola package)'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,10 @@ makedepends=('boost' 'clang' 'cmake')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
replaces=("$_pkgname")
-source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz")
-md5sums=('b828366f056e115b539ee1780883fc7d')
+source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz"
+ 'llvm-141.patch')
+md5sums=('5aeb3c9502aedf62d0120b3523957e92'
+ 'b948e5df8710366b65027d1d8450f340')
prepare() {
cd OpenShadingLanguage-Release-$pkgver
@@ -33,15 +35,38 @@ prepare() {
' src/cmake/platform.cmake
sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i
' src/make/detectplatform.mk
- sed -i 's|Linux/OSX|GNU/BSD|' src/include/OSL/export.h
+
+ if [[ ${pkgver::3} == 1.4 ]]; then
+ # renaming wrong OS name
+ sed -i 's|Linux/OSX|GNU/BSD|' src/include/export.h
+
+ # LLVM 3.4 build fix
+ # based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch"
+ patch -Np1 < $srcdir/llvm-141.patch
+
+ # fix include paths
+ sed -i 's|oslconfig.h|../include/oslconfig.h|
+ s|dual.h|../include/dual.h|
+ s|dual_vec.h|../include/dual_vec.h|
+ ' src/liboslexec/llvm_ops.cpp
+ sed -i 's|oslexec.h|../include/oslexec.h|
+ s|oslclosure.h|../include/oslclosure.h|
+ s|osl_pvt.h|../include/osl_pvt.h|
+ ' src/liboslexec/oslexec_pvt.h
+ else
+ # renaming wrong OS name
+ sed -i 's|Linux/OSX|GNU/BSD|' src/include/OSL/export.h
+ fi
}
build() {
cd OpenShadingLanguage-Release-$pkgver
- # Fails building this file on i686
- if [[ $CARCH == i686 ]]; then
- sed -i "/src\/testshade/d" CMakeLists.txt
+ if [[ ${pkgver::3} == 1.5 ]]; then
+ # Fails building this file on i686
+ if [[ $CARCH == i686 ]]; then
+ sed -i "/src\/testshade/d" CMakeLists.txt
+ fi
fi
cd src