diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-24 14:30:38 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-24 14:30:38 -0200 |
| commit | ab318f583ba549bde7cac825fc87fbf720f7a371 (patch) | |
| tree | 6a602bee48e08dc455d3ebb747e34b813fd13e4c | |
| parent | 8ed999f41a0044754a655a8043f29cfb70a74db4 (diff) | |
| parent | 7717ad777c794e94441b91ae8bccb2d152428719 (diff) | |
| download | abslibre-ab318f583ba549bde7cac825fc87fbf720f7a371.tar.gz abslibre-ab318f583ba549bde7cac825fc87fbf720f7a371.tar.bz2 abslibre-ab318f583ba549bde7cac825fc87fbf720f7a371.zip | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
| -rw-r--r-- | libre/blender/PKGBUILD | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 23ad7992c..62b315d97 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -12,7 +12,8 @@ # unreasonable. _git=no -_gittag=v2.72b +_gittagver=v2.72 +_gittagrev=b # blender: Tue, 21 Oct 2014 11:57:39 +0000 (17:57 +0600) _gitcommit=9e963a # blender-addons: Tue, 21 Oct 2014 19:48:21 +0000 (21:48 +0200) @@ -25,12 +26,14 @@ _gittranslationscommit=02219a pkgbase=blender pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray") _pkgver=2.72b +_depver=${_pkgver%[a-z]} [[ $_git == no ]] && pkgver=$_pkgver [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit pkgrel=1.parabola1 epoch=15 _jpgver=1.5 _llvmver=3.5 +_povver=3.7 _pyver=3.4 pkgdesc='Fully integrated 3D graphics creation suite, without nonfree CUDA support' arch=('i686' 'x86_64' 'mips64el') @@ -53,9 +56,9 @@ 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=$_gittag" - "$pkgbase-addons-$pkgver::git://git.$pkgbase.org/$pkgbase-addons.git#tag=$_gittag" - "$pkgbase-translations-$pkgver::git://git.$pkgbase.org/$pkgbase-translations.git#tag=$_gittag") +[[ $_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") [[ $_git == yes ]] && source=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#commit=$_gitcommit" "$pkgbase-addons-$pkgver::git://git.$pkgbase.org/$pkgbase-addons.git#commit=$_gitaddonscommit" "$pkgbase-translations-$pkgver::git://git.$pkgbase.org/$pkgbase-translations.git#commit=$_gittranslationscommit") @@ -228,7 +231,7 @@ package_blender() { package_blender-addon-gimp() { 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:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'xcftools') + depends=("$pkgbase>=$epoch:$_depver" "$pkgbase<$epoch:${_depver%%.*}.$((${_depver#*.}+1))" 'xcftools') makedepends=() optdepends=('gimp: for edit xcf files') conflicts=("$pkgbase<$epoch:$_pkgver") @@ -241,7 +244,7 @@ package_blender-addon-gimp() { package_blender-addon-povray() { pkgdesc='A addon for the Blender which allows render with POV-Ray' - depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'povray>=3.7') + depends=("$pkgbase>=$epoch:$_depver" "$pkgbase<$epoch:${_depver%%.*}.$((${_depver#*.}+1))" "povray>=$_povver") makedepends=() optdepends=() conflicts=("$pkgbase<$epoch:$_pkgver") |