From 3dfa4c8e94024ee02a9fd424ba57436198235647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Mon, 6 Oct 2014 15:30:10 -0200 Subject: blender: fixing git --- libre/blender/PKGBUILD | 79 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index b5f22e6d2..09a352c42 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -11,13 +11,22 @@ # or simply roll with a new version. I usually choose the latter when the former seems # unreasonable. +_git=no _gittag=v2.72 -#_gitcommit=d42c08 +# blender: Fri, 3 Oct 2014 13:58:58 +0000 (15:58 +0200) +_gitcommit=95182d +# blender-addons: Fri, 3 Oct 2014 12:47:22 +0000 (14:47 +0200) +_gitaddonscommit=c210f8 +# blender-addons-contrib: Tue, 30 Sep 2014 20:09:07 +0000 (17:09 -0300) +_gitaddonscontribcommit=3fc30c +# blender-translations: Fri, 3 Oct 2014 13:55:15 +0000 (15:55 +0200) +_gittranslationscommit=c98069 pkgbase=blender -pkgname=("$pkgbase") # "$pkgbase-addon-gimp" "$pkgbase-addon-povray") -pkgver=2.72 -[[ -n $_gitcommit ]] && pkgver=$pkgver.git1.$_gitcommit +pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray") +_pkgver=2.72 +[[ $_git == no ]] && pkgver=$_pkgver +[[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit pkgrel=1.parabola1 epoch=14 _jpgver=1.5 @@ -33,35 +42,34 @@ depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew' 'openshadinglanguage' 'python' 'shared-mime-info' 'xdg-utils') makedepends=('boost' 'cmake' 'git' 'llvm') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) optdepends=('bullet: for Rigid Bodies and Physics Simulation' - #'mesa-libcl: for rendering with optional Mesa OpenCL' - 'povray: for optional renderer with POV-Ray' - 'xcftools: for import GIMP images to scene (pcr repo)' + #'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" -source=("git://git.$pkgbase.org/$pkgbase-addons.git" - "git://git.$pkgbase.org/$pkgbase-addons-contrib.git" - "git://git.$pkgbase.org/$pkgbase-translations.git" - "git://git.$pkgbase.org/scons.git") -if [[ -n $_gittag ]]; then - source+=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#tag=$_gittag") -else - source+=("$pkgbase-$pkgver::git://git.$pkgbase.org/$pkgbase.git#commit=$_gitcommit") -fi +[[ $_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 == 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") +source+=("git://git.$pkgbase.org/$pkgbase-addons-contrib.git#commit=$_gitaddonscontribcommit" + "git://git.$pkgbase.org/scons.git") md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') prepare() { cd $srcdir/$pkgbase-$pkgver git submodule init - git config submodule.'release/scripts/addons'.url $srcdir/$pkgbase-addons + git config submodule.'release/scripts/addons'.url $srcdir/$pkgbase-addons-$pkgver git config submodule.'release/scripts/addons_contrib'.url $srcdir/$pkgbase-addons-contrib - git config submodule.'release/datafiles/locale'.url $srcdir/$pkgbase-translations + git config submodule.'release/datafiles/locale'.url $srcdir/$pkgbase-translations-$pkgver git config submodule.'scons'.url $srcdir/scons git submodule update @@ -198,4 +206,39 @@ package_blender() { make DESTDIR=$pkgdir install python -m compileall $pkgdir/usr/share/$pkgbase python -O -m compileall $pkgdir/usr/share/$pkgbase + + msg 'move io_import_gimp_image_to_scene.py and render_povray to blender-addon-gimp and blender-addon-povray' + install -vm755 -d $srcdir/$pkgbase-addon-{gimp,povray}/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons + install -vm644 $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 + install -vm644 $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() { + 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+1))" 'xcftools') + epoch= + makedepends= + optdepends=('gimp: for edit xcf files') + conflicts= + replaces= + options= + install= + install -vm644 $srcdir/$pkgbase-addon-gimp/usr $pkgdir +} + +package_blender-addon-povray() { + pkgdesc='A addon for the Blender which allows render with POV-Ray' + arch=('any') + depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:$(($_pkgver+1))" 'povray') + epoch= + makedepends= + optdepends= + conflicts= + replaces= + options= + install= + install -vm644 $srcdir/$pkgbase-addon-povray/usr $pkgdir } -- cgit v1.2.3-2-g168b