diff --git a/blender-2.58-ext.patch b/blender-2.58-ext.patch deleted file mode 100644 index a268701..0000000 --- a/blender-2.58-ext.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -up blender-2.58/intern/ghost/SConscript.ext blender-2.58/intern/ghost/SConscript ---- blender-2.58/intern/ghost/SConscript.ext 2011-06-22 17:16:24.000000000 +0200 -+++ blender-2.58/intern/ghost/SConscript 2011-06-27 17:35:43.545649610 +0200 -@@ -21,7 +21,7 @@ if window_system in ('linux2', 'openbsd3 - sources.remove('intern' + os.sep + f + 'Carbon.cpp') - except ValueError: - pass -- defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option -+ defs += ['PREFIX=\\"/usr/\\"'] # XXX, make an option - defs += ['WITH_X11_XINPUT'] # XXX, make an option - - elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): -@@ -60,7 +60,7 @@ else: - if env['BF_GHOST_DEBUG']: - defs.append('BF_GHOST_DEBUG') - --incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] -+incs = '. ../string #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] - if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): - incs = env['BF_WINTAB_INC'] + ' ' + incs - -diff -up blender-2.58/source/blender/editors/space_console/SConscript.ext blender-2.58/source/blender/editors/space_console/SConscript ---- blender-2.58/source/blender/editors/space_console/SConscript.ext 2011-06-22 17:26:12.000000000 +0200 -+++ blender-2.58/source/blender/editors/space_console/SConscript 2011-06-27 17:35:43.527649610 +0200 -@@ -6,7 +6,7 @@ defs = [] - - incs = [ - '../include', -- '#extern/glew/include', -+ '', - '#/intern/guardedalloc', - '../../makesdna', - '../../makesrna', -diff -up blender-2.58/source/blender/editors/space_node/SConscript.ext blender-2.58/source/blender/editors/space_node/SConscript ---- blender-2.58/source/blender/editors/space_node/SConscript.ext 2011-06-22 17:28:10.000000000 +0200 -+++ blender-2.58/source/blender/editors/space_node/SConscript 2011-06-27 17:35:43.528649610 +0200 -@@ -5,7 +5,7 @@ sources = env.Glob('*.c') - - incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' - incs += ' ../../nodes ../../render/extern/include ../../blenloader' --incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' -+incs += ' ../../windowmanager #intern/guardedalloc ' - defs = [] - cf = [] - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): -diff -up blender-2.58/source/blender/python/SConscript.ext blender-2.58/source/blender/python/SConscript ---- blender-2.58/source/blender/python/SConscript.ext 2011-06-22 17:22:25.000000000 +0200 -+++ blender-2.58/source/blender/python/SConscript 2011-06-27 17:35:43.528649610 +0200 -@@ -6,7 +6,7 @@ Import ('env') - - incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' - incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' --incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' -+incs += ' #intern/guardedalloc #intern/memutil ' - incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] - - is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']) -diff -up blender-2.58/source/gameengine/BlenderRoutines/SConscript.ext blender-2.58/source/gameengine/BlenderRoutines/SConscript ---- blender-2.58/source/gameengine/BlenderRoutines/SConscript.ext 2011-06-22 17:20:18.000000000 +0200 -+++ blender-2.58/source/gameengine/BlenderRoutines/SConscript 2011-06-27 17:35:43.529649610 +0200 -@@ -19,7 +19,7 @@ incs += ' #source/gameengine/SceneGraph - incs += ' #source/gameengine/Physics/Bullet' - incs += ' #source/gameengine/Network/LoopBackNetwork' - incs += ' #source/blender/misc #source/blender/blenloader' --incs += ' #extern/glew/include #source/blender/gpu' -+incs += ' #source/blender/gpu' - incs += ' #source/blender/windowmanager' - - if env['WITH_BF_FFMPEG']: -diff -up blender-2.58/source/gameengine/GamePlayer/common/SConscript.ext blender-2.58/source/gameengine/GamePlayer/common/SConscript ---- blender-2.58/source/gameengine/GamePlayer/common/SConscript.ext 2011-06-22 17:20:37.000000000 +0200 -+++ blender-2.58/source/gameengine/GamePlayer/common/SConscript 2011-06-27 17:40:42.061649853 +0200 -@@ -43,7 +43,7 @@ incs = ['.', - '#source/blender/misc', - '#source/blender/blenloader', - '#source/blender/gpu', -- '#extern/glew/include'] -+ ''] - - defs = [ 'GLEW_STATIC' ] - -diff -up blender-2.58/source/gameengine/GamePlayer/ghost/SConscript.ext blender-2.58/source/gameengine/GamePlayer/ghost/SConscript ---- blender-2.58/source/gameengine/GamePlayer/ghost/SConscript.ext 2011-06-22 17:20:20.000000000 +0200 -+++ blender-2.58/source/gameengine/GamePlayer/ghost/SConscript 2011-06-27 17:35:43.530649610 +0200 -@@ -38,7 +38,7 @@ incs = ['.', - '#source/blender/misc', - '#source/blender/blenloader', - '#source/blender/gpu', -- '#extern/glew/include'] -+ ''] - - defs = [ 'GLEW_STATIC' ] - -diff -up blender-2.58/source/gameengine/Ketsji/SConscript.ext blender-2.58/source/gameengine/Ketsji/SConscript ---- blender-2.58/source/gameengine/Ketsji/SConscript.ext 2011-06-22 17:21:20.000000000 +0200 -+++ blender-2.58/source/gameengine/Ketsji/SConscript 2011-06-27 17:35:43.530649610 +0200 -@@ -18,7 +18,7 @@ incs += ' #source/blender/makesdna #sour - incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' - incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' - incs += ' #source/gameengine/Physics/Dummy' --incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' -+incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu' - - incs += ' ' + env['BF_BULLET_INC'] - incs += ' ' + env['BF_OPENGL_INC'] -diff -up blender-2.58/source/gameengine/Physics/Bullet/SConscript.ext blender-2.58/source/gameengine/Physics/Bullet/SConscript ---- blender-2.58/source/gameengine/Physics/Bullet/SConscript.ext 2011-06-22 17:20:13.000000000 +0200 -+++ blender-2.58/source/gameengine/Physics/Bullet/SConscript 2011-06-27 17:35:43.531649610 +0200 -@@ -6,7 +6,6 @@ sources = 'CcdPhysicsEnvironment.cpp Ccd - incs = '. ../common' - incs += ' #intern/string' - incs += ' #intern/moto/include' --incs += ' #extern/glew/include' - incs += ' #source/gameengine/Rasterizer' - incs += ' #source/gameengine/Ketsji' - incs += ' #source/gameengine/Expressions' -diff -up blender-2.58/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext blender-2.58/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript ---- blender-2.58/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext 2011-06-22 17:21:26.000000000 +0200 -+++ blender-2.58/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2011-06-27 17:42:33.644649569 +0200 -@@ -6,7 +6,7 @@ sources = env.Glob('*.cpp') - defs = [ 'GLEW_STATIC' ] - - incs = '. #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines ' --incs += ' #intern/container #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC'] -+incs += ' #intern/container #source/blender/gpu ' + env['BF_OPENGL_INC'] - incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel' - incs += ' #intern/guardedalloc #source/blender/blenlib #source/gameengine/BlenderRoutines' - -diff -up blender-2.58/source/gameengine/Rasterizer/SConscript.ext blender-2.58/source/gameengine/Rasterizer/SConscript ---- blender-2.58/source/gameengine/Rasterizer/SConscript.ext 2011-06-22 17:21:28.000000000 +0200 -+++ blender-2.58/source/gameengine/Rasterizer/SConscript 2011-06-27 17:42:02.847656829 +0200 -@@ -4,7 +4,7 @@ Import ('env') - sources = env.Glob('*.cpp') - - --incs = '. #intern/guardedalloc #intern/string #intern/moto/include #intern/container #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' -+incs = '. #intern/guardedalloc #intern/string #intern/moto/include #intern/container #source/gameengine/BlenderRoutines #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' - - defs = [ 'GLEW_STATIC' ] - -diff -up blender-2.58/source/gameengine/VideoTexture/SConscript.ext blender-2.58/source/gameengine/VideoTexture/SConscript ---- blender-2.58/source/gameengine/VideoTexture/SConscript.ext 2011-06-22 17:20:57.000000000 +0200 -+++ blender-2.58/source/gameengine/VideoTexture/SConscript 2011-06-27 17:35:43.532649610 +0200 -@@ -12,7 +12,7 @@ incs += ' #source/gameengine/BlenderRout - incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel' - incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic' - incs += ' #source/blender/gpu #intern/string #intern/moto/include' --incs += ' #intern/guardedalloc #intern/container #extern/glew/include' -+incs += ' #intern/guardedalloc #intern/container' - incs += ' #intern/ffmpeg' - - defs = [] diff --git a/blender.spec b/blender.spec index d4b2024..ecef04f 100644 --- a/blender.spec +++ b/blender.spec @@ -9,7 +9,7 @@ Name: blender Epoch: 1 Version: 2.58 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -25,12 +25,8 @@ Source8: blender-2.56.config Source10: macros.blender Patch1: blender-2.44-bid.patch -Patch2: blender-2.58-ext.patch Patch3: blender-2.58-syspath.patch -# Patch taken from Gentoo Bug #364291 -# Patch10: blender-2.57-CVE-2009-3850.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -45,7 +41,7 @@ BuildRequires: libvorbis-devel BuildRequires: freealut-devel BuildRequires: openssl-devel BuildRequires: python3-devel >= 3.2 -BuildRequires: scons +BuildRequires: cmake BuildRequires: SDL-devel BuildRequires: zlib-devel BuildRequires: libtiff-devel @@ -113,47 +109,21 @@ addon packages to extend blender. %prep %setup -q %patch1 -p1 -b .bid -%patch2 -p1 -b .ext %patch3 -p1 -b .syspath -# %patch10 -p1 -b .cve - -# No executable or shared library outside the gettext package is -# supposed to link against libgettextlib or libgettextsrc. -sed -i -e"s,gettextlib,,g" build_files/scons/config/linux2-config.py - -# binreloc is not a part of fedora -rm -rf extern/ffmpeg -rm -rf extern/fftw -rm -rf extern/glew -rm -rf extern/libmp3lame -rm -rf extern/libopenjpeg -rm -rf extern/libredcode -rm -rf extern/ode -rm -rf extern/x264 -rm -rf extern/xvidcore -rm -rf extern/qhull -rm -rf extern/make -rm -rf extern/verse - find -name '.svn' -print | xargs rm -rf -PYVER=$(%{__python3} -c "import sys; print (sys.version[:3])") - -sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ - <%{SOURCE8} >user-config.py - -# No executable or shared library outside the gettext package is -# supposed to link against libgettextlib or libgettextsrc. -sed -i -e"s,gettextlib,,g" user-config.py - %build -scons blenderplayer \ +mkdir cmake-make +cd cmake-make +cmake .. -DWITH_BUILTIN_GLEW=OFF \ %ifnarch %{ix86} x86_64 - WITH_BF_RAYOPTIMIZATION=False \ + -DWITH_RAYOPTIMIZATION=OFF \ %endif - BF_PYTHON_ABI_FLAGS=mu \ - BF_QUIET=0 + -DWITH_PLAYER=ON + +make +cd .. install -d release/plugins/include install -m 644 source/blender/blenpluginapi/*.h release/plugins/include @@ -165,8 +135,8 @@ make -C release/plugins/ %install rm -rf ${RPM_BUILD_ROOT} -install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender -install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer +install -D -m 755 cmake-make/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender +install -D -m 755 cmake-make/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer # # Install miscellanous files to /usr/lib/blender @@ -193,9 +163,6 @@ cp -a release/bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir} cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts -# install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib} -# install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib} - find ${RPM_BUILD_ROOT}%{blenderlib}/scripts -type f -exec sed -i -e 's/\r$//g' {} \; # Install hicolor icons. @@ -276,6 +243,9 @@ fi || : %{_sysconfdir}/rpm/macros.blender %changelog +* Mon Jun 27 2011 Jochen Schmitt 1:2.58-3 +- Migrating to the cmake build system + * Mon Jun 27 2011 Jochen Schmitt 1:2.58-2 - New upstream release