summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-10 13:16:22 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-10 13:16:22 -0300
commit104ba4d89f45f4263d1a36efe6968290cd9277f6 (patch)
tree9fa82f33fb6cd051a5565a6ea89897b696b1f737
parentad7b033ebaf30b472beb410930cdba2d2d8a1623 (diff)
parentb0fa1542ba47430ad1253f1ddf944951212396a8 (diff)
downloadabslibre-104ba4d89f45f4263d1a36efe6968290cd9277f6.tar.gz
abslibre-104ba4d89f45f4263d1a36efe6968290cd9277f6.tar.bz2
abslibre-104ba4d89f45f4263d1a36efe6968290cd9277f6.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/blender-libre/PKGBUILD10
-rw-r--r--libre/opencollada/PKGBUILD5
2 files changed, 7 insertions, 8 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 7e591dcee..b4d9c47b8 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -11,9 +11,9 @@ else
_spndesc=''
fi
epoch=7
-pkgver=2.66a
+pkgver=2.67
_pyver=3.3
-pkgrel=5
+pkgrel=1
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
arch=(
i686
@@ -35,7 +35,7 @@ depends=(
openal #1.15.1
'openexr=2.0.0'
openimageio #1.1.9
- 'opencollada=20130305'
+ 'opencollada=20130413'
opencolorio #1.0.8
openshadinglanguage #1.3.0
shared-mime-info
@@ -61,7 +61,7 @@ conflicts=${_pkgname%-$_pkgflag}
replaces=${_pkgname%-$_pkgflag}
install=$_pkgname.install
source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
-sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f
+sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44
prepare() {
mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
@@ -88,7 +88,7 @@ build() {
-DWITH_CYCLES_OSL=ON\
-DWITH_FFTW3=ON\
-DWITH_GAMEENGINE=ON\
- -DWITH_IMAGE_REDCODE=ON\
+ -DWITH_IMAGE_REDCODE=OFF\
-DWITH_INSTALL_PORTABLE=OFF\
-DWITH_JACK=ON\
-DWITH_MOD_OCEANSIM=ON\
diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD
index 2cf700e1f..d6ec1b979 100644
--- a/libre/opencollada/PKGBUILD
+++ b/libre/opencollada/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=opencollada
-pkgver=20130305
+pkgver=20130413
pkgrel=1
pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)"
arch=(
@@ -26,7 +26,7 @@ prepare() {
cd $srcdir/OpenCOLLADA
# adapt source to last blender release
- git reset --hard da9f1c3d5da28d475f35ff1175d60cb74fa0f661 # Tue Mar 5 11:30:27 2013 +0100
+ git reset --hard 9665d1614b027ffd7815dc745c4fab4d69eb3321 # Sat Apr 13 01:27:39 2013 -0700
[[ -d build ]] && rm -r build
mkdir build
@@ -49,4 +49,3 @@ package() {
}
# vim:set ts=2 sw=2 et:
-