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

Tobias Kieslich tobias at archlinux.org
Tue May 20 16:24:25 EDT 2008


    Date: Tuesday, May 20, 2008 @ 16:24:25
  Author: tobias
Revision: 1814

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

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1813 | tobias | 2008-05-20 13:23:54 -0700 (Tue, 20 May 2008) | 1 line
  
  upgpkg: blender 2.46-1
........

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

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-20 20:23:54 UTC (rev 1813)
+++ extra-i686/PKGBUILD	2008-05-20 20:24:25 UTC (rev 1814)
@@ -14,14 +14,14 @@
 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')
+         'gettext' 'libxi' 'libxmu')
 makedepends=('glut' 'cmake')
 install=blender.install
 source=($pkgname.desktop $pkgname.svg)
@@ -29,9 +29,8 @@
   source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
   makedepends=('glut')
 fi
-md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8'
-         '0e53299444ff5570639c8f59372bc98c'
-         '1358ca481b7f2b8eadd3327ebbd563ef')
+md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8' '0e53299444ff5570639c8f59372bc98c' \
+         'e90543a5ca5db8b04498ab0abe7bbd2c')
 
 build() {
   if [ $cvs = true ]; then
@@ -57,7 +56,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
@@ -76,6 +75,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





More information about the arch-commits mailing list