summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/blender/files')
-rw-r--r--media-gfx/blender/files/blender-2.5-bmake.patch15
-rw-r--r--media-gfx/blender/files/blender-2.5-doxyfile.patch11
-rw-r--r--media-gfx/blender/files/blender-2.5-eigen.patch22
-rw-r--r--media-gfx/blender/files/blender-2.5-ffmpeg.patch107
-rw-r--r--media-gfx/blender/files/blender-2.5-glew.patch25
-rw-r--r--media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch24
-rw-r--r--media-gfx/blender/files/blender-desktop.patch20
7 files changed, 224 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.5-bmake.patch b/media-gfx/blender/files/blender-2.5-bmake.patch
new file mode 100644
index 0000000..0fff6d8
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.5-bmake.patch
@@ -0,0 +1,15 @@
+--- release/plugins/bmake 2010-03-21 17:44:20.500741049 +0100
++++ release/plugins/bmake 2010-03-21 17:44:33.659740173 +0100
+@@ -57,10 +57,10 @@
+ LDFLAGS="-Bshareable";
+ elif ( test $UNAME = "Linux" ) then
+ CC="gcc";
+- CFLAGS="-fPIC -funsigned-char -O2";
++# CFLAGS="-fPIC -funsigned-char -O2";
+
+ LD="ld";
+- LDFLAGS="-Bshareable";
++# LDFLAGS="-Bshareable";
+ elif ( test $UNAME = "SunOS" ) then
+ CC="cc";
+ CFLAGS="-O";
diff --git a/media-gfx/blender/files/blender-2.5-doxyfile.patch b/media-gfx/blender/files/blender-2.5-doxyfile.patch
new file mode 100644
index 0000000..aa61c55
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.5-doxyfile.patch
@@ -0,0 +1,11 @@
+--- blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:27:33.975642545 -0300
++++ blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:28:54.913642574 -0300
+@@ -42,7 +42,7 @@
+ # exceed 55 pixels and the maximum width should not exceed 200 pixels.
+ # Doxygen will copy the logo to the output directory.
+
+-PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png
++PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png
+
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+ # base path where the generated documentation will be put.
diff --git a/media-gfx/blender/files/blender-2.5-eigen.patch b/media-gfx/blender/files/blender-2.5-eigen.patch
new file mode 100644
index 0000000..41f55ec
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.5-eigen.patch
@@ -0,0 +1,22 @@
+--- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200
++++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200
+@@ -5,7 +5,8 @@
+ sources += env.Glob('kdl/*.cpp')
+ sources += env.Glob('kdl/utilities/*.cpp')
+
+-incs = '. ../../extern/Eigen2'
++#incs = '. ../../extern/Eigen2'
++incs = '. /usr/include/eigen2'
+
+ env.BlenderLib ('bf_ITASC', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
+
+--- source/blender/ikplugin/SConscript
++++ source/blender/ikplugin/SConscript
+@@ -4,6 +4,6 @@
+ sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
+
+ incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
+-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
++incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
+
+ env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
diff --git a/media-gfx/blender/files/blender-2.5-ffmpeg.patch b/media-gfx/blender/files/blender-2.5-ffmpeg.patch
new file mode 100644
index 0000000..f825bcc
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.5-ffmpeg.patch
@@ -0,0 +1,107 @@
+--- source/blender/blenkernel/intern/writeffmpeg.c 2011-06-22 12:23:10.000000000 -0300
++++ source/blender/blenkernel/intern/writeffmpeg.c 2011-07-08 12:24:17.000000000 -0300
+@@ -2,7 +2,7 @@
+ * \ingroup bke
+ */
+ /*
+- * $Id: writeffmpeg.c 36960 2011-05-27 23:33:40Z schlaile $
++ * $Id: writeffmpeg.c 37755 2011-06-23 16:10:48Z campbellbarton $
+ *
+ * ffmpeg-write support
+ *
+@@ -49,7 +49,9 @@
+
+ #include "BLI_blenlib.h"
+
+-#include "AUD_C-API.h" /* must be before BKE_sound.h for define */
++#ifdef WITH_AUDASPACE
++# include "AUD_C-API.h"
++#endif
+
+ #include "BKE_global.h"
+ #include "BKE_idprop.h"
+@@ -89,7 +91,9 @@
+ static int audio_outbuf_size = 0;
+ static double audio_time = 0.0f;
+
++#ifdef WITH_AUDASPACE
+ static AUD_Device* audio_mixdown_device = 0;
++#endif
+
+ #define FFMPEG_AUTOSPLIT_SIZE 2000000000
+
+@@ -103,6 +107,7 @@
+ }
+ }
+
++#ifdef WITH_AUDASPACE
+ static int write_audio_frame(void)
+ {
+ AVCodecContext* c = NULL;
+@@ -145,6 +150,7 @@
+ }
+ return 0;
+ }
++#endif // #ifdef WITH_AUDASPACE
+
+ /* Allocate a temporary frame */
+ static AVFrame* alloc_picture(int pix_fmt, int width, int height)
+@@ -851,7 +857,7 @@
+ ffmpeg_autosplit_count = 0;
+
+ success = start_ffmpeg_impl(rd, rectx, recty, reports);
+-
++#ifdef WITH_AUDASPACE
+ if(audio_stream)
+ {
+ AVCodecContext* c = audio_stream->codec;
+@@ -861,12 +867,13 @@
+ specs.rate = rd->ffcodecdata.audio_mixrate;
+ audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra, rd->ffcodecdata.audio_volume);
+ }
+-
++#endif
+ return success;
+ }
+
+ void end_ffmpeg(void);
+
++#ifdef WITH_AUDASPACE
+ static void write_audio_frames(double to_pts)
+ {
+ int finished = 0;
+@@ -878,6 +885,7 @@
+ }
+ }
+ }
++#endif
+
+ int append_ffmpeg(RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports)
+ {
+@@ -905,8 +913,9 @@
+ }
+ }
+
++#ifdef WITH_AUDASPACE
+ write_audio_frames((frame - rd->sfra) / (((double)rd->frs_sec) / rd->frs_sec_base));
+-
++#endif
+ return success;
+ }
+
+@@ -920,12 +929,14 @@
+ write_audio_frames();
+ }*/
+
++#ifdef WITH_AUDASPACE
+ if(audio_mixdown_device)
+ {
+ AUD_closeReadDevice(audio_mixdown_device);
+ audio_mixdown_device = 0;
+ }
+-
++#endif
++
+ if (video_stream && video_stream->codec) {
+ fprintf(stderr, "Flushing delayed frames...\n");
+ flush_ffmpeg ();
diff --git a/media-gfx/blender/files/blender-2.5-glew.patch b/media-gfx/blender/files/blender-2.5-glew.patch
new file mode 100644
index 0000000..e70f887
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.5-glew.patch
@@ -0,0 +1,25 @@
+--- extern/SConscript
++++ extern/SConscript
+@@ -2,8 +2,6 @@
+
+ Import('env')
+
+-SConscript(['glew/SConscript'])
+-
+ if env['WITH_BF_ELTOPO']:
+ SConscript(['eltopo/SConscript'])
+
+ if env['WITH_BF_BULLET']:
+ SConscript(['bullet2/src/SConscript'])
+
+--- source/blender/editors/include/BIF_gl.h
++++ source/blender/editors/include/BIF_gl.h
+@@ -31,7 +31,7 @@
+ #ifndef BIF_GL_H
+ #define BIF_GL_H
+
+-#include "GL/glew.h"
++#include <GL/glew.h>
+
+ /*
+ * these should be phased out. cpack should be replaced in
diff --git a/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch b/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch
new file mode 100644
index 0000000..37680b6
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.59-r1-opencollada-fixes.patch
@@ -0,0 +1,24 @@
+diff -urN /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//build_files/scons/tools/Blender.py /tmp/blender-2.59//build_files/scons/tools/Blender.py
+--- /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//build_files/scons/tools/Blender.py 2011-08-11 18:47:18.000000000 +0200
++++ /tmp/blender-2.59//build_files/scons/tools/Blender.py 2011-10-18 10:52:39.340067631 +0200
+@@ -268,7 +268,7 @@
+ syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
+ else:
+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+- syslibs.append(lenv['BF_EXPAT_LIB'])
++ syslibs.append('xml2')
+
+ if not lenv['WITH_BF_STATICLIBSAMPLERATE']:
+ syslibs += Split(lenv['BF_LIBSAMPLERATE_LIB'])
+diff -urN /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//source/blender/collada/SConscript /tmp/blender-2.59//source/blender/collada/SConscript
+--- /var/tmp/portage/media-gfx/blender-2.59-r1/work/blender-2.59//source/blender/collada/SConscript 2011-08-11 18:44:01.000000000 +0200
++++ /tmp/blender-2.59//source/blender/collada/SConscript 2011-10-18 10:53:20.775067619 +0200
+@@ -35,7 +35,7 @@
+ if env['OURPLATFORM']=='darwin':
+ incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+ else:
+- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
++ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+
+ if env['BF_BUILDINFO']:
+ defs.append('NAN_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-desktop.patch b/media-gfx/blender/files/blender-desktop.patch
new file mode 100644
index 0000000..50ad8c2
--- /dev/null
+++ b/media-gfx/blender/files/blender-desktop.patch
@@ -0,0 +1,20 @@
+--- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
++++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=Blender
++Name=Blender-2.5
+ GenericName=3D modeller
+ GenericName[es]=modelador 3D
+ GenericName[de]=3D Modellierer
+@@ -7,8 +7,8 @@
+ GenericName[ru]=Редактор 3D-моделей
+ Comment=3D modeling, animation, rendering and post-production
+ Comment[es]=modelado 3D, animación, renderizado y post-producción
+-Exec=blender
+-Icon=blender
++Exec=blender-2.5
++Icon=blender-2.5
+ Terminal=false
+ Type=Application
+ Categories=Graphics;3DGraphics;