[arch-commits] Commit in blender/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Sun Sep 12 01:07:47 UTC 2010
Date: Saturday, September 11, 2010 @ 21:07:46
Author: eric
Revision: 90489
upgpkg: blender 2.49b-1
Upstream update, Rebuilt for python2, Updated url, Clean up .install file, Removed old patches
Modified:
blender/trunk/PKGBUILD
blender/trunk/blender.install
Deleted:
blender/trunk/blender_x86_64.diff
blender/trunk/config.py
---------------------+
PKGBUILD | 59 +++++++++--------
blender.install | 17 -----
blender_x86_64.diff | 11 ---
config.py | 166 --------------------------------------------------
4 files changed, 36 insertions(+), 217 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-11 23:48:38 UTC (rev 90488)
+++ PKGBUILD 2010-09-12 01:07:46 UTC (rev 90489)
@@ -14,34 +14,40 @@
cvs=false
pkgname=blender
-pkgver=2.49a
+pkgver=2.49b
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.6' 'desktop-file-utils' \
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.blender.org"
+depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python2' 'desktop-file-utils' \
'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal')
makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm' 'csv')
options=('!makeflags')
install=blender.install
source=($pkgname.desktop $pkgname.svg)
if [ ! $cvs -o $cvs = false ]; then
+ makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm')
source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm')
+ md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8'
+ '0e53299444ff5570639c8f59372bc98c'
+ '718eef6a4ff377989e829b92a886cc5b')
+ sha1sums=('9ae82b5df21b4803f981e3df4a256b4be7137273'
+ '1e5452f56f590d5ce1af8c174113f0e639714c0c'
+ '43f71e7de4efe79c518d45f4b5a04e03c28d5fc5')
fi
build() {
if [ $cvs = true ]; then
- cd $srcdir/
+ cd "$srcdir/"
#cvs -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender login
- cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender checkout $pkgname || return 1
+ cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender checkout $pkgname
_cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release
- cvs -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel || return 1
+ cvs -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel
find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null
cd $pkgname
else
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
fi
rm -f user-def.mk
@@ -59,7 +65,7 @@
# does not work for Arch64
#[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile
# make the nan_makefiles happy
- export NAN_PYTHON_VERSION=2.6
+ export NAN_PYTHON_VERSION=2.7
export INTERNATIONAL=true
export WITH_FREETYPE2=true
export NAN_FREETYPE=/usr
@@ -89,48 +95,49 @@
export NAN_DEBUG=-O
###########################################################################
# build
- make || return 1
+ LDFLAGS="-Wl,--hash-style=gnu"
+ make
###########################################################################
}
package() {
if [ $cvs = true ]; then
- cd $srcdir/$pkgname
+ cd "$srcdir/$pkgname"
else
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
fi
-#mkdir -p $pkgdir/usr/share/
cd obj/linux-glibc2*/bin
# common part
- mkdir -p $pkgdir/usr/share/
+ mkdir -p "$pkgdir/usr/share/"
# install binaries
- install -Dm755 blender $pkgdir/usr/bin/blender
- install -Dm755 blenderplayer $pkgdir/usr/bin/blenderplayer
+ install -Dm755 blender "$pkgdir/usr/bin/blender"
+ install -Dm755 blenderplayer "$pkgdir/usr/bin/blenderplayer"
# install internationalization support
cd ../../../bin/.blender
install -D -m644 .Blanguages \
- $pkgdir/usr/share/$pkgname/.Blanguages
+ "$pkgdir/usr/share/$pkgname/.Blanguages"
install -D -m644 .bfont.ttf \
- $pkgdir/usr/share/$pkgname/.bfont.ttf
+ "$pkgdir/usr/share/$pkgname/.bfont.ttf"
- cp -R locale $pkgdir/usr/share/
+ cp -R locale "$pkgdir/usr/share/"
# install scripts
cd ../../release/
- cp -R scripts $pkgdir/usr/share/$pkgname/
+ cp -R scripts "$pkgdir/usr/share/$pkgname/"
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "$pkgdir/usr/share/blender/scripts/bpymodules/blend2renderinfo.py"
# install all additional stuff
# install a freedesktop.org compliant menu entry
- install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+ install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
# install some freedesktop.org compatibility
- install -D -m644 $srcdir/$pkgname.svg $pkgdir/usr/share/pixmaps/$pkgname.svg
+ install -D -m644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
# finally we render a png as fallback for not svg aware menu applications
# Attention: always make sure you check the dimensions of the source-svg,
- # you can read the dimensions via inkscapes export funktion
- rsvg -w 64 -h 64 -f png $pkgdir/usr/share/pixmaps/$pkgname.svg $pkgdir/usr/share/pixmaps/$pkgname.png
+ # you can read the dimensions via inkscape's export function
+ rsvg -w 64 -h 64 -f png "$pkgdir/usr/share/pixmaps/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.png"
}
Modified: blender.install
===================================================================
--- blender.install 2010-09-11 23:48:38 UTC (rev 90488)
+++ blender.install 2010-09-12 01:07:46 UTC (rev 90489)
@@ -16,24 +16,13 @@
Happy blending!
EOF
- echo "update desktop mime database..."
- update-desktop-database
+ update-desktop-database -q
}
post_upgrade() {
- post_install $1
+ update-desktop-database -q
}
-pre_remove() {
- /bin/true
-}
-
post_remove() {
- echo "update desktop mime database..."
- update-desktop-database
+ update-desktop-database -q
}
-
-op=$1
-shift
-
-$op $*
Deleted: blender_x86_64.diff
===================================================================
--- blender_x86_64.diff 2010-09-11 23:48:38 UTC (rev 90488)
+++ blender_x86_64.diff 2010-09-12 01:07:46 UTC (rev 90489)
@@ -1,11 +0,0 @@
---- source/creator/creator.c 2007-01-28 05:45:58.000000000 +0000
-+++ source/creator/creator.c.new 2007-02-24 21:37:25.000000000 +0000
-@@ -241,7 +241,7 @@
- having to fix all faulty saved 64 bits files (ton) */
- if(sizeof(void *)==8) {
- printf("64 bits compiles will give incorrectly saved .blend files. Do not use it. For testing purposes please remove this line from creator.c\n");
-- exit(0);
-+ // exit(0);
- }
- #else
- if(sizeof(void *)==8) {
Deleted: config.py
===================================================================
--- config.py 2010-09-11 23:48:38 UTC (rev 90488)
+++ config.py 2010-09-12 01:07:46 UTC (rev 90489)
@@ -1,166 +0,0 @@
-LCGDIR = '../lib/linux2'
-LIBDIR = "${LCGDIR}"
-
-WITH_BF_VERSE = 'false'
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
-BF_PYTHON = '/usr'
-BF_PYTHON_VERSION = '2.5'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
-BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-
-#WITH_BF_OPENAL = 'true'
-#BF_OPENAL = '/usr'
-#BF_OPENAL_INC = '${BF_OPENAL}/include'
-#BF_OPENAL_LIB = 'openal'
-
-WITH_BF_SDL = 'true'
-BF_SDL = '/usr' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
-
-WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = '/usr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-
-WITH_BF_JPEG = 'true'
-BF_JPEG = '/usr'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = 'true'
-BF_PNG = '/usr'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-BF_TIFF = '/usr'
-BF_TIFF_INC = '${BF_TIFF}/include'
-
-WITH_BF_ZLIB = 'true'
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = 'true'
-
-BF_GETTEXT = '/usr'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_FTGL = 'true'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
-WITH_BF_GAMEENGINE='true'
-
-WITH_BF_ODE = 'true'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
-WITH_BF_BULLET = 'true'
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
-WITH_BF_YAFRAY = 'true'
-
-#WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB =
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
-
-# enable freetype2 support for text objects
-BF_FREETYPE = '/usr'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-
-WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = 'false'
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-# enable ffmpeg support
-WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
-BF_FFMPEG = '/usr'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat avcodec avutil'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = 'false'
-BF_OPENGL = '/usr'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
-
-##
-CC = 'gcc'
-CXX = 'g++'
-##ifeq ($CPU),alpha)
-## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-
-CPPFLAGS = ['-DXP_UNIX']
-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
-##BF_DEPEND = 'true'
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = '-Wall -Wno-char-subscripts'
-
-CC_WARN = '-Wall'
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = 'util c m dl pthread stdc++'
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE_FLAGS = ['-pg','-g']
-BF_PROFILE = 'false'
-
-BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = '-g'
-
-BF_BUILDDIR = '../build/linux2'
-#BF_INSTALLDIR='../install/linux2'
-
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
More information about the arch-commits
mailing list