summaryrefslogtreecommitdiff
path: root/libre/blender
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-07-13 13:20:28 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-07-13 13:20:28 -0300
commita745d0acdaf80d1631fca66c698b1feb8d544b01 (patch)
treee397497ecd2a683c19bdabe6c55ef68001d72681 /libre/blender
parentd8cd25bf41052081fe22a591a90f28c505ca921c (diff)
downloadabslibre-a745d0acdaf80d1631fca66c698b1feb8d544b01.tar.gz
abslibre-a745d0acdaf80d1631fca66c698b1feb8d544b01.tar.bz2
abslibre-a745d0acdaf80d1631fca66c698b1feb8d544b01.zip
blender: fix arrays and variables
Diffstat (limited to 'libre/blender')
-rw-r--r--libre/blender/PKGBUILD56
1 files changed, 24 insertions, 32 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 9ffe3f7cb..3da59c099 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -12,8 +12,8 @@
# unreasonable.
_git=no
-_gittagver=v2.75a
-_gittagrev=
+_gittagver=v2.75
+_gittagrev=a
# blender: Tue, 20 Jan 2015 18:16:03 +0000 (23:16 +0500)
_gitcommit=c27589e1
# blender-addons: Tue, 20 Jan 2015 18:15:16 +0000 (23:15 +0500)
@@ -26,7 +26,6 @@ _gittranslationscommit=06bedbb3
pkgbase=blender
pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray")
_pkgver=2.75.a
-_depver=${_pkgver%[a-z]}
[[ $_git == no ]] && pkgver=$_pkgver
[[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
pkgrel=1.parabola1
@@ -45,18 +44,7 @@ depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2
'openjpeg' 'openshadinglanguage' 'python' 'python-requests' 'shared-mime-info'
'xdg-utils')
makedepends=('boost' 'cmake' 'git' 'llvm35' 'mesa') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
-optdepends=('bullet: for Rigid Bodies and Physics Simulation'
- #'opencl-mesa: for rendering with optional Mesa OpenCL'
- 'blender-addon-gimp: for import GIMP images to scene'
- 'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
- 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
- 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
- 'blender-addon-povray: for optional renderer with POV-Ray'
- 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)')
-conflicts=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre")
-replaces=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre")
options=('!strip')
-install="$pkgbase.install"
[[ $_git == no ]] && source=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#tag=$_gittagver$_gittagrev"
"$pkgbase-addons-$pkgver::git://git.$pkgbase.org/$pkgbase-addons.git#tag=$_gittagver"
"$pkgbase-translations-$pkgver::git://git.$pkgbase.org/$pkgbase-translations.git#tag=$_gittagver")
@@ -211,6 +199,17 @@ build() {
}
package_blender() {
+ optdepends=('bullet: for Rigid Bodies and Physics Simulation'
+ #'opencl-mesa: for rendering with optional Mesa OpenCL'
+ 'blender-addon-gimp: for import GIMP images to scene'
+ 'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
+ 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
+ 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
+ 'blender-addon-povray: for optional renderer with POV-Ray'
+ 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)')
+ conflicts=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre")
+ replaces=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre")
+ install="$pkgbase.install"
cd $srcdir/$pkgbase-$pkgver/build
make DESTDIR=$pkgdir install
@@ -220,36 +219,29 @@ package_blender() {
msg 'move io_import_gimp_image_to_scene.py and render_povray to blender-addon-gimp and blender-addon-povray'
[[ -d $srcdir/$pkgbase-addon-gimp ]] && rm -vr $srcdir/$pkgbase-addon-gimp
[[ -d $srcdir/$pkgbase-addon-povray ]] && rm -vr $srcdir/$pkgbase-addon-povray
- install -vm755 -d $srcdir/$pkgbase-addon-{gimp,povray}/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
- mv -v $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/io_import_gimp_image_to_scene.py \
- $srcdir/$pkgbase-addon-gimp/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
- mv -v $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/render_povray \
- $srcdir/$pkgbase-addon-povray/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
+ install -vm755 -d $srcdir/$pkgbase-addon-{gimp,povray}/usr/share/$pkgbase/${pkgver%%.[a-z]*}/scripts/addons
+ mv -v $pkgdir/usr/share/$pkgbase/${pkgver%%.[a-z]*}/scripts/addons/io_import_gimp_image_to_scene.py \
+ $srcdir/$pkgbase-addon-gimp/usr/share/$pkgbase/${pkgver%%.[a-z]*}/scripts/addons
+ mv -v $pkgdir/usr/share/$pkgbase/${pkgver%%.[a-z]*}/scripts/addons/render_povray \
+ $srcdir/$pkgbase-addon-povray/usr/share/$pkgbase/${pkgver%%.[a-z]*}/scripts/addons
}
package_blender-addon-gimp() {
+ _relver=${pkgver%%.[a-z]*}
+ _minver=${_relver#*.}
pkgdesc='A addon for the Blender which allows import GIMP 2.6 images (xcf files) to scene (as polygon plane images)'
arch=('any')
- depends=("$pkgbase>=$epoch:$_depver" "$pkgbase<$epoch:${_depver%%.*}.$((${_depver#*.}+1))" 'xcftools')
- makedepends=()
+ depends=("$pkgbase>=$epoch:${pkgver%%.[a-z]*}" "$pkgbase<$epoch:${pkgver%%.*}.$(($_minver+1))" 'xcftools')
optdepends=('gimp: for edit xcf files')
- conflicts=("$pkgbase<$epoch:$_pkgver")
- replaces=()
- options=()
- install=
mv -v $srcdir/$pkgbase-addon-gimp/usr $pkgdir
}
package_blender-addon-povray() {
+ _relver=${pkgver%%.[a-z]*}
+ _minver=${_relver#*.}
pkgdesc='A addon for the Blender which allows render with POV-Ray'
- depends=("$pkgbase>=$epoch:$_depver" "$pkgbase<$epoch:${_depver%%.*}.$((${_depver#*.}+1))" "povray>=$_povver")
- makedepends=()
- optdepends=()
- conflicts=("$pkgbase<$epoch:$_pkgver")
- replaces=()
- options=()
- install=
+ depends=("$pkgbase>=$epoch:${pkgver%%.[a-z]*}" "$pkgbase<$epoch:${pkgver%%.*}.$(($_minver+1))" "povray>=$_povver")
mv -v $srcdir/$pkgbase-addon-povray/usr $pkgdir
}