diff --git a/blender-2.47-scons.patch b/blender-2.47-scons.patch deleted file mode 100644 index c66ef12..0000000 --- a/blender-2.47-scons.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up blender-2.47/extern/SConscript.org blender-2.47/extern/SConscript ---- blender-2.47/extern/SConscript.org 2008-10-14 22:13:44.000000000 +0200 -+++ blender-2.47/extern/SConscript 2008-10-14 22:13:57.000000000 +0200 -@@ -2,8 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) -- - if env['WITH_BF_GAMEENGINE']: - SConscript(['qhull/SConscript', - 'solid/SConscript']) -diff -up blender-2.47/SConstruct.org blender-2.47/SConstruct ---- blender-2.47/SConstruct.org 2008-05-01 16:22:21.000000000 +0200 -+++ blender-2.47/SConstruct 2008-10-14 22:13:27.000000000 +0200 -@@ -216,7 +216,7 @@ if env['OURPLATFORM'] == 'linux2' : - - def CheckFreeAlut(context,env): - context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) -- env['LIBS'] = 'alut' -+ env['LIBS'] = ['alut', 'openal'] - result = context.TryLink(mylib_test_source_file, '.c') - context.Result(result) - return result diff --git a/blender-2.47.config b/blender-2.47.config deleted file mode 100644 index 16a9338..0000000 --- a/blender-2.47.config +++ /dev/null @@ -1,155 +0,0 @@ -LCGDIR = 'lib/linux2' -BF_PYTHON = '/usr' -BF_PYTHON_VERSION = '@PYVER@' -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 = LCGDIR + '/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 = '@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 = 'false' -BF_ODE = LCGDIR + '/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}/BulletDynamics ${BF_BULLET}/Bullet' -BF_BULLET_LIB = 'extern_bullet' - -BF_SOLID = '#extern/solid' -BF_SOLID_INC = '${BF_SOLID}' -BF_SOLID_LIB = 'extern_solid' - -#WITH_BF_NSPR = 'true' -#BF_NSPR = $(LCGDIR)/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 = $(LCGDIR)/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' - -# enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG -BF_FFMPEG = '/usr' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' -BF_FFMPEG_LIBPATH='@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 = 'GLEW GL GLU X11 Xi' -BF_OPENGL_LIBPATH = '@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 - -CFLAGS += '${RPM_OPT_FLAGS}' - -# 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 = '' - -BF_BUILDDIR = 'build/linux2' -BF_INSTALLDIR='install/linux2' - - -#Link against pthread -PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/blender-2.49-scons.patch b/blender-2.49-scons.patch new file mode 100644 index 0000000..88d8d6d --- /dev/null +++ b/blender-2.49-scons.patch @@ -0,0 +1,40 @@ +diff -up blender-2.49/config/linux2-config.py.org blender-2.49/config/linux2-config.py +--- blender-2.49/config/linux2-config.py.org 2009-05-18 21:13:48.000000000 +0200 ++++ blender-2.49/config/linux2-config.py 2009-06-01 20:16:59.000000000 +0200 +@@ -181,6 +181,12 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-c + + CPPFLAGS = ['-DXP_UNIX'] + CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] ++ ++import os ++RPM_OPT_FLAGS = os.environ['RPM_OPT_FLAGS'].split() ++CCFLAGS += RPM_OPT_FLAGS ++CXXFLAGS += RPM_OPT_FLAGS ++ + REL_CFLAGS = ['-O2'] + REL_CCFLAGS = ['-O2'] + ##BF_DEPEND = True +diff -up blender-2.49/extern/SConscript.org blender-2.49/extern/SConscript +--- blender-2.49/extern/SConscript.org 2009-02-26 15:21:17.000000000 +0100 ++++ blender-2.49/extern/SConscript 2009-06-01 20:20:48.000000000 +0200 +@@ -2,8 +2,6 @@ + + Import('env') + +-SConscript(['glew/SConscript']) +- + if env['WITH_BF_GAMEENGINE']: + if env['WITH_BF_SOLID']: + SConscript(['qhull/SConscript', 'solid/SConscript']) +diff -up blender-2.49/SConstruct.org blender-2.49/SConstruct +--- blender-2.49/SConstruct.org 2009-04-21 21:06:24.000000000 +0200 ++++ blender-2.49/SConstruct 2009-06-01 20:18:42.000000000 +0200 +@@ -223,7 +223,7 @@ if env['OURPLATFORM'] == 'linux2' : + + def CheckFreeAlut(context,env): + context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) +- env['LIBS'] = 'alut' ++ env['LIBS'] = 'alut, openal' + result = context.TryLink(mylib_test_source_file, '.c') + context.Result(result) + return result diff --git a/blender-2.49.config b/blender-2.49.config new file mode 100644 index 0000000..0a3d367 --- /dev/null +++ b/blender-2.49.config @@ -0,0 +1,155 @@ +LCGDIR = 'lib/linux2' +BF_PYTHON = '/usr' +BF_PYTHON_VERSION = '@PYVER@' +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 = LCGDIR + '/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 = '@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 = 'false' +BF_ODE = LCGDIR + '/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}/BulletDynamics ${BF_BULLET}/Bullet' +BF_BULLET_LIB = 'extern_bullet' + +BF_SOLID = '#extern/solid' +BF_SOLID_INC = '${BF_SOLID}' +BF_SOLID_LIB = 'extern_solid' + +#WITH_BF_NSPR = 'true' +#BF_NSPR = $(LCGDIR)/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 = $(LCGDIR)/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' + +# enable ffmpeg support +WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG +BF_FFMPEG = '/usr' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH='@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 = 'GLEW GL GLU X11 Xi' +BF_OPENGL_LIBPATH = '@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 + +CFLAGS += '${RPM_OPT_FLAGS}' + +# 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 = '' + +BF_BUILDDIR = 'build/linux2' +BF_INSTALLDIR='install/linux2' + + +#Link against pthread +PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/blender.spec b/blender.spec index 7c41513..3b2c435 100644 --- a/blender.spec +++ b/blender.spec @@ -4,8 +4,8 @@ %global fontname blender Name: blender -Version: 2.48a -Release: 22%{?dist} +Version: 2.49 +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -14,11 +14,11 @@ License: GPLv2 URL: http://www.blender.org # This is a customized source package without ffmpeg, which is # patent encumbered (#239476) -# wget http://download.blender.org/source/blender-2.48.tar.gz +# wget http://download.blender.org/source/blender-2.49.tar.gz # cd blender-2-47/extern # rm -rf ffmpeg libmp3lame x264 # cd ../.. -# tar -zcf blender-2.48-noffmpeg.tar.gz blender-2-48/ +# tar -zcf blender-2.49-noffmpeg.tar.gz blender-2-49/ Source0: blender-%{version}-noffmpeg.tar.gz Source1: http://bane.servebeer.com/programming/blender/import-3ds-0.7.py Source2: http://bane.servebeer.com/programming/blender/export-3ds-0.71.py @@ -27,9 +27,9 @@ Source4: blender.desktop Source5: blender.xml Source6: blender-wrapper Source7: blenderplayer-wraper -Source8: blender-2.47.config +Source8: blender-2.49.config -Patch1: blender-2.47-scons.patch +Patch1: blender-2.49-scons.patch Patch2: blender-2.44-bid.patch Patch100: blender-2.46rc3-cve-2008-1103-1.patch @@ -227,6 +227,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/blenderplayer.bin %changelog +* Mon Jun 1 2009 Jochen Schmitt 2.49-1 +- New upstream release + * Wed May 13 2009 Jochen Schmitt 2.48a-22 - Copy bpydata/config/* into ~/.blender/.../bpydata/config in blender-wrapper script diff --git a/sources b/sources index 4da9f8f..a4b01d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ede2f9466b62e980f9ef87925e463976 blender-2.48a-noffmpeg.tar.gz +a92a6bfb22e5eb50e4499aa770cb7b52 blender-2.49-noffmpeg.tar.gz