[arch-commits] Commit in blender/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Thursday, May 22, 2008 @ 00:36:42
  Author: eric
Revision: 1867

Merged revisions 2-1866 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/blender/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1813 | tobias | 2008-05-20 16:23:54 -0400 (Tue, 20 May 2008) | 1 line
  
  upgpkg: blender 2.46-1
........
  r1866 | eric | 2008-05-22 00:36:25 -0400 (Thu, 22 May 2008) | 2 lines
  
  upgpkg: blender 2.46-1
      disabled SMP build, added missing makedepends
........

Modified:
  blender/repos/extra-x86_64/	(properties)
  blender/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)


Property changes on: blender/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /blender/trunk:1
   + /blender/trunk:1-1866

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-22 04:36:25 UTC (rev 1866)
+++ extra-x86_64/PKGBUILD	2008-05-22 04:36:42 UTC (rev 1867)
@@ -14,25 +14,25 @@
 cvs=false
 
 pkgname=blender
-pkgver=2.45
+pkgver=2.46
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://blender3d.org"
 depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python>=2.5' 'desktop-file-utils' \
-         'gettext')
-makedepends=('glut' 'cmake')
+         'gettext' 'libxi' 'libxmu')
+makedepends=('glut' 'cmake' 'libtiff' 'librsvg')
 options=('!makeflags')
+options=('!makeflags')
 install=blender.install
 source=($pkgname.desktop $pkgname.svg)
 if [ ! $cvs -o $cvs = false ]; then
   source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  makedepends=('glut')
+  makedepends=('glut' 'libtiff' 'librsvg')
 fi
-md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8'
-         '0e53299444ff5570639c8f59372bc98c'
-         '1358ca481b7f2b8eadd3327ebbd563ef')
+md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8' '0e53299444ff5570639c8f59372bc98c' \
+         'e90543a5ca5db8b04498ab0abe7bbd2c')
 
 build() {
   if [ $cvs = true ]; then
@@ -47,7 +47,7 @@
     cd $startdir/src/$pkgname-$pkgver
   fi
 
- rm user-def.mk
+ rm -f user-def.mk
 
  ##########################################################################
  # tweak the makefiles to prepare build for ArchLinux
@@ -58,7 +58,7 @@
   sed -i "s|/lib/libIex.a|/lib/libIex.a -lIlmImf|g" source/nan_definitions.mk
    # make ode (alternative physics engine)
    # does not work for Arch64
-  [ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile
+   #[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile
    # get rid of buggy openal
   export NAN_NO_OPENAL=true
    # make the nan_makefiles happy
@@ -77,6 +77,7 @@
   export NAN_PNG=/usr
   export WITH_OPENEXR=true
   export NAN_OPENEXR=/usr
+  export NAN_ODE=/usr
   export NAN_OPENEXR_LIBS=$(pkg-config --libs OpenEXR)
 
   export NAN_SDL=/usr