summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-08 04:59:52 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-08 04:59:52 -0300
commitabc704b20818d02a4be5be2904e14c58f949a1c4 (patch)
treeec4e8aaeb074663f3673e60f97f7019516ce6fdd /libre
parent662f2c67b6b2f60e2baef595daa02d8abe25cace (diff)
parent5911a3c5f289ee715d7252690995b476480bf4b3 (diff)
downloadabslibre-abc704b20818d02a4be5be2904e14c58f949a1c4.tar.gz
abslibre-abc704b20818d02a4be5be2904e14c58f949a1c4.tar.bz2
abslibre-abc704b20818d02a4be5be2904e14c58f949a1c4.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/luxblend25/PKGBUILD49
-rw-r--r--libre/luxrender-libre/PKGBUILD15
2 files changed, 29 insertions, 35 deletions
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 26640795f..2af861641 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -3,44 +3,33 @@
pkgbase=luxrender
pkgname=luxblend25
-srcver=3a928b723b29
-pkgver=1.1.v2.65
-_pkgver=${pkgver::3}
+srcver=c9deae0646d0
+pkgver=1.2.1.v2.66
+_pkgver=${pkgver::5}
reqname=blender
-reqver=${pkgver:5}
+reqver=${pkgver:7}
+reqep=7
pkgrel=1
-pkgdesc='LuxRender exporter for Blender-libre'
-arch=(
- any
-)
-url="http://www.$pkgbase.net/"
-license=(
- GPL
-)
+pkgdesc="LuxRender exporter for ${reqname^}."
+arch=any
+url=http://www.$pkgbase.net/
+license=GPL
depends=(
$pkgbase=$_pkgver
- "$reqname>=$reqver"
-)
-provides=(
- $pkgname=$_pkgver
-)
-conflicts=(
- $pkgname
- #"$reqname>=${reqver::2}$((${reqver:2}+1))"
-)
-replaces=(
- $pkgname
-)
-source=(
- "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
-)
-sha512sums=(
- f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
-)
+ "$reqname>=$(($reqep-1)):$reqver"
+ "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))"
+)
+provides=($pkgname=$_pkgver)
+conflicts=$pkgname
+replaces=$pkgname
+source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2
+sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
package() {
a=$pkgname-$srcver/src/$pkgbase
b=usr/share/$reqname/$reqver/scripts/addons
install -d -m755 $pkgdir/$b
cp -a $srcdir/$a $pkgdir/$b
+ # change the search path in exporter so it finds pylux in its new location
+ sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py
}
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 3ec9854e6..1d4dd0702 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -5,8 +5,8 @@
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=luxrender-libre
_pkgflag=libre
-pkgver=1.2
-_pkgver=ee0b9ff73d62
+pkgver=1.2.1
+_pkgver=3066b2161439
pkgrel=1
pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendations"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,18 +15,23 @@ license=('GPL')
depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers')
provides=(${pkgname%-$_pkgflag}=$pkgver)
conflicts=${pkgname%-$_pkgflag}
replaces=${pkgname%-$_pkgflag}
-source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2)
-md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')
+source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2
+ boost-1.53-shared_array_constructor.diff)
+md5sums=(
+ '87958798c164ad14f92fb4af2595d332'
+ 'dd19c7ac2ba8c9b703018a176ef77f98')
build() {
cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
# fix the installation
sed -i '/.*wxgui.*/ d' CMakeLists.txt
+ # fix for boost 1.53
+ patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
export CXXFLAGS="$CXXFLAGS -lpthread"
cmake -DCMAKE_INSTALL_PREFIX=/usr \