diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-06 19:28:14 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-06 19:28:14 -0300 |
| commit | 8885186187c43a610224b6562c06de23a3067e28 (patch) | |
| tree | 6bbd279a618c5b2680c71fd51dafd8aa3960bb34 /pcr/mitsuba | |
| parent | 8f7709f5b196d988141d085572661b6944ad8267 (diff) | |
| parent | 2c5de6f1648e51c81c6446b45dfcd8d091fdd929 (diff) | |
| download | abslibre-8885186187c43a610224b6562c06de23a3067e28.tar.gz abslibre-8885186187c43a610224b6562c06de23a3067e28.tar.bz2 abslibre-8885186187c43a610224b6562c06de23a3067e28.zip | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'pcr/mitsuba')
| -rw-r--r-- | pcr/mitsuba/PKGBUILD | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 52cd725f6..c0116cd21 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -19,7 +19,7 @@ _addname=$_bldname-addon-$_pkgname _addver=0.3.0 # __init__.py:bl_info>version _adddat=20140722 _addrev=61 -_addrel=2 +_addrel=4 _pyver=3.4 pkgbase=$_pkgname @@ -40,9 +40,9 @@ url="https://www.$_pkgname-renderer.org" _prepare_mitsuba() { msg 'Renaming source dir' - mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$pkgver.$_pkgrev + mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$_pkgver.$_pkgrev - cd $srcdir/$_pkgname-$pkgver.$_pkgrev + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev msg 'renaming wrong OS name' _OS=$(uname -o) @@ -72,7 +72,7 @@ prepare() { } _build_mitsuba() { - cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF # i686: MTS_SSE disabled @@ -93,16 +93,16 @@ package_mitsuba() { "$_addname: ${_bldname^} addon exporter and renderer") install="$_pkgname.install" - cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build make DESTDIR=$pkgdir install b=$pkgdir/usr/share/licenses/$pkgname - install -vd $b && install -m644 ../LICENSE $b/GPL-v3.0 + install -vd $b && install -m644 ../doc/license.txt $b/GPL-v3.0 msg 'fixing files and folders location' a=$pkgdir/usr - b=$srcdir/$_pkgname-v$pkgver + b=$srcdir/$_pkgname-$_pkgver.$_pkgrev install -vd $a/{bin,lib/python$_pyver/lib-dynload,share/{applications,$_pkgname,pixmaps}} install -vm644 $b/data/linux/$_pkgname.desktop $a/share/applications install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps @@ -120,7 +120,7 @@ package_blender-addon-mitsuba() { pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)" arch=('any') license=('GPL2') - depends=("$_pkgname=$_pkgver" "$_bldname-libre>=$_bldep:$_bldver" "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))") + depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))") makedepends=() cd $srcdir/$_addname-$_addver.$_addrev |