summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/blender/files')
-rw-r--r--media-gfx/blender/files/blender-2.57-bmake.patch15
-rw-r--r--media-gfx/blender/files/blender-2.57-desktop.patch20
-rw-r--r--media-gfx/blender/files/blender-2.57-doxygen.patch33
-rw-r--r--media-gfx/blender/files/blender-2.57-eigen.patch22
-rw-r--r--media-gfx/blender/files/blender-2.57-enable_site_module.patch32
-rw-r--r--media-gfx/blender/files/blender-2.57-glew.patch22
-rw-r--r--media-gfx/blender/files/blender-2.57-insecure.desktop15
-rw-r--r--media-gfx/blender/files/blender-2.57-libav-0.7.patch296
-rw-r--r--media-gfx/blender/files/blender-2.57-linux-3.patch12
-rw-r--r--media-gfx/blender/files/blender-2.60a-collada.patch11
-rw-r--r--media-gfx/blender/files/blender.desktop9
-rw-r--r--media-gfx/blender/files/blender.pngbin2119 -> 0 bytes
12 files changed, 0 insertions, 487 deletions
diff --git a/media-gfx/blender/files/blender-2.57-bmake.patch b/media-gfx/blender/files/blender-2.57-bmake.patch
deleted file mode 100644
index b78d5a4..0000000
--- a/media-gfx/blender/files/blender-2.57-bmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.57-desktop.patch b/media-gfx/blender/files/blender-2.57-desktop.patch
deleted file mode 100644
index 6a40e3b..0000000
--- a/media-gfx/blender/files/blender-2.57-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.5x
- 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.svg
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.57-doxygen.patch b/media-gfx/blender/files/blender-2.57-doxygen.patch
deleted file mode 100644
index 335b289..0000000
--- a/media-gfx/blender/files/blender-2.57-doxygen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- doc/doxygen/Doxyfile 2011-02-19 18:51:40.216999981 +0100
-+++ doc/doxygen/Doxyfile 2011-02-19 18:57:46.628999965 +0100
-@@ -559,26 +559,26 @@
- # The QUIET tag can be used to turn on/off the messages that are generated
- # by doxygen. Possible values are YES and NO. If left blank NO is used.
-
--QUIET = NO
-+QUIET = YES
-
- # The WARNINGS tag can be used to turn on/off the warning messages that are
- # generated by doxygen. Possible values are YES and NO. If left blank
- # NO is used.
-
--WARNINGS = YES
-+WARNINGS = NO
-
- # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
- # for undocumented members. If EXTRACT_ALL is set to YES then this flag will
- # automatically be disabled.
-
--WARN_IF_UNDOCUMENTED = YES
-+WARN_IF_UNDOCUMENTED = NO
-
- # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
- # potential errors in the documentation, such as not documenting some
- # parameters in a documented function, or documenting parameters that
- # don't exist or using markup commands wrongly.
-
--WARN_IF_DOC_ERROR = YES
-+WARN_IF_DOC_ERROR = NO
-
- # The WARN_NO_PARAMDOC option can be enabled to get warnings for
- # functions that are documented, but have no documentation for their parameters
diff --git a/media-gfx/blender/files/blender-2.57-eigen.patch b/media-gfx/blender/files/blender-2.57-eigen.patch
deleted file mode 100644
index 91d8af4..0000000
--- a/media-gfx/blender/files/blender-2.57-eigen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.57-enable_site_module.patch b/media-gfx/blender/files/blender-2.57-enable_site_module.patch
deleted file mode 100644
index c38be79..0000000
--- a/media-gfx/blender/files/blender-2.57-enable_site_module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/blender/python/intern/bpy_interface.c
-+++ source/blender/python/intern/bpy_interface.c
-@@ -244,11 +244,6 @@
-
- bpy_python_start_path(); /* allow to use our own included python */
-
-- /* Python 3.2 now looks for '2.57/python/include/python3.2d/pyconfig.h' to parse
-- * from the 'sysconfig' module which is used by 'site', so for now disable site.
-- * alternatively we could copy the file. */
-- Py_NoSiteFlag= 1;
--
- Py_Initialize();
-
- // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
---- source/gameengine/Ketsji/KX_PythonInit.cpp
-+++ source/gameengine/Ketsji/KX_PythonInit.cpp
-@@ -1773,7 +1773,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- /* must run before python initializes */
-@@ -1843,7 +1842,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.57-glew.patch b/media-gfx/blender/files/blender-2.57-glew.patch
deleted file mode 100644
index 5e63c7c..0000000
--- a/media-gfx/blender/files/blender-2.57-glew.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- extern/SConscript
-+++ extern/SConscript
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['glew/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.57-insecure.desktop b/media-gfx/blender/files/blender-2.57-insecure.desktop
deleted file mode 100644
index e427957..0000000
--- a/media-gfx/blender/files/blender-2.57-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender 2.5x (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.5 --enable-autoexec
-Icon=blender-2.5.svg
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.57-libav-0.7.patch b/media-gfx/blender/files/blender-2.57-libav-0.7.patch
deleted file mode 100644
index 7b4ca47..0000000
--- a/media-gfx/blender/files/blender-2.57-libav-0.7.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -burN blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-04-14 17:06:35.000000000 +0200
-+++ blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-04 01:44:30.184004582 +0200
-@@ -64,15 +64,10 @@
-
- // read samples from the packet
- data_size = buf_size - buf_pos;
-- /*read_length = avcodec_decode_audio3(m_codecCtx,
-+ read_length = avcodec_decode_audio3(m_codecCtx,
- (int16_t*)(((data_t*)buffer.getBuffer())+buf_pos),
- &data_size,
-- packet);*/
-- read_length = avcodec_decode_audio2(m_codecCtx,
-- (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos),
-- &data_size,
-- audio_pkg_data,
-- audio_pkg_size);
-+ packet);
-
- // read error, next packet!
- if(read_length < 0)
-@@ -112,7 +107,7 @@
-
- for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
- {
-- if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+ if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
- && (m_stream < 0))
- {
- m_stream=i;
-diff -burN blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c 2011-04-14 17:17:03.000000000 +0200
-+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c 2011-05-04 03:36:08.365219076 +0200
-@@ -163,7 +163,7 @@
- }
-
- pkt.stream_index = audio_stream->index;
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- if (av_interleaved_write_frame(outfile, &pkt) != 0) {
- fprintf(stderr, "Error writing audio packet!\n");
- return -1;
-@@ -290,7 +290,7 @@
- fprintf(stderr, "Video Frame PTS: not set\n");
- }
- if (c->coded_frame->key_frame)
-- packet.flags |= PKT_FLAG_KEY;
-+ packet.flags |= AV_PKT_FLAG_KEY;
- packet.stream_index = video_stream->index;
- packet.data = video_buffer;
- packet.size = outsize;
-@@ -396,7 +396,7 @@
- switch(prop->type) {
- case IDP_STRING:
- fprintf(stderr, "%s.\n", IDP_String(prop));
-- rv = av_set_string(c, prop->name, IDP_String(prop));
-+ av_set_string3(c, prop->name, IDP_String(prop), 0, &rv);
- break;
- case IDP_FLOAT:
- fprintf(stderr, "%g.\n", IDP_Float(prop));
-@@ -407,7 +407,7 @@
-
- if (param) {
- if (IDP_Int(prop)) {
-- rv = av_set_string(c, name, param);
-+ av_set_string3(c, name, param, 0, &rv);
- } else {
- return;
- }
-@@ -461,7 +461,7 @@
-
- c = get_codec_from_stream(st);
- c->codec_id = codec_id;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
-
-
- /* Get some values from the current render settings */
-@@ -519,7 +519,7 @@
- c->pix_fmt = PIX_FMT_YUV422P;
- }
-
-- if (codec_id == CODEC_ID_XVID) {
-+ if (codec_id == CODEC_ID_MPEG4) {
- /* arghhhh ... */
- c->pix_fmt = PIX_FMT_YUV420P;
- c->codec_tag = (('D'<<24) + ('I'<<16) + ('V'<<8) + 'X');
-@@ -588,7 +588,7 @@
-
- c = get_codec_from_stream(st);
- c->codec_id = codec_id;
-- c->codec_type = CODEC_TYPE_AUDIO;
-+ c->codec_type = AVMEDIA_TYPE_AUDIO;
-
- c->sample_rate = rd->ffcodecdata.audio_mixrate;
- c->bit_rate = ffmpeg_audio_bitrate*1000;
-@@ -666,13 +666,13 @@
- BKE_report(reports, RPT_ERROR, "No valid formats found.");
- return 0;
- }
-- fmt = guess_format(NULL, exts[0], NULL);
-+ fmt = av_guess_format(NULL, exts[0], NULL);
- if (!fmt) {
- BKE_report(reports, RPT_ERROR, "No valid formats found.");
- return 0;
- }
-
-- of = av_alloc_format_context();
-+ of = avformat_alloc_context();
- if (!of) {
- BKE_report(reports, RPT_ERROR, "Error opening output file");
- return 0;
-@@ -713,7 +713,7 @@
- fmt->video_codec = CODEC_ID_H264;
- break;
- case FFMPEG_XVID:
-- fmt->video_codec = CODEC_ID_XVID;
-+ fmt->video_codec = CODEC_ID_MPEG4;
- break;
- case FFMPEG_FLV:
- fmt->video_codec = CODEC_ID_FLV1;
-@@ -834,7 +834,7 @@
- fprintf(stderr, "Video Frame PTS: not set\n");
- }
- if (c->coded_frame->key_frame) {
-- packet.flags |= PKT_FLAG_KEY;
-+ packet.flags |= AV_PKT_FLAG_KEY;
- }
- packet.stream_index = video_stream->index;
- packet.data = video_buffer;
-@@ -1314,7 +1314,7 @@
- case FFMPEG_PRESET_XVID:
- if(preset == FFMPEG_PRESET_XVID) {
- rd->ffcodecdata.type = FFMPEG_AVI;
-- rd->ffcodecdata.codec = CODEC_ID_XVID;
-+ rd->ffcodecdata.codec = CODEC_ID_MPEG4;
- }
- else if(preset == FFMPEG_PRESET_THEORA) {
- rd->ffcodecdata.type = FFMPEG_OGG; // XXX broken
-@@ -1357,7 +1357,7 @@
- }
- }
- else if(rd->imtype == R_XVID) {
-- if(rd->ffcodecdata.codec != CODEC_ID_XVID) {
-+ if(rd->ffcodecdata.codec != CODEC_ID_MPEG4) {
- ffmpeg_set_preset(rd, FFMPEG_PRESET_XVID);
- audio= 1;
- }
-diff -burN blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c blender-2.57/source/blender/imbuf/intern/anim_movie.c
---- blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c 2011-04-14 17:19:18.000000000 +0200
-+++ blender-2.57/source/blender/imbuf/intern/anim_movie.c 2011-05-04 03:33:56.724566283 +0200
-@@ -566,7 +566,7 @@
- videoStream=-1;
- for(i=0; i<pFormatCtx->nb_streams; i++)
- if(get_codec_from_stream(pFormatCtx->streams[i])->codec_type
-- == CODEC_TYPE_VIDEO) {
-+ == AVMEDIA_TYPE_VIDEO) {
- videoStream=i;
- break;
- }
-@@ -830,10 +830,10 @@
- && position - (anim->curposition + 1) < anim->preseek) {
- while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- if (packet.stream_index == anim->videoStream) {
-- avcodec_decode_video(
-+ avcodec_decode_video2(
- anim->pCodecCtx,
- anim->pFrame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
-
- if (frameFinished) {
- anim->curposition++;
-@@ -915,9 +915,9 @@
-
- while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- if(packet.stream_index == anim->videoStream) {
-- avcodec_decode_video(anim->pCodecCtx,
-+ avcodec_decode_video2(anim->pCodecCtx,
- anim->pFrame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
-
- if (seek_by_bytes && preseek_count > 0) {
- preseek_count--;
-diff -burN blender-2.57.orig//source/blender/imbuf/intern/util.c blender-2.57/source/blender/imbuf/intern/util.c
---- blender-2.57.orig//source/blender/imbuf/intern/util.c 2011-04-14 17:19:18.000000000 +0200
-+++ blender-2.57/source/blender/imbuf/intern/util.c 2011-05-04 02:15:26.369208909 +0200
-@@ -292,7 +292,7 @@
- for(i=0; i<pFormatCtx->nb_streams; i++)
- if(pFormatCtx->streams[i] &&
- get_codec_from_stream(pFormatCtx->streams[i]) &&
-- (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+ (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- {
- videoStream=i;
- break;
-diff -burN blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c blender-2.57/source/blender/makesrna/intern/rna_scene.c
---- blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c 2011-04-14 17:18:53.000000000 +0200
-+++ blender-2.57/source/blender/makesrna/intern/rna_scene.c 2011-05-04 02:19:10.326319453 +0200
-@@ -2135,7 +2135,7 @@
- {CODEC_ID_HUFFYUV, "HUFFYUV", 0, "HuffYUV", ""},
- {CODEC_ID_DVVIDEO, "DV", 0, "DV", ""},
- {CODEC_ID_H264, "H264", 0, "H.264", ""},
-- {CODEC_ID_XVID, "XVID", 0, "Xvid", ""},
-+ {CODEC_ID_MPEG4, "XVID", 0, "Xvid", ""},
- {CODEC_ID_THEORA, "THEORA", 0, "Theora", ""},
- {CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""},
- {CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""},
-diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-04-14 17:13:34.000000000 +0200
-+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-04 02:49:31.147348425 +0200
-@@ -182,7 +182,7 @@
- {
- if(formatCtx->streams[i] &&
- get_codec_from_stream(formatCtx->streams[i]) &&
-- (get_codec_from_stream(formatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+ (get_codec_from_stream(formatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- {
- videoStream=i;
- break;
-@@ -368,9 +368,9 @@
- BLI_remlink(&video->m_packetCacheBase, cachePacket);
- // use m_frame because when caching, it is not used in main thread
- // we can't use currentFrame directly because we need to convert to RGB first
-- avcodec_decode_video(video->m_codecCtx,
-+ avcodec_decode_video2(video->m_codecCtx,
- video->m_frame, &frameFinished,
-- cachePacket->packet.data, cachePacket->packet.size);
-+ &cachePacket->packet);
- if(frameFinished)
- {
- AVFrame * input = video->m_frame;
-@@ -641,7 +641,7 @@
- if (m_captRate <= 0.f)
- m_captRate = defFrameRate;
- sprintf(rateStr, "%f", m_captRate);
-- av_parse_video_frame_rate(&frameRate, rateStr);
-+ av_parse_video_rate(&frameRate, rateStr);
- // populate format parameters
- // need to specify the time base = inverse of rate
- formatParams.time_base.num = frameRate.den;
-@@ -924,10 +924,10 @@
- {
- if (packet.stream_index == m_videoStream)
- {
-- avcodec_decode_video(
-+ avcodec_decode_video2(
- m_codecCtx,
- m_frame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
- if (frameFinished)
- {
- m_curPosition = (long)((packet.dts-startTs) * (m_baseFrameRate*timeBase) + 0.5);
-@@ -999,9 +999,9 @@
- {
- if(packet.stream_index == m_videoStream)
- {
-- avcodec_decode_video(m_codecCtx,
-+ avcodec_decode_video2(m_codecCtx,
- m_frame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
- // remember dts to compute exact frame number
- dts = packet.dts;
- if (frameFinished && !posFound)
-diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h 2011-04-14 17:13:34.000000000 +0200
-+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h 2011-05-04 03:11:53.106002831 +0200
-@@ -34,6 +34,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/parseutils.h>
- #include <libswscale/swscale.h>
- #include "DNA_listBase.h"
- #include "BLI_threads.h"
-diff -burN blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c /var/tmp/portage/media-gfx/blender-2.57-r1/work/blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c 2011-11-07 13:17:59.001736099 -0800
-+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c 2011-11-07 13:18:35.726734562 -0800
-@@ -1101,12 +1101,12 @@
- switch (o->type) {
- case FF_OPT_TYPE_INT:
- case FF_OPT_TYPE_INT64:
-- val.i = o->default_val;
-+ val.i = o->default_val.dbl;
- idp_type = IDP_INT;
- break;
- case FF_OPT_TYPE_DOUBLE:
- case FF_OPT_TYPE_FLOAT:
-- val.f = o->default_val;
-+ val.f = o->default_val.dbl;
- idp_type = IDP_FLOAT;
- break;
- case FF_OPT_TYPE_STRING:
diff --git a/media-gfx/blender/files/blender-2.57-linux-3.patch b/media-gfx/blender/files/blender-2.57-linux-3.patch
deleted file mode 100644
index 6a96b49..0000000
--- a/media-gfx/blender/files/blender-2.57-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct 2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct 2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
-
-+if platform == 'linux3':
-+ platform = 'linux2' # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
-
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.60a-collada.patch b/media-gfx/blender/files/blender-2.60a-collada.patch
deleted file mode 100644
index 980b640..0000000
--- a/media-gfx/blender/files/blender-2.60a-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100
-@@ -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('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender.desktop b/media-gfx/blender/files/blender.desktop
deleted file mode 100644
index 14cef34..0000000
--- a/media-gfx/blender/files/blender.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender 2.4x
-Comment=3D modeling, animation, rendering and post-production.
-Exec=blender
-Icon=blender
-Terminal=0
-Type=Application
-Categories=Graphics;Application;
diff --git a/media-gfx/blender/files/blender.png b/media-gfx/blender/files/blender.png
deleted file mode 100644
index 864a97a..0000000
--- a/media-gfx/blender/files/blender.png
+++ /dev/null
Binary files differ