[arch-commits] Commit in blender/repos (extra-i686 extra-i686/PKGBUILD)
Pierre Schmitz
pierre at archlinux.org
Fri Oct 31 17:13:29 UTC 2008
Date: Friday, October 31, 2008 @ 13:13:28
Author: pierre
Revision: 17693
Merged revisions 17443,17692 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/blender/trunk
........
r17443 | tobias | 2008-10-29 22:24:51 +0100 (Mi, 29 Okt 2008) | 1 line
upgpkg: blender 2.48a-1
........
r17692 | pierre | 2008-10-31 18:12:26 +0100 (Fr, 31 Okt 2008) | 1 line
upgpkg: blender 2.48a-2
........
Modified:
blender/repos/extra-i686/ (properties)
blender/repos/extra-i686/PKGBUILD
----------+
PKGBUILD | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
Property changes on: blender/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /blender/trunk:1-12030
+ /blender/trunk:1-17692
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-10-31 17:12:26 UTC (rev 17692)
+++ extra-i686/PKGBUILD 2008-10-31 17:13:28 UTC (rev 17693)
@@ -14,15 +14,15 @@
cvs=false
pkgname=blender
-pkgver=2.47
-pkgrel=1
+pkgver=2.48a
+pkgrel=2
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' \
+depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python>=2.6' 'desktop-file-utils' \
'gettext' 'libxi' 'libxmu')
-makedepends=('glut' 'cmake' 'libtiff' 'librsvg')
+makedepends=('glut' 'libtiff' 'librsvg')
options=('!makeflags')
install=blender.install
source=($pkgname.desktop $pkgname.svg)
@@ -30,8 +30,6 @@
source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
makedepends=('glut' 'libtiff' 'librsvg')
fi
-md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8' '0e53299444ff5570639c8f59372bc98c' \
- '750f3be3214e15334e96afcc866c9f48')
build() {
if [ $cvs = true ]; then
@@ -55,13 +53,16 @@
sed -i "s|^#\(.*BINTARGETS += blenderplayer\)|\1|g" source/Makefile
# fixing a nasty bug to make it pick up openexr linking
sed -i "s|/lib/libIex.a|/lib/libIex.a -lIlmImf|g" source/nan_definitions.mk
+ # link freetype dynamically
+ sed -i 's|LOPTS)|LOPTS) -lfreetype|g' source/Makefile
+ sed -i 's|COMLIB.*libfreetype\.a|#\0|g' source/Makefile
# make ode (alternative physics engine)
# does not work for Arch64
#[ "$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
- export NAN_PYTHON_VERSION=2.5
+ export NAN_PYTHON_VERSION=2.6
export INTERNATIONAL=true
export WITH_FREETYPE2=true
export NAN_FREETYPE=/usr
@@ -78,7 +79,7 @@
export WITH_OPENEXR=true
export NAN_OPENEXR=/usr
export NAN_ODE=/usr
- export NAN_OPENEXR_LIBS=$(pkg-config --libs OpenEXR)
+ export NAN_OPENEXR_LIBS=$(pkg-config --libs-only-l OpenEXR)
export NAN_SDL=/usr
export NAN_ZLIB=/usr
More information about the arch-commits
mailing list