Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 286383 Details for
Bug 377479
media-gfx/blender-2.57-r1 - IndexError: string index out of range: File ".../work/blender-2.57/SConstruct", line 316: if not B.root_build_dir[-1]==os.sep:
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
upstream patch
blender-scons-linux.patch (text/plain), 31.33 KB, created by
Julien Enche
on 2011-09-13 18:27:56 UTC
(
hide
)
Description:
upstream patch
Filename:
MIME Type:
Creator:
Julien Enche
Created:
2011-09-13 18:27:56 UTC
Size:
31.33 KB
patch
obsolete
>Index: intern/ghost/SConscript >=================================================================== >--- intern/ghost/SConscript (révision 39583) >+++ intern/ghost/SConscript (révision 39584) >@@ -26,7 +26,7 @@ > pass > incs += ' ' + env['BF_SDL_INC'] > defs += ['WITH_GHOST_SDL'] >-elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): >+elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): > for f in pf: > try: > sources.remove('intern' + os.sep + f + 'Win32.cpp') >@@ -81,7 +81,7 @@ > if env['WITH_BF_3DMOUSE']: > defs.append('WITH_INPUT_NDOF') > >- if env['OURPLATFORM']=='linux2': >+ if env['OURPLATFORM']=='linux': > incs += ' ' + env['BF_3DMOUSE_INC'] > else: > sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp') >Index: source/blender/render/SConscript >=================================================================== >--- source/blender/render/SConscript (révision 39583) >+++ source/blender/render/SConscript (révision 39584) >@@ -31,7 +31,7 @@ > cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] > cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > if env['WITH_BF_RAYOPTIMIZATION']: > cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] > cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] >Index: source/blender/blenpluginapi/SConscript >=================================================================== >--- source/blender/blenpluginapi/SConscript (révision 39583) >+++ source/blender/blenpluginapi/SConscript (révision 39584) >@@ -11,7 +11,7 @@ > defs.append('WITH_QUICKTIME') > incs += ' ' + env['BF_QUICKTIME_INC'] > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/makesrna/intern/SConscript >=================================================================== >--- source/blender/makesrna/intern/SConscript (révision 39583) >+++ source/blender/makesrna/intern/SConscript (révision 39584) >@@ -91,7 +91,7 @@ > if env['WITH_BF_COLLADA']: > defs.append('WITH_COLLADA') > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >@@ -140,7 +140,7 @@ > if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): > targetpath = '#' + targetpath > >-if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: >+if env['OURPLATFORM'] == 'linux' and root_build_dir[0]==os.sep: > makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib']) > else: > makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib']) >Index: source/blender/makesrna/SConscript >=================================================================== >--- source/blender/makesrna/SConscript (révision 39583) >+++ source/blender/makesrna/SConscript (révision 39584) >@@ -54,7 +54,7 @@ > if env['WITH_BF_COLLADA']: > defs.append('WITH_COLLADA') > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/windowmanager/SConscript >=================================================================== >--- source/blender/windowmanager/SConscript (révision 39583) >+++ source/blender/windowmanager/SConscript (révision 39584) >@@ -26,7 +26,7 @@ > if env['WITH_BF_COLLADA']: > defs.append('WITH_COLLADA') > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/nodes/SConscript >=================================================================== >--- source/blender/nodes/SConscript (révision 39583) >+++ source/blender/nodes/SConscript (révision 39584) >@@ -26,7 +26,7 @@ > if env['BF_DEBUG']: > defs.append('_DEBUG') > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/screen/SConscript >=================================================================== >--- source/blender/editors/screen/SConscript (révision 39583) >+++ source/blender/editors/screen/SConscript (révision 39584) >@@ -10,7 +10,7 @@ > > defs = '' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/physics/SConscript >=================================================================== >--- source/blender/editors/physics/SConscript (révision 39583) >+++ source/blender/editors/physics/SConscript (révision 39584) >@@ -10,7 +10,7 @@ > > defs = '' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/sculpt_paint/SConscript >=================================================================== >--- source/blender/editors/sculpt_paint/SConscript (révision 39583) >+++ source/blender/editors/sculpt_paint/SConscript (révision 39584) >@@ -10,7 +10,7 @@ > incs += ' ../../render/extern/include' > incs += ' ../../gpu ../../makesrna ../../blenloader' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/render/SConscript >=================================================================== >--- source/blender/editors/render/SConscript (révision 39583) >+++ source/blender/editors/render/SConscript (révision 39584) >@@ -9,7 +9,7 @@ > incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' > incs += ' ../../blenloader' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/armature/SConscript >=================================================================== >--- source/blender/editors/armature/SConscript (révision 39583) >+++ source/blender/editors/armature/SConscript (révision 39584) >@@ -7,7 +7,7 @@ > incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' > incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/space_file/SConscript >=================================================================== >--- source/blender/editors/space_file/SConscript (révision 39583) >+++ source/blender/editors/space_file/SConscript (révision 39584) >@@ -19,7 +19,7 @@ > if env['WITH_BF_TIFF']: > defs.append('WITH_TIFF') > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/mesh/SConscript >=================================================================== >--- source/blender/editors/mesh/SConscript (révision 39583) >+++ source/blender/editors/mesh/SConscript (révision 39584) >@@ -8,7 +8,7 @@ > incs += ' ../../gpu ../../blenloader' > incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/space_node/SConscript >=================================================================== >--- source/blender/editors/space_node/SConscript (révision 39583) >+++ source/blender/editors/space_node/SConscript (révision 39584) >@@ -15,7 +15,7 @@ > #cf.append('-Werror') > pass > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: source/blender/editors/object/SConscript >=================================================================== >--- source/blender/editors/object/SConscript (révision 39583) >+++ source/blender/editors/object/SConscript (révision 39584) >@@ -10,7 +10,7 @@ > > defs = [] > >-if env['OURPLATFORM'] == 'linux2': >+if env['OURPLATFORM'] == 'linux': > cflags='-pthread' > incs += ' ../../../extern/binreloc/include' > >Index: build_files/scons/tools/Blender.py >=================================================================== >--- build_files/scons/tools/Blender.py (révision 39583) >+++ build_files/scons/tools/Blender.py (révision 39584) >@@ -206,7 +206,7 @@ > if lenv['WITH_BF_STATICJEMALLOC']: > statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC']) > >- if lenv['OURPLATFORM']=='linux2': >+ if lenv['OURPLATFORM']=='linux': > if lenv['WITH_BF_3DMOUSE']: > libincs += Split(lenv['BF_3DMOUSE_LIBPATH']) > if lenv['WITH_BF_STATIC3DMOUSE']: >@@ -277,7 +277,7 @@ > if not lenv['WITH_BF_STATICJEMALLOC']: > syslibs += Split(lenv['BF_JEMALLOC_LIB']) > >- if lenv['OURPLATFORM']=='linux2': >+ if lenv['OURPLATFORM']=='linux': > if lenv['WITH_BF_3DMOUSE']: > if not lenv['WITH_BF_STATIC3DMOUSE']: > syslibs += Split(lenv['BF_3DMOUSE_LIB']) >@@ -775,7 +775,7 @@ > if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'): > if lenv['BF_DEBUG']: > lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt']) >- if lenv['OURPLATFORM']=='linux2': >+ if lenv['OURPLATFORM']=='linux': > if lenv['WITH_BF_PYTHON']: > lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) > if lenv['OURPLATFORM']=='sunos5': >Index: build_files/scons/tools/btools.py >=================================================================== >--- build_files/scons/tools/btools.py (révision 39583) >+++ build_files/scons/tools/btools.py (révision 39584) >@@ -568,7 +568,7 @@ > extension = '.tar.bz2' > > platform = env['OURPLATFORM'].split('-')[0] >- if platform == 'linux2': >+ if platform == 'linux': > import platform > > bitness = platform.architecture()[0] >Index: build_files/scons/config/linux2-config.py >=================================================================== >--- build_files/scons/config/linux2-config.py (révision 39583) >+++ build_files/scons/config/linux2-config.py (révision 39584) >@@ -1,249 +0,0 @@ >-LCGDIR = '../lib/linux2' >-LIBDIR = "${LCGDIR}" >- >-BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros >-BF_PYTHON = '/usr' >-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' >-BF_PYTHON_VERSION = '3.2' >-WITH_BF_STATICPYTHON = False >-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' >-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' >-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' >-BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] >-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' >- >-WITH_BF_OPENAL = True >-WITH_BF_STATICOPENAL = False >-BF_OPENAL = '/usr' >-BF_OPENAL_INC = '${BF_OPENAL}/include' >-BF_OPENAL_LIB = 'openal' >-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' >- >-BF_CXX = '/usr' >-WITH_BF_STATICCXX = False >-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' >- >-BF_LIBSAMPLERATE = '/usr' >-WITH_BF_STATICLIBSAMPLERATE = False >-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' >-BF_LIBSAMPLERATE_LIB = 'samplerate' >-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib' >-BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a' >- >-WITH_BF_JACK = False >-BF_JACK = '/usr' >-BF_JACK_INC = '${BF_JACK}/include/jack' >-BF_JACK_LIB = 'jack' >-BF_JACK_LIBPATH = '${BF_JACK}/lib' >- >-WITH_BF_SNDFILE = False >-WITH_BF_STATICSNDFILE = False >-BF_SNDFILE = '/usr' >-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile' >-BF_SNDFILE_LIB = 'sndfile' >-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib' >-BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a' >- >-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_OPENEXR = True >-WITH_BF_STATICOPENEXR = False >-BF_OPENEXR = '/usr' >-# when compiling with your own openexr lib you might need to set... >-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include' >- >-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' >-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' >-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' >-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' >- >- >-WITH_BF_DDS = True >- >-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' >- >-WITH_BF_TIFF = True >-BF_TIFF = '/usr' >-BF_TIFF_INC = '${BF_TIFF}/include' >-BF_TIFF_LIB = 'tiff' >- >-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_GETTEXT_STATIC = True >-#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a' >- >-WITH_BF_GAMEENGINE = True >-WITH_BF_PLAYER = True >- >-WITH_BF_BULLET = True >-BF_BULLET = '#extern/bullet2/src' >-BF_BULLET_INC = '${BF_BULLET}' >-BF_BULLET_LIB = 'extern_bullet' >- >-# 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_FREETYPE_STATIC = True >-#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a' >- >-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' >- >-WITH_BF_BINRELOC = True >- >-# enable ffmpeg support >-WITH_BF_FFMPEG = True # -DWITH_FFMPEG >-BF_FFMPEG = '/usr' >-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice' >-BF_FFMPEG_INC = '${BF_FFMPEG}/include' >-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' >-#WITH_BF_STATICFFMPEG = True >-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a' >- >-# enable ogg, vorbis and theora in ffmpeg >-WITH_BF_OGG = False # -DWITH_OGG >-BF_OGG = '/usr' >-BF_OGG_INC = '${BF_OGG}/include' >-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' >- >-WITH_BF_OPENJPEG = True >-BF_OPENJPEG = '#extern/libopenjpeg' >-BF_OPENJPEG_LIB = '' >-BF_OPENJPEG_INC = '${BF_OPENJPEG}' >-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' >- >-WITH_BF_FFTW3 = False >-WITH_BF_STATICFFTW3 = False >-BF_FFTW3 = '/usr' >-BF_FFTW3_INC = '${BF_FFTW3}/include' >-BF_FFTW3_LIB = 'fftw3' >-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' >-BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a' >- >-WITH_BF_REDCODE = False >-BF_REDCODE = '#extern/libredcode' >-BF_REDCODE_LIB = '' >-# BF_REDCODE_INC = '${BF_REDCODE}/include' >-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now. >-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' >- >-# 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_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' >- >-WITH_BF_COLLADA = False >-BF_COLLADA = '#source/blender/collada' >-BF_COLLADA_INC = '${BF_COLLADA}' >-BF_COLLADA_LIB = 'bf_collada' >-BF_OPENCOLLADA = '/usr' >-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}' >-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa' >-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' >-BF_PCRE = '' >-BF_PCRE_LIB = 'pcre' >-BF_PCRE_LIBPATH = '/usr/lib' >-BF_EXPAT = '/usr' >-BF_EXPAT_LIB = 'expat' >-BF_EXPAT_LIBPATH = '/usr/lib' >- >-WITH_BF_JEMALLOC = False >-WITH_BF_STATICJEMALLOC = False >-BF_JEMALLOC = '/usr' >-BF_JEMALLOC_INC = '${BF_JEMALLOC}/include' >-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib' >-BF_JEMALLOC_LIB = 'jemalloc' >-BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a' >- >-WITH_BF_OPENMP = True >- >-#Ray trace optimization >-WITH_BF_RAYOPTIMIZATION = True >-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] >- >-#SpaceNavigator and friends >-WITH_BF_3DMOUSE = True >-BF_3DMOUSE = '/usr' >-BF_3DMOUSE_INC = '${BF_3DMOUSE}/include' >-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib' >-BF_3DMOUSE_LIB = 'spnav' >-BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.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','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE'] >- >-CPPFLAGS = [] >-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE'] >-# g++ 4.6, only needed for bullet >-CXXFLAGS += ['-fpermissive'] >-if WITH_BF_FFMPEG: >- # libavutil needs UINT64_C() >- CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ] >-REL_CFLAGS = ['-DNDEBUG', '-O2'] >-REL_CCFLAGS = ['-DNDEBUG', '-O2'] >-##BF_DEPEND = True >-## >-##AR = ar >-##ARFLAGS = ruv >-##ARFLAGSQUIET = ru >-## >-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type'] >-CC_WARN = ['-Wall'] >-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] >- >- >-##FIX_STUBS_WARNINGS = -Wno-unused >- >-LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] >-##LOPTS = --dynamic >-##DYNLDFLAGS = -shared $(LDFLAGS) >- >-BF_PROFILE = False >-BF_PROFILE_CCFLAGS = ['-pg','-g'] >-BF_PROFILE_LINKFLAGS = ['-pg'] >- >-BF_DEBUG = False >-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG'] >- >-BF_BUILDDIR = '../build/linux2' >-BF_INSTALLDIR='../install/linux2' >- >-#Link against pthread >-PLATFORM_LINKFLAGS = ['-pthread'] >- >Index: build_files/scons/config/linux-config.py >=================================================================== >--- build_files/scons/config/linux-config.py (révision 0) >+++ build_files/scons/config/linux-config.py (révision 39584) >@@ -0,0 +1,249 @@ >+LCGDIR = '../lib/linux' >+LIBDIR = "${LCGDIR}" >+ >+BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros >+BF_PYTHON = '/usr' >+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' >+BF_PYTHON_VERSION = '3.2' >+WITH_BF_STATICPYTHON = False >+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' >+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' >+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' >+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] >+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' >+ >+WITH_BF_OPENAL = True >+WITH_BF_STATICOPENAL = False >+BF_OPENAL = '/usr' >+BF_OPENAL_INC = '${BF_OPENAL}/include' >+BF_OPENAL_LIB = 'openal' >+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' >+ >+BF_CXX = '/usr' >+WITH_BF_STATICCXX = False >+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' >+ >+BF_LIBSAMPLERATE = '/usr' >+WITH_BF_STATICLIBSAMPLERATE = False >+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' >+BF_LIBSAMPLERATE_LIB = 'samplerate' >+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib' >+BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a' >+ >+WITH_BF_JACK = False >+BF_JACK = '/usr' >+BF_JACK_INC = '${BF_JACK}/include/jack' >+BF_JACK_LIB = 'jack' >+BF_JACK_LIBPATH = '${BF_JACK}/lib' >+ >+WITH_BF_SNDFILE = False >+WITH_BF_STATICSNDFILE = False >+BF_SNDFILE = '/usr' >+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile' >+BF_SNDFILE_LIB = 'sndfile' >+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib' >+BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a' >+ >+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_OPENEXR = True >+WITH_BF_STATICOPENEXR = False >+BF_OPENEXR = '/usr' >+# when compiling with your own openexr lib you might need to set... >+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include' >+ >+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' >+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' >+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' >+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' >+ >+ >+WITH_BF_DDS = True >+ >+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' >+ >+WITH_BF_TIFF = True >+BF_TIFF = '/usr' >+BF_TIFF_INC = '${BF_TIFF}/include' >+BF_TIFF_LIB = 'tiff' >+ >+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_GETTEXT_STATIC = True >+#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a' >+ >+WITH_BF_GAMEENGINE = True >+WITH_BF_PLAYER = True >+ >+WITH_BF_BULLET = True >+BF_BULLET = '#extern/bullet2/src' >+BF_BULLET_INC = '${BF_BULLET}' >+BF_BULLET_LIB = 'extern_bullet' >+ >+# 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_FREETYPE_STATIC = True >+#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a' >+ >+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' >+ >+WITH_BF_BINRELOC = True >+ >+# enable ffmpeg support >+WITH_BF_FFMPEG = True # -DWITH_FFMPEG >+BF_FFMPEG = '/usr' >+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice' >+BF_FFMPEG_INC = '${BF_FFMPEG}/include' >+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' >+#WITH_BF_STATICFFMPEG = True >+#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a' >+ >+# enable ogg, vorbis and theora in ffmpeg >+WITH_BF_OGG = False # -DWITH_OGG >+BF_OGG = '/usr' >+BF_OGG_INC = '${BF_OGG}/include' >+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' >+ >+WITH_BF_OPENJPEG = True >+BF_OPENJPEG = '#extern/libopenjpeg' >+BF_OPENJPEG_LIB = '' >+BF_OPENJPEG_INC = '${BF_OPENJPEG}' >+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' >+ >+WITH_BF_FFTW3 = False >+WITH_BF_STATICFFTW3 = False >+BF_FFTW3 = '/usr' >+BF_FFTW3_INC = '${BF_FFTW3}/include' >+BF_FFTW3_LIB = 'fftw3' >+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' >+BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a' >+ >+WITH_BF_REDCODE = False >+BF_REDCODE = '#extern/libredcode' >+BF_REDCODE_LIB = '' >+# BF_REDCODE_INC = '${BF_REDCODE}/include' >+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now. >+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' >+ >+# 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_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' >+ >+WITH_BF_COLLADA = False >+BF_COLLADA = '#source/blender/collada' >+BF_COLLADA_INC = '${BF_COLLADA}' >+BF_COLLADA_LIB = 'bf_collada' >+BF_OPENCOLLADA = '/usr' >+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}' >+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa' >+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' >+BF_PCRE = '' >+BF_PCRE_LIB = 'pcre' >+BF_PCRE_LIBPATH = '/usr/lib' >+BF_EXPAT = '/usr' >+BF_EXPAT_LIB = 'expat' >+BF_EXPAT_LIBPATH = '/usr/lib' >+ >+WITH_BF_JEMALLOC = False >+WITH_BF_STATICJEMALLOC = False >+BF_JEMALLOC = '/usr' >+BF_JEMALLOC_INC = '${BF_JEMALLOC}/include' >+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib' >+BF_JEMALLOC_LIB = 'jemalloc' >+BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a' >+ >+WITH_BF_OPENMP = True >+ >+#Ray trace optimization >+WITH_BF_RAYOPTIMIZATION = True >+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] >+ >+#SpaceNavigator and friends >+WITH_BF_3DMOUSE = True >+BF_3DMOUSE = '/usr' >+BF_3DMOUSE_INC = '${BF_3DMOUSE}/include' >+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib' >+BF_3DMOUSE_LIB = 'spnav' >+BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.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','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE'] >+ >+CPPFLAGS = [] >+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE'] >+# g++ 4.6, only needed for bullet >+CXXFLAGS += ['-fpermissive'] >+if WITH_BF_FFMPEG: >+ # libavutil needs UINT64_C() >+ CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ] >+REL_CFLAGS = ['-DNDEBUG', '-O2'] >+REL_CCFLAGS = ['-DNDEBUG', '-O2'] >+##BF_DEPEND = True >+## >+##AR = ar >+##ARFLAGS = ruv >+##ARFLAGSQUIET = ru >+## >+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type'] >+CC_WARN = ['-Wall'] >+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] >+ >+ >+##FIX_STUBS_WARNINGS = -Wno-unused >+ >+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] >+##LOPTS = --dynamic >+##DYNLDFLAGS = -shared $(LDFLAGS) >+ >+BF_PROFILE = False >+BF_PROFILE_CCFLAGS = ['-pg','-g'] >+BF_PROFILE_LINKFLAGS = ['-pg'] >+ >+BF_DEBUG = False >+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG'] >+ >+BF_BUILDDIR = '../build/linux' >+BF_INSTALLDIR='../install/linux' >+ >+#Link against pthread >+PLATFORM_LINKFLAGS = ['-pthread'] >+ > >Modification de propriétés sur build_files/scons/config/linux-config.py >___________________________________________________________________ >Ajouté : svn:eol-style > + native >Ajouté : svn:keywords > + Author Date Id Revision > >Index: doc/build_systems/scons-dev.txt >=================================================================== >--- doc/build_systems/scons-dev.txt (révision 39583) >+++ doc/build_systems/scons-dev.txt (révision 39584) >@@ -27,7 +27,7 @@ > filenames have the form (platform)-config.py, where platform one of: > > * darwin >- * linux2 >+ * linux > * win32-mingw > * win32-vc > >Index: doc/build_systems/scons.txt >=================================================================== >--- doc/build_systems/scons.txt (révision 39583) >+++ doc/build_systems/scons.txt (révision 39584) >@@ -76,7 +76,7 @@ > $BLENDERHOME/config. Your platform specific defaults are in > (platform)-config.py, where platform is one of: > >- - linux2, for machines running Linux >+ - linux, for machines running Linux > - win32-vc, for Windows machines, compiling with a Microsoft compiler > - win32-mingw, for Windows machines, compiling with the MingW compiler > - darwin, for OS X machines >Index: extern/eltopo/SConscript >=================================================================== >--- extern/eltopo/SConscript (révision 39583) >+++ extern/eltopo/SConscript (révision 39584) >@@ -11,10 +11,10 @@ > defs += ' WIN32 NDEBUG _WINDOWS' > #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] > cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs'] >-elif env['OURPLATFORM']=='win32-mingw': >+elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'): > defs += ' NDEBUG' > cflags += ['-O2'] >-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5': >+elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'): > defs += ' NDEBUG' > cflags += ['-O2'] > elif sys.platform=='darwin': >Index: extern/bullet2/src/SConscript >=================================================================== >--- extern/bullet2/src/SConscript (révision 39583) >+++ extern/bullet2/src/SConscript (révision 39584) >@@ -11,10 +11,10 @@ > defs += ' WIN32 NDEBUG _WINDOWS' > #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] > cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs'] >-elif env['OURPLATFORM']=='win32-mingw': >+elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'): > defs += ' NDEBUG' > cflags += ['-O2'] >-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5': >+elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'): > defs += ' NDEBUG' > cflags += ['-O2'] > elif sys.platform=='darwin': >Index: SConstruct >=================================================================== >--- SConstruct (révision 39583) >+++ SConstruct (révision 39584) >@@ -166,6 +166,13 @@ > > env.SConscriptChdir(0) > >+# Remove major kernel version from linux platform. >+# After Linus switched kernel to new version model this major version >+# shouldn't take much sense for building rules. >+ >+if re.match('linux[0-9]+', platform): >+ platform = 'linux' >+ > crossbuild = B.arguments.get('BF_CROSS', None) > if crossbuild and platform not in ('win32-vc', 'win64-vc'): > platform = 'linuxcross' >@@ -551,7 +558,7 @@ > scriptinstall.append(env.Install(dir=dir,source=source)) > > #-- icons >-if env['OURPLATFORM']=='linux2': >+if env['OURPLATFORM']=='linux': > iconlist = [] > icontargetlist = [] > >@@ -630,7 +637,7 @@ > > if env['OURPLATFORM']=='darwin': > allinstall = [blenderinstall, plugininstall, textinstall] >-elif env['OURPLATFORM']=='linux2': >+elif env['OURPLATFORM']=='linux': > allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall] > else: > allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 377479
:
281909
|
285269
| 286383