From 3dfa4c8e94024ee02a9fd424ba57436198235647 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Mon, 6 Oct 2014 15:30:10 -0200 Subject: blender: fixing git --- libre/blender/PKGBUILD | 79 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) (limited to 'libre') 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 From 835cc65b1de2d1f6103507ab94bbcc93a1bda1bc Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Mon, 6 Oct 2014 16:27:08 -0200 Subject: blender: fix PKGBUILD --- libre/blender/PKGBUILD | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 09a352c42..68a929000 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -124,6 +124,7 @@ build() { -DSUPPORT_SSE_BUILD=ON \ -DSUPPORT_SSE2_BUILD=ON \ -DWITH_AUDASPACE=ON \ + -DWITH_ASSERT_ABORT=OFF \ -DWITH_BLENDER=ON \ -DWITH_BOOST=ON \ -DWITH_BOOST_ICU=OFF \ @@ -133,15 +134,23 @@ build() { -DWITH_CODEC_FFMPEG=ON \ -DWITH_CODEC_SNDFILE=ON \ -DWITH_COMPOSITOR=ON \ + -DWITH_CXX_GUARDEDALLOC=OFF \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_CUDA_BINARIES=OFF \ + -DWITH_CYCLES_DEBUG=OFF \ + -DWITH_CYCLES_LOGGING=OFF \ -DWITH_CYCLES_OSL=ON \ -DWITH_CYCLES_STANDALONE=ON \ -DWITH_CYCLES_STANDALONE_GUI=ON \ -DWITH_FFTW3=ON \ -DWITH_FREESTYLE=ON \ -DWITH_GAMEENGINE=ON \ + -DWITH_GCC_MUDFLAP=ON \ + -DWITH_GHOST_DEBUG=OFF \ + -DWITH_GHOST_SDL=OFF \ -DWITH_GHOST_XDND=ON \ + -DWITH_GTESTS=OFF \ + -DWITH_HEADLESS=OFF \ -DWITH_IK_ITASC=ON \ -DWITH_IK_SOLVER=ON \ -DWITH_IMAGE_CINEON=ON \ @@ -158,6 +167,7 @@ build() { -DWITH_JACK=ON \ -DWITH_JACK_DYNLOAD=ON \ -DWITH_LIBMV=OFF \ + -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=OFF \ -DWITH_LLVM=ON \ -DWITH_LZMA=ON \ -DWITH_LZO=ON \ @@ -172,6 +182,7 @@ build() { -DWITH_OPENIMAGEIO=ON \ -DWITH_OPENCOLLADA=ON \ -DWITH_OPENCOLORIO=ON \ + -DWITH_OPENNL=ON \ -DWITH_OPENMP=ON \ -DWITH_PLAYER=ON \ -DWITH_PYTHON=ON \ @@ -184,12 +195,14 @@ build() { -DWITH_RAYOPTIMIZATION=ON \ -DWITH_SDL=ON \ -DWITH_STATIC_LIBS=OFF \ + -DWITH_SYSTEM_BULLET=OFF \ -DWITH_SYSTEM_GLEW=ON \ -DWITH_SYSTEM_OPENJPEG=ON \ -DWITH_X11_XF86VMODE=ON \ -DWITH_X11_XINPUT=ON + + # for future blender #-DWITH_MOD_CLOTH_ELTOPO=ON\ - #-DWITH_SYSTEM_BULLET=ON\ #-DSUPPORT_SSE_BUILD=$_SSE \ #-DSUPPORT_SSE2_BUILD=$_SSE2 \ @@ -197,6 +210,7 @@ build() { # Note: Fix for gcc 4.9 :/ # -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" # -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" + make } @@ -219,26 +233,28 @@ 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= + conflicts=("$pkgbase<$epoch:$_pkgver") replaces= + epoch= 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= + depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:$(($_pkgver+1))" 'povray>=3.7') makedepends= optdepends= - conflicts= + conflicts=("$pkgbase<$epoch:$_pkgver") replaces= + epoch= options= install= + install -vm644 $srcdir/$pkgbase-addon-povray/usr $pkgdir } -- cgit v1.2.3 From c42234472fe887e997f5e02afcf75c731d45b8a2 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Mon, 6 Oct 2014 16:37:03 -0200 Subject: blender: fix PKGBUILD --- libre/blender/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libre') diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 68a929000..a857ad65b 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -232,13 +232,13 @@ 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+1))" 'xcftools') - makedepends= + depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'xcftools') + makedepends=() optdepends=('gimp: for edit xcf files') conflicts=("$pkgbase<$epoch:$_pkgver") - replaces= + replaces=() epoch= - options= + options=() install= install -vm644 $srcdir/$pkgbase-addon-gimp/usr $pkgdir @@ -247,13 +247,13 @@ package_blender-addon-gimp() { 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>=3.7') - makedepends= - optdepends= + depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'povray>=3.7') + makedepends=() + optdepends=() conflicts=("$pkgbase<$epoch:$_pkgver") - replaces= + replaces=() epoch= - options= + options=() install= install -vm644 $srcdir/$pkgbase-addon-povray/usr $pkgdir -- cgit v1.2.3