diff options
author | 2012-07-16 00:53:16 +0000 | |
---|---|---|
committer | 2012-07-16 00:53:16 +0000 | |
commit | 8a968bbd95d768de93d9543b69d2152deed856bd (patch) | |
tree | fce3994777d4423f2fd682e6eb06ec715aa4fdc3 /media-gfx/blender/files | |
parent | Version bump with patches from upstream. Attempted to cleanup the ebuild and ... (diff) | |
download | gentoo-2-8a968bbd95d768de93d9543b69d2152deed856bd.tar.gz gentoo-2-8a968bbd95d768de93d9543b69d2152deed856bd.tar.bz2 gentoo-2-8a968bbd95d768de93d9543b69d2152deed856bd.zip |
Cleanup: merge back into single SLOT; remove old versions; move patch files for new version in tarball; avoid using -g0/-w; respect CC/CXX; use pkg_pretend; make sure that there is enough space if building apidocs; fix bug #426692; fix bug #426594; fix bug #426576; make bug #409673 obsolete; add debug USE flag (instead of checking for -g); avoid messing with jobs.
(Portage version: 2.2.0_alpha117/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/blender/files')
40 files changed, 0 insertions, 3563 deletions
diff --git a/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch b/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch deleted file mode 100644 index c45a811e6283..000000000000 --- a/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up blender/source/blender/blenkernel/intern/blender.c.cve blender/source/blender/blenkernel/intern/blender.c ---- blender/source/blender/blenkernel/intern/blender.c.cve 2008-05-07 17:37:52.000000000 +0200 -+++ blender/source/blender/blenkernel/intern/blender.c 2008-05-07 17:38:22.000000000 +0200 -@@ -716,7 +716,7 @@ void BKE_undo_save_quit(void) - - BLI_make_file_string("/", str, btempdir, "quit.blend"); - -- file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); -+ file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL, 0666); - if(file == -1) { - error("Unable to save %s, check you have permissions", str); - return; diff --git a/media-gfx/blender/files/blender-2.46-ffmpeg.patch b/media-gfx/blender/files/blender-2.46-ffmpeg.patch deleted file mode 100644 index b06854c7e57f..000000000000 --- a/media-gfx/blender/files/blender-2.46-ffmpeg.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -urN blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c ---- blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c 2008-05-20 12:02:12.000000000 +0200 -+++ blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c 2008-05-19 16:38:16.000000000 +0200 -@@ -29,11 +29,11 @@ - - #include <stdlib.h> - -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> -+#include <libswscale/swscale.h> -+#include <libavcodec/opt.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> --#include <ffmpeg/swscale.h> --#include <ffmpeg/opt.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -urN blender-2.46/source/blender/imbuf/intern/anim.c blender-2.46.orig/source/blender/imbuf/intern/anim.c ---- blender-2.46/source/blender/imbuf/intern/anim.c 2008-05-20 12:05:41.000000000 +0200 -+++ blender-2.46.orig/source/blender/imbuf/intern/anim.c 2008-05-19 16:38:41.000000000 +0200 -@@ -83,10 +83,10 @@ - #include "IMB_anim5.h" - - #ifdef WITH_FFMPEG -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> -+#include <libswscale/swscale.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> --#include <ffmpeg/swscale.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -urN blender-2.46/source/blender/imbuf/intern/IMB_anim.h blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h ---- blender-2.46/source/blender/imbuf/intern/IMB_anim.h 2008-05-20 12:04:33.000000000 +0200 -+++ blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h 2008-05-19 16:38:41.000000000 +0200 -@@ -76,9 +76,9 @@ - #endif /* WITH_QUICKTIME */ - - #ifdef WITH_FFMPEG -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libswscale/swscale.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/swscale.h> - #endif - - #include "IMB_imbuf_types.h" -diff -urN blender-2.46/source/blender/imbuf/intern/util.c blender-2.46.orig/source/blender/imbuf/intern/util.c ---- blender-2.46/source/blender/imbuf/intern/util.c 2008-05-20 12:05:04.000000000 +0200 -+++ blender-2.46.orig/source/blender/imbuf/intern/util.c 2008-05-19 16:38:41.000000000 +0200 -@@ -62,8 +62,8 @@ - #endif - - #ifdef WITH_FFMPEG -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -urN blender-2.46/source/blender/src/buttons_scene.c blender-2.46.orig/source/blender/src/buttons_scene.c ---- blender-2.46/source/blender/src/buttons_scene.c 2008-05-20 12:03:50.000000000 +0200 -+++ blender-2.46.orig/source/blender/src/buttons_scene.c 2008-05-19 16:38:39.000000000 +0200 -@@ -108,9 +108,9 @@ - - #ifdef WITH_FFMPEG - -+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ -+#include <libavformat/avformat.h> -+#include <libavcodec/opt.h> --#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ --#include <ffmpeg/avformat.h> --#include <ffmpeg/opt.h> - - static int ffmpeg_preset_sel = 0; - -diff -urN blender-2.46/source/blender/src/hddaudio.c blender-2.46.orig/source/blender/src/hddaudio.c ---- blender-2.46/source/blender/src/hddaudio.c 2008-05-20 12:02:42.000000000 +0200 -+++ blender-2.46.orig/source/blender/src/hddaudio.c 2008-05-19 16:38:39.000000000 +0200 -@@ -33,9 +33,9 @@ - #endif - - #ifdef WITH_FFMPEG -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 - #else diff --git a/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch deleted file mode 100644 index 93ae633d7501..000000000000 --- a/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: blender-2.47/source/blender/src/hddaudio.c -=================================================================== ---- blender-2.47.orig/source/blender/src/hddaudio.c -+++ blender-2.47/source/blender/src/hddaudio.c -@@ -302,7 +302,8 @@ static void sound_hdaudio_extract_small_ - audio_pkt_size = packet.size; - - while (audio_pkt_size > 0) { -- len = avcodec_decode_audio( -+ data_size= AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ len = avcodec_decode_audio2( - hdaudio->pCodecCtx, - hdaudio->decode_cache - + decode_pos, -@@ -469,7 +470,8 @@ static void sound_hdaudio_extract_small_ - } - - while (audio_pkt_size > 0) { -- len = avcodec_decode_audio( -+ data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ len = avcodec_decode_audio2( - hdaudio->pCodecCtx, - hdaudio->decode_cache - + decode_pos, - diff --git a/media-gfx/blender/files/blender-2.49a-bake.patch b/media-gfx/blender/files/blender-2.49a-bake.patch deleted file mode 100644 index 53674da3f4a2..000000000000 --- a/media-gfx/blender/files/blender-2.49a-bake.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: source/blender/render/intern/source/rendercore.c -=================================================================== ---- source/blender/render/intern/source/rendercore.c (revision 21781) -+++ source/blender/render/intern/source/rendercore.c (working copy) -@@ -2241,7 +2241,7 @@ - /* no direction checking for now, doesn't always improve the result - * (INPR(shi->facenor, bs->dir) > 0.0f); */ - -- return (R.objectinstance[ob].obr->ob != bs->actob); -+ return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob != bs->actob); - } - - static int bake_intersect_tree(RayTree* raytree, Isect* isect, float *start, float *dir, float sign, float *hitco, float *dist) diff --git a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch deleted file mode 100644 index 9cf17a5b7c2e..000000000000 --- a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 072e11130a2f96642972b0d4ac7ad2a9cd19fbf2 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 20 Apr 2011 16:42:17 +0200 -Subject: [PATCH] Flip default of "Auto Run Python Scripts" to disabled - (CVE-2009-3850) - -Manual overriding through new parameter -666 is supported ---- - source/blender/blenkernel/intern/blender.c | 11 ++++++++++- - source/blender/python/api2_2x/sceneRender.c | 3 ++- - source/creator/creator.c | 14 ++++++++++---- - 3 files changed, 22 insertions(+), 6 deletions(-) - -diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c -index bf208c8..029b7cf 100644 ---- a/source/blender/blenkernel/intern/blender.c -+++ b/source/blender/blenkernel/intern/blender.c -@@ -388,7 +388,16 @@ static void setup_app_data(BlendFileData *bfd, char *filename) - if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG; - else bfd->globalf &= ~G_DEBUG; - -- if ((U.flag & USER_DONT_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS; -+ if (G.f & G_DOSCRIPTLINKS) { -+ /* Blender running in -666 mode */ -+ /* NOTE: In background mode U.flag has not been initialized from ~/.B.blend */ -+ if (! G.background && (U.flag & USER_DONT_DOSCRIPTLINKS)) -+ /* Prefer disabled "Auto Run Python Scripts" over -666 */ -+ bfd->globalf &= ~G_DOSCRIPTLINKS; -+ } else { -+ /* Blender NOT running in -666 mode, deny pulling G_DOSCRIPTLINKS in */ -+ bfd->globalf &= ~G_DOSCRIPTLINKS; -+ } - - G.f= bfd->globalf; - -diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c -index 1bf2b75..e34a361 100644 ---- a/source/blender/python/api2_2x/sceneRender.c -+++ b/source/blender/python/api2_2x/sceneRender.c -@@ -498,7 +498,8 @@ static PyObject *RenderData_Render( BPy_RenderData * self ) - - RE_BlenderFrame(re, G.scene, G.scene->r.cfra); - -- BPY_do_all_scripts(SCRIPT_POSTRENDER, 0); -+ if (G.f & G_DOSCRIPTLINKS) -+ BPY_do_all_scripts(SCRIPT_POSTRENDER, 0); - - set_scene_bg( oldsce ); - } -diff --git a/source/creator/creator.c b/source/creator/creator.c -index a562fc3..994180d 100644 ---- a/source/creator/creator.c -+++ b/source/creator/creator.c -@@ -232,7 +232,8 @@ static void print_help(void) - printf (" -nojoystick\tDisable joystick support\n"); - printf (" -noglsl\tDisable GLSL shading\n"); - printf (" -h\t\tPrint this help text\n"); -- printf (" -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n"); -+ printf (" -666\t\tEnables automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n"); -+ printf (" -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes) (default)\n"); - printf (" -P <filename>\tRun the given Python script (filename or Blender Text)\n"); - #ifdef WIN32 - printf (" -R\t\tRegister .blend extension\n"); -@@ -366,7 +367,7 @@ int main(int argc, char **argv) - - /* first test for background */ - -- G.f |= G_DOSCRIPTLINKS; /* script links enabled by default */ -+ G.f &= ~G_DOSCRIPTLINKS; /* script links disabled by default */ - - for(a=1; a<argc; a++) { - -@@ -388,6 +389,10 @@ int main(int argc, char **argv) - exit(0); - } - -+ if (!strcmp(argv[a], "-666")){ -+ G.f |= G_DOSCRIPTLINKS; -+ } -+ - /* Handle -* switches */ - else if(argv[a][0] == '-') { - switch(argv[a][1]) { -@@ -405,7 +410,7 @@ int main(int argc, char **argv) - a= argc; - break; - -- case 'y': -+ case 'y': /* NOTE: -y works the exact opposite way in version 2.57! */ - G.f &= ~G_DOSCRIPTLINKS; - break; - -@@ -680,7 +685,8 @@ int main(int argc, char **argv) - #endif - RE_BlenderAnim(re, G.scene, frame, frame, G.scene->frame_step); - #ifndef DISABLE_PYTHON -- BPY_do_all_scripts(SCRIPT_POSTRENDER, 0); -+ if (G.f & G_DOSCRIPTLINKS) -+ BPY_do_all_scripts(SCRIPT_POSTRENDER, 0); - #endif - } - } else { --- -1.7.5.rc1 - diff --git a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch b/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch deleted file mode 100644 index 9c0f39fafad6..000000000000 --- a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch +++ /dev/null @@ -1,105 +0,0 @@ -From dfb6ecd9a4a129b976b7a8d2002e32146125340f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 24 Apr 2011 18:26:47 +0200 -Subject: [PATCH] Disable execution of embedded Python code unless run with - --enable-autoexec|-y|-666 (CVE-2009-3850) - ---- - source/blender/blenkernel/intern/blender.c | 3 ++- - source/blender/makesrna/intern/rna_userdef.c | 9 ++++++--- - source/blender/windowmanager/intern/wm_files.c | 3 ++- - source/creator/creator.c | 10 ++++++---- - 4 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c -index 5f08505..9c27ac7 100644 ---- a/source/blender/blenkernel/intern/blender.c -+++ b/source/blender/blenkernel/intern/blender.c -@@ -141,7 +141,8 @@ void initglobals(void) - G.charmin = 0x0000; - G.charmax = 0xffff; - -- G.f |= G_SCRIPT_AUTOEXEC; -+ G.f &= ~G_SCRIPT_AUTOEXEC; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - } - - /***/ -diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c -index e9a9ddc..a120857 100644 ---- a/source/blender/makesrna/intern/rna_userdef.c -+++ b/source/blender/makesrna/intern/rna_userdef.c -@@ -99,9 +99,12 @@ static void rna_userdef_show_manipulator_update(Main *bmain, Scene *scene, Point - - static void rna_userdef_script_autoexec_update(Main *bmain, Scene *scene, PointerRNA *ptr) - { -- UserDef *userdef = (UserDef*)ptr->data; -- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -- else G.f |= G_SCRIPT_AUTOEXEC; -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ /* Blender run with --enable-autoexec */ -+ UserDef *userdef = (UserDef*)ptr->data; -+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -+ else G.f |= G_SCRIPT_AUTOEXEC; -+ } - } - - static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) -diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c -index f4f7af0..c1bacc6 100644 ---- a/source/blender/windowmanager/intern/wm_files.c -+++ b/source/blender/windowmanager/intern/wm_files.c -@@ -270,7 +270,8 @@ static void wm_init_userdef(bContext *C) - - /* set the python auto-execute setting from user prefs */ - /* enabled by default, unless explicitly enabled in the command line which overrides */ -- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { -+ /* Blender run with --enable-autoexec */ - if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; - else G.f &= ~G_SCRIPT_AUTOEXEC; - } -diff --git a/source/creator/creator.c b/source/creator/creator.c -index c687cc2..1da282f 100644 ---- a/source/creator/creator.c -+++ b/source/creator/creator.c -@@ -278,6 +278,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) - - printf("\n"); - -+ BLI_argsPrintArgDoc(ba, "-666"); - BLI_argsPrintArgDoc(ba, "--enable-autoexec"); - BLI_argsPrintArgDoc(ba, "--disable-autoexec"); - -@@ -359,14 +360,14 @@ static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUS - static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f |= G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ - return 0; - } - - static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f &= ~G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - return 0; - } - -@@ -1075,8 +1076,9 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) - - BLI_argsAdd(ba, 1, "-v", "--version", "\n\tPrint Blender version and exit", print_version, NULL); - -- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution (default)", enable_python, NULL); -- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)", disable_python, NULL); -+ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.49b)", enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution", enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes) (default)", disable_python, NULL); - - BLI_argsAdd(ba, 1, "-b", "--background", "<file>\n\tLoad <file> in background (often used for UI-less rendering)", background_mode, NULL); - --- -1.7.5.rc1 - diff --git a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch b/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch deleted file mode 100644 index 526e0f7f98ae..000000000000 --- a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch +++ /dev/null @@ -1,172 +0,0 @@ -From c4181c5639da5c6a6df31b434498a44d0d680487 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Tue, 17 May 2011 17:37:11 +0200 -Subject: [PATCH] Disable execution of embedded Python code unless run with - --enable-autoexec|-y|-666 (CVE-2009-3850) - ---- - source/blender/blenkernel/intern/blender.c | 3 ++- - source/blender/makesrna/intern/rna_userdef.c | 16 +++++++++++++--- - source/blender/windowmanager/intern/wm_files.c | 7 ++++++- - source/blender/windowmanager/intern/wm_operators.c | 16 ++++++++++++---- - source/creator/creator.c | 10 ++++++---- - 5 files changed, 39 insertions(+), 13 deletions(-) - -diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c -index 5f08505..9c27ac7 100644 ---- a/source/blender/blenkernel/intern/blender.c -+++ b/source/blender/blenkernel/intern/blender.c -@@ -141,7 +141,8 @@ void initglobals(void) - G.charmin = 0x0000; - G.charmax = 0xffff; - -- G.f |= G_SCRIPT_AUTOEXEC; -+ G.f &= ~G_SCRIPT_AUTOEXEC; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - } - - /***/ -diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c -index e9a9ddc..218b50a 100644 ---- a/source/blender/makesrna/intern/rna_userdef.c -+++ b/source/blender/makesrna/intern/rna_userdef.c -@@ -99,9 +99,17 @@ static void rna_userdef_show_manipulator_update(Main *bmain, Scene *scene, Point - - static void rna_userdef_script_autoexec_update(Main *bmain, Scene *scene, PointerRNA *ptr) - { -- UserDef *userdef = (UserDef*)ptr->data; -- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -- else G.f |= G_SCRIPT_AUTOEXEC; -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ /* Blender run with --enable-autoexec */ -+ UserDef *userdef = (UserDef*)ptr->data; -+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -+ else G.f |= G_SCRIPT_AUTOEXEC; -+ } -+} -+ -+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) { -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ return !(G.f & G_SCRIPT_OVERRIDE_PREF); - } - - static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) -@@ -2505,6 +2513,8 @@ static void rna_def_userdef_system(BlenderRNA *brna) - RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_SCRIPT_AUTOEXEC_DISABLE); - RNA_def_property_ui_text(prop, "Auto Run Python Scripts", "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)"); - RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable"); - - prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); -diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c -index f4f7af0..37a9664 100644 ---- a/source/blender/windowmanager/intern/wm_files.c -+++ b/source/blender/windowmanager/intern/wm_files.c -@@ -270,11 +270,16 @@ static void wm_init_userdef(bContext *C) - - /* set the python auto-execute setting from user prefs */ - /* enabled by default, unless explicitly enabled in the command line which overrides */ -- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { -+ /* Blender run with --enable-autoexec */ - if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; - else G.f &= ~G_SCRIPT_AUTOEXEC; - } - if(U.tempdir[0]) BLI_where_is_temp(btempdir, FILE_MAX, 1); -+ -+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */ -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC)) -+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE; - } - - void WM_read_file(bContext *C, const char *name, ReportList *reports) -diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c -index 28df023..a2142a5 100644 ---- a/source/blender/windowmanager/intern/wm_operators.c -+++ b/source/blender/windowmanager/intern/wm_operators.c -@@ -1471,12 +1471,13 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op) - G.fileflags &= ~G_FILE_NO_UI; - else - G.fileflags |= G_FILE_NO_UI; -- -- if(RNA_boolean_get(op->ptr, "use_scripts")) -+ -+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */ -+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF))) - G.f |= G_SCRIPT_AUTOEXEC; - else - G.f &= ~G_SCRIPT_AUTOEXEC; -- -+ - // XXX wm in context is not set correctly after WM_read_file -> crash - // do it before for now, but is this correct with multiple windows? - WM_event_add_notifier(C, NC_WINDOW, NULL); -@@ -1488,6 +1489,8 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op) - - static void WM_OT_open_mainfile(wmOperatorType *ot) - { -+ PropertyRNA * use_scripts_checkbox = NULL; -+ - ot->name= "Open Blender File"; - ot->idname= "WM_OT_open_mainfile"; - ot->description="Open a Blender file"; -@@ -1499,7 +1502,12 @@ static void WM_OT_open_mainfile(wmOperatorType *ot) - WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH); - - RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file"); -- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences"); -+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts", -+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source", -+ "Allow blend file execute scripts automatically, default available from system preferences"); -+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */ -+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF)) -+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE); - } - - /* **************** link/append *************** */ -diff --git a/source/creator/creator.c b/source/creator/creator.c -index c687cc2..1da282f 100644 ---- a/source/creator/creator.c -+++ b/source/creator/creator.c -@@ -278,6 +278,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) - - printf("\n"); - -+ BLI_argsPrintArgDoc(ba, "-666"); - BLI_argsPrintArgDoc(ba, "--enable-autoexec"); - BLI_argsPrintArgDoc(ba, "--disable-autoexec"); - -@@ -359,14 +360,14 @@ static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUS - static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f |= G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ - return 0; - } - - static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f &= ~G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - return 0; - } - -@@ -1075,8 +1076,9 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) - - BLI_argsAdd(ba, 1, "-v", "--version", "\n\tPrint Blender version and exit", print_version, NULL); - -- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution (default)", enable_python, NULL); -- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)", disable_python, NULL); -+ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.49b)", enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution", enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes) (default)", disable_python, NULL); - - BLI_argsAdd(ba, 1, "-b", "--background", "<file>\n\tLoad <file> in background (often used for UI-less rendering)", background_mode, NULL); - --- -1.7.5.rc3 - 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 b78d5a4246ec..000000000000 --- 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 6a40e3b95cb1..000000000000 --- 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 335b289bfa92..000000000000 --- 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 91d8af4a6ea7..000000000000 --- 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 c38be79bd16f..000000000000 --- 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 5e63c7c54a91..000000000000 --- 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 e427957dc414..000000000000 --- 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 7b4ca47ed235..000000000000 --- 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 6a96b49d12ca..000000000000 --- 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.60-bmake.patch b/media-gfx/blender/files/blender-2.60-bmake.patch deleted file mode 100644 index 0ce8fa72323c..000000000000 --- a/media-gfx/blender/files/blender-2.60-bmake.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Npur release/plugins.orig/bmake release/plugins/bmake ---- release/plugins.orig/bmake 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/bmake 2011-11-11 15:01:40.637923565 +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"; -@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then - INCLUDES=-I..; - elif ( test -f "../include/plugin.h" ) then - INCLUDES=-I../include -+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then -+ INCLUDES=-I../../../source/blender/blenpluginapi - else - echo "Couldn't find plugin.h"; - exit; - fi - - LIBM=`fgrep "#include <math.h>" $CFILE` --LIBC=`fgrep "#include <std" $CFILE` - --LIBS= -+LIBS="-lc" - - if ( test -n "$LIBM" ) then - LIBS="$LIBS -lm"; - fi --if ( test -n "$LIBC" ) then -- LIBS="$LIBS -lc"; --fi - - echo "$CC $CFLAGS -c $CFILE $INCLUDES" - $CC $CFLAGS -c $CFILE $INCLUDES -diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c ---- release/plugins.orig/sequence/color-correction-hsv.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/sequence/color-correction-hsv.c 2011-11-11 15:03:47.233921332 +0100 -@@ -15,7 +15,7 @@ - * - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - #include <stdio.h> - -diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c ---- release/plugins.orig/sequence/color-correction-yuv.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/sequence/color-correction-yuv.c 2011-11-11 15:02:10.446923031 +0100 -@@ -15,7 +15,7 @@ - * - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - #include <stdio.h> - -diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c ---- release/plugins.orig/sequence/dnr.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/sequence/dnr.c 2011-11-11 15:03:30.049921648 +0100 -@@ -15,7 +15,7 @@ - * - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - #include <stdio.h> - -diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c ---- release/plugins.orig/sequence/gamma.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/sequence/gamma.c 2011-11-11 15:01:58.982923268 +0100 -@@ -15,7 +15,7 @@ - * - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - #include "util.h" - #include <stdio.h> -diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c ---- release/plugins.orig/texture/clouds2.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/texture/clouds2.c 2011-11-11 15:02:23.104922789 +0100 -@@ -27,7 +27,7 @@ - * ***** END GPL LICENSE BLOCK ***** - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - - /* ******************** GLOBAL VARIABLES ***************** */ -diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c ---- release/plugins.orig/texture/tiles.c 2011-11-11 15:00:26.339924887 +0100 -+++ release/plugins/texture/tiles.c 2011-11-11 15:04:05.749921038 +0100 -@@ -27,7 +27,7 @@ - * ***** END GPL LICENSE BLOCK ***** - */ - --#include "math.h" -+#include <math.h> - #include "plugin.h" - - /* ******************** GLOBAL VARIABLES ***************** */ diff --git a/media-gfx/blender/files/blender-2.60-doxyfile.patch b/media-gfx/blender/files/blender-2.60-doxyfile.patch deleted file mode 100644 index aa61c55986cb..000000000000 --- a/media-gfx/blender/files/blender-2.60-doxyfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.60-eigen.patch b/media-gfx/blender/files/blender-2.60-eigen.patch deleted file mode 100644 index 6955ee11c8c8..000000000000 --- a/media-gfx/blender/files/blender-2.60-eigen.patch +++ /dev/null @@ -1,293 +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_intern_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] ) ---- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000 +0200 -+++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000 +0200 -@@ -21,7 +21,8 @@ - incs += ' #source/blender/makesrna' - incs += ' #source/blender/ikplugin' - incs += ' #extern/recastnavigation/Detour/Include' --incs += ' #extern/Eigen2' -+#incs += ' #extern/Eigen2' -+incs += ' /usr/include/eigen2' - - incs += ' ' + env['BF_BULLET_INC'] - ---- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 -+++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 -@@ -25,11 +25,11 @@ - # ***** END GPL LICENSE BLOCK ***** - - set(INC -- ../../extern/Eigen2 -+ /usr/include/eigen2 - ) - - set(INC_SYS -- -+ /usr/include/eigen2 - ) - - set(SRC -@@ -117,113 +117,113 @@ set(SRC - ublas_types.hpp - - # until we have another user... -- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h -- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h -- ../../extern/Eigen2/Eigen/src/Array/Functors.h -- ../../extern/Eigen2/Eigen/src/Array/Norms.h -- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h -- ../../extern/Eigen2/Eigen/src/Array/Random.h -- ../../extern/Eigen2/Eigen/src/Array/Select.h -- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h -- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h -- ../../extern/Eigen2/Eigen/src/Core/Assign.h -- ../../extern/Eigen2/Eigen/src/Core/Block.h -- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h -- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h -- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h -- ../../extern/Eigen2/Eigen/src/Core/Cwise.h -- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h -- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h -- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h -- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h -- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h -- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h -- ../../extern/Eigen2/Eigen/src/Core/Dot.h -- ../../extern/Eigen2/Eigen/src/Core/Flagged.h -- ../../extern/Eigen2/Eigen/src/Core/Functors.h -- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h -- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h -- ../../extern/Eigen2/Eigen/src/Core/IO.h -- ../../extern/Eigen2/Eigen/src/Core/Map.h -- ../../extern/Eigen2/Eigen/src/Core/MapBase.h -- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h -- ../../extern/Eigen2/Eigen/src/Core/Matrix.h -- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h -- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h -- ../../extern/Eigen2/Eigen/src/Core/Minor.h -- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h -- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h -- ../../extern/Eigen2/Eigen/src/Core/Part.h -- ../../extern/Eigen2/Eigen/src/Core/Product.h -- ../../extern/Eigen2/Eigen/src/Core/Redux.h -- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h -- ../../extern/Eigen2/Eigen/src/Core/Sum.h -- ../../extern/Eigen2/Eigen/src/Core/Swap.h -- ../../extern/Eigen2/Eigen/src/Core/Transpose.h -- ../../extern/Eigen2/Eigen/src/Core/Visitor.h -- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h -- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h -- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h -- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h -- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h -- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h -- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h -- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h -- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h -- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h -- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h -- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h -- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h -- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h -- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h -- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h -- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h -- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h -- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h -- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h -- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h -- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h -- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h -- ../../extern/Eigen2/Eigen/src/LU/Determinant.h -- ../../extern/Eigen2/Eigen/src/LU/Inverse.h -- ../../extern/Eigen2/Eigen/src/LU/LU.h -- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h -- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h -- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h -- ../../extern/Eigen2/Eigen/src/QR/QR.h -- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h -- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h -- ../../extern/Eigen2/Eigen/src/SVD/SVD.h -- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h -- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h -- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h -- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h -- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h -- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h -- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h -- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h -- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h -- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h -- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h -- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h -+ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h -+ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h -+ /usr/include/eigen2/Eigen/src/Array/Functors.h -+ /usr/include/eigen2/Eigen/src/Array/Norms.h -+ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h -+ /usr/include/eigen2/Eigen/src/Array/Random.h -+ /usr/include/eigen2/Eigen/src/Array/Select.h -+ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h -+ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h -+ /usr/include/eigen2/Eigen/src/Core/Assign.h -+ /usr/include/eigen2/Eigen/src/Core/Block.h -+ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h -+ /usr/include/eigen2/Eigen/src/Core/Coeffs.h -+ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h -+ /usr/include/eigen2/Eigen/src/Core/Cwise.h -+ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h -+ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h -+ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h -+ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h -+ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h -+ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h -+ /usr/include/eigen2/Eigen/src/Core/Dot.h -+ /usr/include/eigen2/Eigen/src/Core/Flagged.h -+ /usr/include/eigen2/Eigen/src/Core/Functors.h -+ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h -+ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h -+ /usr/include/eigen2/Eigen/src/Core/IO.h -+ /usr/include/eigen2/Eigen/src/Core/Map.h -+ /usr/include/eigen2/Eigen/src/Core/MapBase.h -+ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h -+ /usr/include/eigen2/Eigen/src/Core/Matrix.h -+ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h -+ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h -+ /usr/include/eigen2/Eigen/src/Core/Minor.h -+ /usr/include/eigen2/Eigen/src/Core/NestByValue.h -+ /usr/include/eigen2/Eigen/src/Core/NumTraits.h -+ /usr/include/eigen2/Eigen/src/Core/Part.h -+ /usr/include/eigen2/Eigen/src/Core/Product.h -+ /usr/include/eigen2/Eigen/src/Core/Redux.h -+ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h -+ /usr/include/eigen2/Eigen/src/Core/Sum.h -+ /usr/include/eigen2/Eigen/src/Core/Swap.h -+ /usr/include/eigen2/Eigen/src/Core/Transpose.h -+ /usr/include/eigen2/Eigen/src/Core/Visitor.h -+ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h -+ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h -+ /usr/include/eigen2/Eigen/src/Core/util/Constants.h -+ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h -+ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h -+ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h -+ /usr/include/eigen2/Eigen/src/Core/util/Macros.h -+ /usr/include/eigen2/Eigen/src/Core/util/Memory.h -+ /usr/include/eigen2/Eigen/src/Core/util/Meta.h -+ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h -+ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h -+ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h -+ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h -+ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h -+ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h -+ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h -+ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h -+ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h -+ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h -+ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h -+ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h -+ /usr/include/eigen2/Eigen/src/Geometry/Transform.h -+ /usr/include/eigen2/Eigen/src/Geometry/Translation.h -+ /usr/include/eigen2/Eigen/src/LU/Determinant.h -+ /usr/include/eigen2/Eigen/src/LU/Inverse.h -+ /usr/include/eigen2/Eigen/src/LU/LU.h -+ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h -+ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h -+ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h -+ /usr/include/eigen2/Eigen/src/QR/QR.h -+ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h -+ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h -+ /usr/include/eigen2/Eigen/src/SVD/SVD.h -+ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h -+ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h -+ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h -+ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h -+ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h -+ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h -+ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h -+ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h -+ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h -+ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h -+ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h -+ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h - ) - - blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") ---- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 -+++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 -@@ -50,7 +50,7 @@ - if(WITH_IK_ITASC) - add_definitions(-DWITH_IK_ITASC) - list(APPEND INC -- ../../../extern/Eigen2 -+ /usr/include/eigen2 - ../../../intern/itasc - ) - list(APPEND SRC ---- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 -+++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 -@@ -51,7 +51,7 @@ - ../../blender/makesrna - ../../blender/windowmanager - ../../../extern/bullet2/src -- ../../../extern/Eigen2 -+ /usr/include/eigen2 - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include diff --git a/media-gfx/blender/files/blender-2.60-glew.patch b/media-gfx/blender/files/blender-2.60-glew.patch deleted file mode 100644 index edc0c9b62427..000000000000 --- a/media-gfx/blender/files/blender-2.60-glew.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- extern/SConscript -+++ extern/SConscript -@@ -2,8 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) -- - if env['WITH_BF_GAMEENGINE']: - SConscript(['recastnavigation/SConscript']) - - if env['WITH_BF_ELTOPO']: - SConscript(['eltopo/SConscript']) - ---- source/blender/editors/include/BIF_gl.h -+++ source/blender/editors/include/BIF_gl.h -@@ -35,7 +35,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 ---- extern/CMakeLists.txt -+++ extern/CMakeLists.txt -@@ -39,9 +39,6 @@ - add_subdirectory(binreloc) - endif() - --if(WITH_BUILTIN_GLEW) -- add_subdirectory(glew) --endif() - - if(WITH_GAMEENGINE) - add_subdirectory(recastnavigation) ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -150,7 +150,7 @@ - - if(UNIX AND NOT APPLE) - option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON) -- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) -+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF) - else() - # not an option for other OS's - set(WITH_BUILTIN_GLEW ON) diff --git a/media-gfx/blender/files/blender-2.60-openjpeg.patch b/media-gfx/blender/files/blender-2.60-openjpeg.patch deleted file mode 100644 index 74f6441bdfd2..000000000000 --- a/media-gfx/blender/files/blender-2.60-openjpeg.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Npur blender-2.60a.orig/extern/libredcode/SConscript blender-2.60a/extern/libredcode/SConscript ---- blender-2.60a.orig/extern/libredcode/SConscript 2011-11-09 23:05:16.241465491 +0100 -+++ blender-2.60a/extern/libredcode/SConscript 2011-11-09 23:06:24.188464236 +0100 -@@ -7,7 +7,8 @@ - Import('env') - - sources = env.Glob('*.c') --incs = '. ../libopenjpeg' -+#incs = '. ../libopenjpeg' -+incs = '. /usr/include' - - env.BlenderLib ( libname='extern_redcode', - sources=sources, includes=Split(incs), -diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript ---- blender-2.60a.orig/extern/SConscript 2011-11-09 23:05:16.241465491 +0100 -+++ blender-2.60a/extern/SConscript 2011-11-09 23:06:24.188464236 +0100 -@@ -11,8 +11,5 @@ - if env['WITH_BF_BULLET']: - SConscript(['bullet2/src/SConscript']) - --if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '': -- SConscript(['libopenjpeg/SConscript']) -- - if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': - SConscript(['libredcode/SConscript']) -diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py blender-2.60a/build_files/scons/tools/Blender.py ---- blender-2.60a.orig/build_files/scons/tools/Blender.py 2011-11-09 23:05:16.241465491 +0100 -+++ blender-2.60a/build_files/scons/tools/Blender.py 2011-11-09 23:06:24.188464236 +0100 -@@ -246,6 +246,8 @@ - syslibs += Split(lenv['BF_FFMPEG_LIB']) - if lenv['WITH_BF_OGG']: - syslibs += Split(lenv['BF_OGG_LIB']) -+ if lenv['WITH_BF_OPENJPEG']: -+ syslibs += Split(lenv['BF_OPENJPEG_LIB']) - if lenv['WITH_BF_JACK']: - syslibs += Split(lenv['BF_JACK_LIB']) - if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']: diff --git a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch deleted file mode 100644 index fc0278d77d8d..000000000000 --- a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c blender-2.60a/source/blender/blenkernel/intern/blender.c ---- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:11.905602401 +0100 -+++ blender-2.60a/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:42.827601857 +0100 -@@ -145,6 +145,7 @@ void initglobals(void) - G.f |= G_SCRIPT_AUTOEXEC; - #else - G.f &= ~G_SCRIPT_AUTOEXEC; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - #endif - } - -diff -Npur blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.60a/source/blender/makesrna/intern/rna_userdef.c ---- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 20:56:12.003602399 +0100 -+++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 21:02:43.204595484 +0100 -@@ -116,9 +116,17 @@ static void rna_userdef_show_manipulator - - static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) - { -- UserDef *userdef = (UserDef*)ptr->data; -- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -- else G.f |= G_SCRIPT_AUTOEXEC; -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ /* Blender run with --enable-autoexec */ -+ UserDef *userdef = (UserDef*)ptr->data; -+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -+ else G.f |= G_SCRIPT_AUTOEXEC; -+ } -+} -+ -+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) { -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ return !(G.f & G_SCRIPT_OVERRIDE_PREF); - } - - static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) -@@ -2630,6 +2638,8 @@ static void rna_def_userdef_system(Blend - "Allow any .blend file to run scripts automatically " - "(unsafe with blend files from an untrusted source)"); - RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable"); - - prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); -diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c blender-2.60a/source/blender/windowmanager/intern/wm_files.c ---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c 2011-11-09 20:56:12.458602413 +0100 -+++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c 2011-11-09 21:05:16.768592770 +0100 -@@ -285,12 +285,17 @@ static void wm_init_userdef(bContext *C) - - /* set the python auto-execute setting from user prefs */ - /* enabled by default, unless explicitly enabled in the command line which overrides */ -- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { -+ /* Blender run with --enable-autoexec */ - if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; - else G.f &= ~G_SCRIPT_AUTOEXEC; - } - /* update tempdir from user preferences */ - BLI_where_is_temp(btempdir, FILE_MAX, 1); -+ -+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */ -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC)) -+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE; - } - - -diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.60a/source/blender/windowmanager/intern/wm_operators.c ---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 20:56:12.458602413 +0100 -+++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 21:07:09.746590772 +0100 -@@ -1583,12 +1583,13 @@ static int wm_open_mainfile_exec(bContex - G.fileflags &= ~G_FILE_NO_UI; - else - G.fileflags |= G_FILE_NO_UI; -- -- if(RNA_boolean_get(op->ptr, "use_scripts")) -+ -+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */ -+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF))) - G.f |= G_SCRIPT_AUTOEXEC; - else - G.f &= ~G_SCRIPT_AUTOEXEC; -- -+ - // XXX wm in context is not set correctly after WM_read_file -> crash - // do it before for now, but is this correct with multiple windows? - WM_event_add_notifier(C, NC_WINDOW, NULL); -@@ -1600,6 +1601,8 @@ static int wm_open_mainfile_exec(bContex - - static void WM_OT_open_mainfile(wmOperatorType *ot) - { -+ PropertyRNA * use_scripts_checkbox = NULL; -+ - ot->name= "Open Blender File"; - ot->idname= "WM_OT_open_mainfile"; - ot->description="Open a Blender file"; -@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat - WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH); - - RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file"); -- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences"); -+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts", -+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source", -+ "Allow blend file execute scripts automatically, default available from system preferences"); -+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */ -+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF)) -+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE); - } - - /* **************** link/append *************** */ -diff -Npur blender-2.60a.orig/source/creator/creator.c blender-2.60a/source/creator/creator.c ---- blender-2.60a.orig/source/creator/creator.c 2011-11-09 20:56:11.899602401 +0100 -+++ blender-2.60a/source/creator/creator.c 2011-11-09 21:17:22.278579932 +0100 -@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc), - - printf("\n"); - -+ BLI_argsPrintArgDoc(ba, "-666"); - BLI_argsPrintArgDoc(ba, "--enable-autoexec"); - BLI_argsPrintArgDoc(ba, "--disable-autoexec"); - -@@ -326,14 +327,14 @@ static int end_arguments(int UNUSED(argc - static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f |= G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ - return 0; - } - - static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f &= ~G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - return 0; - } - -@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C, - # define PY_DISABLE_AUTO ", (compiled as non-standard default)" - #endif - -- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL); -- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL); -+ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO, enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL); -+ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL); - - #undef PY_ENABLE_AUTO - #undef PY_DISABLE_AUTO 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 980b6407493f..000000000000 --- 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-2.60a-desktop.patch b/media-gfx/blender/files/blender-2.60a-desktop.patch deleted file mode 100644 index c774cbe79a9d..000000000000 --- a/media-gfx/blender/files/blender-2.60a-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.60a - 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.60 -+Icon=blender-2.60 - Terminal=false - Type=Application - Categories=Graphics;3DGraphics; diff --git a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch b/media-gfx/blender/files/blender-2.60a-enable_site_module.patch deleted file mode 100644 index 8a44c36014f0..000000000000 --- a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- source/blender/python/intern/bpy_interface.c -+++ source/blender/python/intern/bpy_interface.c -@@ -203,11 +203,6 @@ - /* allow to use our own included python */ - PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL)); - -- /* Python 3.2 now looks for '2.58/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 -@@ -1825,7 +1825,6 @@ - STR_String pname = progname; - Py_SetProgramName(pname.Ptr()); - #endif -- Py_NoSiteFlag=1; - Py_FrozenFlag=1; - - /* must run before python initializes */ -@@ -1898,7 +1897,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.60a-insecure.desktop b/media-gfx/blender/files/blender-2.60a-insecure.desktop deleted file mode 100644 index d033ae96aebd..000000000000 --- a/media-gfx/blender/files/blender-2.60a-insecure.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Name=Blender-2.60a (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.60 --enable-autoexec -Icon=blender-2.60 -Terminal=false -Type=Application -Categories=Graphics;3DGraphics; -MimeType=application/x-blender; diff --git a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch deleted file mode 100644 index 3bae020a02ae..000000000000 --- a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-10-24 20:09:01.000000000 +0200 -+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100 -@@ -40,6 +40,8 @@ - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> - #include <libavformat/avio.h> -+#include <libavutil/mathematics.h> -+#include <libavutil/avstring.h> - #include "ffmpeg_compat.h" - } - -@@ -57,10 +58,15 @@ - { - static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" }; - -- if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str())) -- AUD_THROW(AUD_ERROR_FFMPEG, context_error); -+ m_formatCtx = avformat_alloc_context(); -+ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error); - -- m_outputFmt = m_formatCtx->oformat; -+ av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename)); -+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL); -+ if (!m_outputFmt) { -+ avformat_free_context(m_formatCtx); -+ AUD_THROW(AUD_ERROR_FFMPEG, context_error); -+ } - - switch(codec) - { diff --git a/media-gfx/blender/files/blender-2.60a-linux-3.patch b/media-gfx/blender/files/blender-2.60a-linux-3.patch deleted file mode 100644 index 6a96b49d12ca..000000000000 --- a/media-gfx/blender/files/blender-2.60a-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.61-opencollada-debug.patch b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch deleted file mode 100644 index 0310c478736d..000000000000 --- a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py ---- blender-2.61.orig/build_files/scons/tools/Blender.py 2012-02-08 22:33:29.133700566 +0100 -+++ blender-2.61/build_files/scons/tools/Blender.py 2012-02-08 22:35:13.459698722 +0100 -@@ -276,10 +276,7 @@ def setup_syslibs(lenv): - syslibs += Split(lenv['BF_PTHREADS_LIB']) - if lenv['WITH_BF_COLLADA']: - syslibs.append(lenv['BF_PCRE_LIB']) -- if lenv['BF_DEBUG']: -- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])] -- else: -- syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) -+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) - syslibs.append(lenv['BF_EXPAT_LIB']) - if lenv['WITH_BF_COLAMD']: - syslibs += Split(lenv['BF_COLAMD_LIB']) diff --git a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch b/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch deleted file mode 100644 index 671e0377e6d0..000000000000 --- a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py ---- blender-2.63.orig/build_files/scons/tools/btools.py 2012-05-08 00:05:06.963498491 +0200 -+++ blender-2.63/build_files/scons/tools/btools.py 2012-05-08 00:06:42.238496807 +0200 -@@ -96,7 +96,7 @@ def print_arguments(args, bc): - - def validate_arguments(args, bc): - opts_list = [ -- 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', -+ 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY', - 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', - 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', - 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', -@@ -261,6 +261,7 @@ def read_opts(env, cfg, args): - (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)), - (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)), - ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''), -+ (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)), - - (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)), - (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)), -diff -Npur blender-2.63.orig/SConstruct blender-2.63/SConstruct ---- blender-2.63.orig/SConstruct 2012-05-08 00:05:06.933498492 +0200 -+++ blender-2.63/SConstruct 2012-05-08 00:05:45.665497801 +0200 -@@ -349,6 +349,10 @@ if 'blenderplayer' in B.targets: - if 'blendernogame' in B.targets: - env['WITH_BF_GAMEENGINE'] = False - -+# build without python autoexec security? -+if env['WITH_PYTHON_SECURITY'] == True: -+ env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY']) -+ - # build without elbeem (fluidsim)? - if env['WITH_BF_FLUID'] == 1: - env['CPPFLAGS'].append('-DWITH_MOD_FLUID') -diff -Npur blender-2.63.orig/source/blender/blenkernel/intern/blender.c blender-2.63/source/blender/blenkernel/intern/blender.c ---- blender-2.63.orig/source/blender/blenkernel/intern/blender.c 2012-05-08 00:05:06.994498491 +0200 -+++ blender-2.63/source/blender/blenkernel/intern/blender.c 2012-05-08 00:07:04.274496414 +0200 -@@ -145,6 +145,7 @@ void initglobals(void) - G.f |= G_SCRIPT_AUTOEXEC; - #else - G.f &= ~G_SCRIPT_AUTOEXEC; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - #endif - } - -diff -Npur blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.63/source/blender/makesrna/intern/rna_userdef.c ---- blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:05:07.002498491 +0200 -+++ blender-2.63/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:08:04.547495355 +0200 -@@ -126,9 +126,17 @@ static void rna_userdef_show_manipulator - - static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) - { -- UserDef *userdef = (UserDef*)ptr->data; -- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -- else G.f |= G_SCRIPT_AUTOEXEC; -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ /* Blender run with --enable-autoexec */ -+ UserDef *userdef = (UserDef*)ptr->data; -+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; -+ else G.f |= G_SCRIPT_AUTOEXEC; -+ } -+} -+ -+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) { -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ return !(G.f & G_SCRIPT_OVERRIDE_PREF); - } - - static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) -@@ -2994,6 +3002,8 @@ static void rna_def_userdef_system(Blend - "Allow any .blend file to run scripts automatically " - "(unsafe with blend files from an untrusted source)"); - RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); -+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ -+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable"); - - prop = RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); -diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c blender-2.63/source/blender/windowmanager/intern/wm_files.c ---- blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:05:07.094498489 +0200 -+++ blender-2.63/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:09:20.964493999 +0200 -@@ -288,13 +288,18 @@ static void wm_init_userdef(bContext *C) - - /* set the python auto-execute setting from user prefs */ - /* enabled by default, unless explicitly enabled in the command line which overrides */ -- if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { -+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { -+ /* Blender run with --enable-autoexec */ - if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; - else G.f &= ~G_SCRIPT_AUTOEXEC; - } - - /* update tempdir from user preferences */ - BLI_init_temporary_dir(U.tempdir); -+ -+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */ -+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC)) -+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE; - } - - -diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.63/source/blender/windowmanager/intern/wm_operators.c ---- blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:05:07.093498489 +0200 -+++ blender-2.63/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:10:59.325492259 +0200 -@@ -1627,12 +1627,13 @@ static int wm_open_mainfile_exec(bContex - G.fileflags &= ~G_FILE_NO_UI; - else - G.fileflags |= G_FILE_NO_UI; -- -- if (RNA_boolean_get(op->ptr, "use_scripts")) -+ -+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */ -+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF))) - G.f |= G_SCRIPT_AUTOEXEC; - else - G.f &= ~G_SCRIPT_AUTOEXEC; -- -+ - // XXX wm in context is not set correctly after WM_read_file -> crash - // do it before for now, but is this correct with multiple windows? - WM_event_add_notifier(C, NC_WINDOW, NULL); -@@ -1644,6 +1645,8 @@ static int wm_open_mainfile_exec(bContex - - static void WM_OT_open_mainfile(wmOperatorType *ot) - { -+ PropertyRNA * use_scripts_checkbox = NULL; -+ - ot->name = "Open Blender File"; - ot->idname = "WM_OT_open_mainfile"; - ot->description = "Open a Blender file"; -@@ -1656,8 +1659,12 @@ static void WM_OT_open_mainfile(wmOperat - WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); - - RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file"); -- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", -+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts", -+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source", - "Allow .blend file to execute scripts automatically, default available from system preferences"); -+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */ -+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF)) -+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE); - } - - /* **************** link/append *************** */ -diff -Npur blender-2.63.orig/source/creator/creator.c blender-2.63/source/creator/creator.c ---- blender-2.63.orig/source/creator/creator.c 2012-05-08 00:05:06.987498491 +0200 -+++ blender-2.63/source/creator/creator.c 2012-05-08 00:11:37.213491621 +0200 -@@ -342,14 +342,14 @@ static int end_arguments(int UNUSED(argc - static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f |= G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ - return 0; - } - - static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) - { - G.f &= ~G_SCRIPT_AUTOEXEC; -- G.f |= G_SCRIPT_OVERRIDE_PREF; -+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ - return 0; - } - diff --git a/media-gfx/blender/files/blender-2.63-doxyfile.patch b/media-gfx/blender/files/blender-2.63-doxyfile.patch deleted file mode 100644 index c52c23408e5d..000000000000 --- a/media-gfx/blender/files/blender-2.63-doxyfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blender-2.60a.orig/work/blender-2.60a/doc/doxygen/Doxyfile 2012-02-12 23:05:35.390883778 +0100 -+++ blender-2.60a/work/blender-2.60a/doc/doxygen/Doxyfile 2012-02-12 23:07:22.539860341 +0100 -@@ -952,7 +952,7 @@ - # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run - # the HTML help compiler on the generated index.hhp. - --HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" -+HHC_LOCATION = - - # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag - # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/blender-2.63-enable_site_module.patch b/media-gfx/blender/files/blender-2.63-enable_site_module.patch deleted file mode 100644 index 2d6ca00c19cd..000000000000 --- a/media-gfx/blender/files/blender-2.63-enable_site_module.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Npur blender-2.63.orig/source/blender/python/intern/bpy_interface.c blender-2.63/source/blender/python/intern/bpy_interface.c ---- blender-2.63.orig/source/blender/python/intern/bpy_interface.c 2012-05-08 00:14:54.141488111 +0200 -+++ blender-2.63/source/blender/python/intern/bpy_interface.c 2012-05-08 00:15:14.861487739 +0200 -@@ -241,11 +241,6 @@ void BPY_python_start(int argc, const ch - * blender is utf-8 too - campbell */ - BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape"); - -- /* Python 3.2 now looks for '2.xx/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 -diff -Npur blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp ---- blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:14:54.118488110 +0200 -+++ blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:15:23.305487596 +0200 -@@ -1848,7 +1848,6 @@ PyObject* initGamePlayerPythonScripting( - STR_String pname = progname; - Py_SetProgramName(pname.Ptr()); - #endif -- Py_NoSiteFlag=1; - Py_FrozenFlag=1; - - /* must run before python initializes */ -@@ -1929,7 +1928,6 @@ PyObject* initGamePythonScripting(const - STR_String pname = progname; - Py_SetProgramName(pname.Ptr()); - #endif -- Py_NoSiteFlag=1; - Py_FrozenFlag=1; - - #ifdef WITH_AUDASPACE diff --git a/media-gfx/blender/files/blender-2.63-glew.patch b/media-gfx/blender/files/blender-2.63-glew.patch deleted file mode 100644 index 736bedd8185d..000000000000 --- a/media-gfx/blender/files/blender-2.63-glew.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Npur blender-2.63.orig/CMakeLists.txt blender-2.63/CMakeLists.txt ---- blender-2.63.orig/CMakeLists.txt 2012-05-07 23:02:18.166565118 +0200 -+++ blender-2.63/CMakeLists.txt 2012-05-07 23:02:45.907564652 +0200 -@@ -160,7 +160,7 @@ unset(PLATFORM_DEFAULT) - if(UNIX AND NOT APPLE) - option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) - option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) -- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) -+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF) - option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF) - mark_as_advanced(WITH_XDG_USER_DIRS) - -diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt ---- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:02:18.134565119 +0200 -+++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:02:58.458564406 +0200 -@@ -40,10 +40,6 @@ if(WITH_BINRELOC) - add_subdirectory(binreloc) - endif() - --if(WITH_BUILTIN_GLEW) -- add_subdirectory(glew) --endif() -- - if(WITH_GAMEENGINE) - add_subdirectory(recastnavigation) - endif() -diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript ---- blender-2.63.orig/extern/SConscript 2012-05-07 23:02:18.132565119 +0200 -+++ blender-2.63/extern/SConscript 2012-05-07 23:03:14.094564130 +0200 -@@ -2,7 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) - SConscript(['colamd/SConscript']) - - if env['WITH_BF_GAMEENGINE']: -diff -Npur blender-2.63.orig/source/blender/editors/include/BIF_gl.h blender-2.63/source/blender/editors/include/BIF_gl.h ---- blender-2.63.orig/source/blender/editors/include/BIF_gl.h 2012-05-07 23:02:18.433565114 +0200 -+++ blender-2.63/source/blender/editors/include/BIF_gl.h 2012-05-07 23:03:35.555563750 +0200 -@@ -33,7 +33,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.63-opencollada-debug.patch b/media-gfx/blender/files/blender-2.63-opencollada-debug.patch deleted file mode 100644 index 0798cfde0745..000000000000 --- a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py ---- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-08 00:15:58.091486980 +0200 -+++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-08 00:17:01.805485854 +0200 -@@ -276,10 +276,7 @@ def setup_syslibs(lenv): - syslibs += Split(lenv['BF_PTHREADS_LIB']) - if lenv['WITH_BF_COLLADA']: - syslibs.append(lenv['BF_PCRE_LIB']) -- if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'): -- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])] -- else: -- syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) -+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) - syslibs.append(lenv['BF_EXPAT_LIB']) - if lenv['WITH_BF_COLAMD']: - syslibs += Split(lenv['BF_COLAMD_LIB']) diff --git a/media-gfx/blender/files/blender-2.63a-bullet.patch b/media-gfx/blender/files/blender-2.63a-bullet.patch deleted file mode 100644 index e8ebd736305d..000000000000 --- a/media-gfx/blender/files/blender-2.63a-bullet.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff -Npur blender-2.63a.eigen/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py ---- blender-2.63a.eigen/build_files/scons/tools/Blender.py 2012-05-10 16:53:28.000000000 +0200 -+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-03 18:43:16.699242778 +0200 -@@ -268,6 +268,8 @@ def setup_syslibs(lenv): - syslibs += Split(lenv['BF_SDL_LIB']) - if not lenv['WITH_BF_STATICOPENGL']: - syslibs += Split(lenv['BF_OPENGL_LIB']) -+ if lenv['WITH_BF_BULLET']: -+ syslibs += Split(lenv['BF_BULLET_LIB']) - if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'): - syslibs += Split(lenv['BF_PTHREADS_LIB']) - if lenv['WITH_BF_COLLADA']: -diff -Npur blender-2.63a.eigen/doc/doxygen/Doxyfile blender-2.63a/doc/doxygen/Doxyfile ---- blender-2.63a.eigen/doc/doxygen/Doxyfile 2012-05-10 16:53:36.000000000 +0200 -+++ blender-2.63a/doc/doxygen/Doxyfile 2012-06-03 18:43:16.700242905 +0200 -@@ -617,8 +617,7 @@ INPUT = doxygen.main \ - doxygen.intern \ - doxygen.extern \ - ../../source \ -- ../../intern \ -- ../../extern/bullet2 -+ ../../intern - - # This tag can be used to specify the character encoding of the source files - # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -diff -Npur blender-2.63a.eigen/extern/CMakeLists.txt blender-2.63a/extern/CMakeLists.txt ---- blender-2.63a.eigen/extern/CMakeLists.txt 2012-05-10 16:54:50.000000000 +0200 -+++ blender-2.63a/extern/CMakeLists.txt 2012-06-03 18:43:16.701243032 +0200 -@@ -28,10 +28,6 @@ remove_strict_flags() - - add_subdirectory(colamd) - --if(WITH_BULLET) -- add_subdirectory(bullet2) --endif() -- - if(WITH_MOD_CLOTH_ELTOPO) - add_subdirectory(eltopo) - endif() -diff -Npur blender-2.63a.eigen/intern/smoke/CMakeLists.txt blender-2.63a/intern/smoke/CMakeLists.txt ---- blender-2.63a.eigen/intern/smoke/CMakeLists.txt 2012-05-10 16:46:35.000000000 +0200 -+++ blender-2.63a/intern/smoke/CMakeLists.txt 2012-06-03 18:43:16.702243159 +0200 -@@ -26,10 +26,10 @@ - set(INC - intern - ../memutil -- ../../extern/bullet2/src - ) - - set(INC_SYS -+ /usr/include/bullet - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff -Npur blender-2.63a.eigen/intern/smoke/SConscript blender-2.63a/intern/smoke/SConscript ---- blender-2.63a.eigen/intern/smoke/SConscript 2012-05-10 16:46:35.000000000 +0200 -+++ blender-2.63a/intern/smoke/SConscript 2012-06-03 18:43:16.702243159 +0200 -@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']: - defs += ' PARALLEL=1' - - incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] --incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' -+incs += ' intern /usr/include/bullet ../memutil ../guardealloc ' - - if env['WITH_BF_FFTW3']: - defs += ' WITH_FFTW3' -diff -Npur blender-2.63a.eigen/source/blender/blenkernel/CMakeLists.txt blender-2.63a/source/blender/blenkernel/CMakeLists.txt ---- blender-2.63a.eigen/source/blender/blenkernel/CMakeLists.txt 2012-05-10 16:50:24.000000000 +0200 -+++ blender-2.63a/source/blender/blenkernel/CMakeLists.txt 2012-06-03 18:43:16.703243286 +0200 -@@ -241,8 +241,8 @@ if(WITH_AUDASPACE) - endif() - - if(WITH_BULLET) -- list(APPEND INC -- ../../../extern/bullet2/src -+ list(APPEND INC_SYS -+ /usr/include/bullet - ) - add_definitions(-DUSE_BULLET) - endif() -diff -Npur blender-2.63a.eigen/source/blender/blenkernel/SConscript blender-2.63a/source/blender/blenkernel/SConscript ---- blender-2.63a.eigen/source/blender/blenkernel/SConscript 2012-05-10 16:50:24.000000000 +0200 -+++ blender-2.63a/source/blender/blenkernel/SConscript 2012-06-03 18:43:16.704243413 +0200 -@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make - incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' - incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' - incs += ' #/intern/iksolver/extern ../blenloader' --incs += ' #/extern/bullet2/src' -+incs += ' /usr/include/bullet' - incs += ' #/intern/opennl/extern #/intern/bsp/extern' - incs += ' ../gpu #/extern/glew/include' - incs += ' ../bmesh' -diff -Npur blender-2.63a.eigen/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt ---- blender-2.63a.eigen/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-05-10 16:48:35.000000000 +0200 -+++ blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-06-03 18:43:16.704243413 +0200 -@@ -23,7 +23,6 @@ set(INC - ../../blender/makesdna - ../../blender/makesrna - ../../blender/windowmanager -- ../../../extern/bullet2/src - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include -@@ -33,6 +32,7 @@ set(INC - - set(INC_SYS - ${PTHREADS_INCLUDE_DIRS} -+ /usr/include/bullet - ) - - set(SRC -diff -Npur blender-2.63a.eigen/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt ---- blender-2.63a.eigen/source/gameengine/Converter/CMakeLists.txt 2012-06-03 18:42:31.632515028 +0200 -+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt 2012-06-03 18:43:16.705243540 +0200 -@@ -49,7 +49,6 @@ set(INC - ../../blender/makesdna - ../../blender/makesrna - ../../blender/windowmanager -- ../../../extern/bullet2/src - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include -@@ -60,6 +59,7 @@ set(INC - set(INC_SYS - ${PTHREADS_INCLUDE_DIRS} - /usr/include/eigen3 -+ /usr/include/bullet - - ) - -diff -Npur blender-2.63a.eigen/source/gameengine/Ketsji/CMakeLists.txt blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt ---- blender-2.63a.eigen/source/gameengine/Ketsji/CMakeLists.txt 2012-05-10 16:48:58.000000000 +0200 -+++ blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt 2012-06-03 18:43:16.706243667 +0200 -@@ -242,9 +242,11 @@ endif() - - if(WITH_BULLET) - list(APPEND INC -- ../../../extern/bullet2/src - ../Physics/Bullet - ) -+ list(APPEND INC_SYS -+ /usr/include/bullet -+ ) - add_definitions(-DUSE_BULLET) - endif() - -diff -Npur blender-2.63a.eigen/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp ---- blender-2.63a.eigen/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-05-10 16:48:32.000000000 +0200 -+++ blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-06-03 18:43:16.708243921 +0200 -@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied - - void CcdPhysicsEnvironment::exportFile(const char* filename) - { -- btDefaultSerializer* serializer = new btDefaultSerializer(); -+ // Workaround bullet-2.77 api change. -+ btDefaultSerializer* serializer = new btDefaultSerializer(0); - - - for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++) -diff -Npur blender-2.63a.eigen/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt ---- blender-2.63a.eigen/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-05-10 16:48:32.000000000 +0200 -+++ blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-06-03 18:43:16.709244048 +0200 -@@ -37,7 +37,6 @@ set(INC - ../../../blender/blenkernel - ../../../blender/blenlib - ../../../blender/makesdna -- ../../../../extern/bullet2/src - ../../../../intern/container - ../../../../intern/guardedalloc - ../../../../intern/moto/include -@@ -45,6 +44,7 @@ set(INC - ) - - set(INC_SYS -+ /usr/include/bullet - ${GLEW_INCLUDE_PATH} - ${PYTHON_INCLUDE_DIRS} - ) diff --git a/media-gfx/blender/files/blender-2.63a-colamd.patch b/media-gfx/blender/files/blender-2.63a-colamd.patch deleted file mode 100644 index 80c04e89f996..000000000000 --- a/media-gfx/blender/files/blender-2.63a-colamd.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff -Npur blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py blender-2.63a/build_files/scons/config/linux-config.py ---- blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py 2012-05-10 16:53:29.000000000 +0200 -+++ blender-2.63a/build_files/scons/config/linux-config.py 2012-06-03 18:43:55.121126001 +0200 -@@ -192,6 +192,11 @@ BF_EXPAT = '/usr' - BF_EXPAT_LIB = 'expat' - BF_EXPAT_LIBPATH = '/usr/lib' - -+WITH_BF_COLAMD = True -+BF_COLAMD = '#extern/colamd' -+BF_COLAMD_INC = '${BF_COLAMD}/include' -+BF_COLAMD_LIB = 'extern_colamd' -+ - WITH_BF_JEMALLOC = False - WITH_BF_STATICJEMALLOC = False - BF_JEMALLOC = '/usr' -diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py ---- blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py 2012-06-03 18:43:16.699242778 +0200 -+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-03 18:43:55.123126255 +0200 -@@ -279,6 +279,8 @@ def setup_syslibs(lenv): - else: - syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) - syslibs.append(lenv['BF_EXPAT_LIB']) -+ if lenv['WITH_BF_COLAMD']: -+ syslibs += Split(lenv['BF_COLAMD_LIB']) - - if lenv['WITH_BF_JEMALLOC']: - if not lenv['WITH_BF_STATICJEMALLOC']: -diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py blender-2.63a/build_files/scons/tools/btools.py ---- blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py 2012-05-10 16:53:28.000000000 +0200 -+++ blender-2.63a/build_files/scons/tools/btools.py 2012-06-03 18:43:55.124126382 +0200 -@@ -126,6 +126,7 @@ def validate_arguments(args, bc): - 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC', - 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', - 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH', -+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB', - 'WITH_BF_PLAYER', - 'WITH_BF_NOBLENDER', - 'WITH_BF_BINRELOC', -@@ -455,6 +456,11 @@ def read_opts(env, cfg, args): - ('BF_EXPAT_LIB', 'Expat library', ''), - ('BF_EXPAT_LIBPATH', 'Expat library path', ''), - -+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)), -+ ('BF_COLAMD', 'Colamd base dir', ''), -+ ('BF_COLAMD_INC', 'Colamd include path', ''), -+ ('BF_COLAMD_LIB', 'Colamd library', ''), -+ - (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)), - (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)), - ('BF_JEMALLOC', 'jemalloc base path', ''), -diff -Npur blender-2.63a.eigen-bullet/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh ---- blender-2.63a.eigen-bullet/extern/libmv/bundle.sh 2012-06-03 18:42:31.626514266 +0200 -+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-03 18:43:55.125126509 +0200 -@@ -122,13 +122,13 @@ set(INC - . - third_party/ssba - third_party/ldl/Include -- ../colamd/Include - ) - - set(INC_SYS - /usr/include/eigen3 - \${PNG_INCLUDE_DIR} - \${ZLIB_INCLUDE_DIRS} -+ \${COLAMD_INCLUDE_DIRS} - ) - - -@@ -247,6 +247,7 @@ $src - incs = '. /usr/include/eigen3' - incs += ' ' + env['BF_PNG_INC'] - incs += ' ' + env['BF_ZLIB_INC'] -+incs += ' ' + env['BF_COLAMD_INC'] - - if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' -@@ -276,7 +277,7 @@ else: - ccflags_libmv += Split(env['REL_CCFLAGS']) - cxxflags_libmv += Split(env['REL_CXXFLAGS']) - --incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' -+incs += ' ./third_party/ssba ./third_party/ldl/Include' - - env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) - EOF -diff -Npur blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt ---- blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt 2012-06-03 18:42:31.627514393 +0200 -+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-03 18:43:55.125126509 +0200 -@@ -30,13 +30,13 @@ set(INC - . - third_party/ssba - third_party/ldl/Include -- ../colamd/Include - ) - - set(INC_SYS - /usr/include/eigen3 - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} -+ ${COLAMD_INCLUDE_DIRS} - ) - - -diff -Npur blender-2.63a.eigen-bullet/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript ---- blender-2.63a.eigen-bullet/extern/libmv/SConscript 2012-06-03 18:42:31.627514393 +0200 -+++ blender-2.63a/extern/libmv/SConscript 2012-06-03 18:43:55.127126763 +0200 -@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/* - incs = '. /usr/include/eigen3' - incs += ' ' + env['BF_PNG_INC'] - incs += ' ' + env['BF_ZLIB_INC'] -+incs += ' ' + env['BF_COLAMD_INC'] - - if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' -@@ -62,6 +63,6 @@ else: - ccflags_libmv += Split(env['REL_CCFLAGS']) - cxxflags_libmv += Split(env['REL_CXXFLAGS']) - --incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' -+incs += ' ./third_party/ssba ./third_party/ldl/Include' - - env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) -diff -Npur blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp ---- blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-10 16:54:38.000000000 +0200 -+++ blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-03 18:43:55.128126890 +0200 -@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o - - #if defined(V3DLIB_ENABLE_SUITESPARSE) - //# include "COLAMD/Include/colamd.h" --# include "colamd.h" -+# include <colamd.h> - extern "C" - { - //# include "LDL/Include/ldl.h" -diff -Npur blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt blender-2.63a/intern/opennl/CMakeLists.txt ---- blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt 2012-05-10 16:46:04.000000000 +0200 -+++ blender-2.63a/intern/opennl/CMakeLists.txt 2012-06-03 18:43:55.129127017 +0200 -@@ -40,11 +40,10 @@ add_definitions( - set(INC - extern - superlu -- ../../extern/colamd/Include - ) - - set(INC_SYS -- -+ /usr/include - ) - - set(SRC -diff -Npur blender-2.63a.eigen-bullet/intern/opennl/SConscript blender-2.63a/intern/opennl/SConscript ---- blender-2.63a.eigen-bullet/intern/opennl/SConscript 2012-05-10 16:46:04.000000000 +0200 -+++ blender-2.63a/intern/opennl/SConscript 2012-06-03 18:43:55.129127017 +0200 -@@ -3,7 +3,7 @@ Import ('env') - - sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') - --incs = 'extern superlu ../../extern/colamd/Include' -+incs = 'extern superlu /usr/include' - - if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')): - env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) -diff -Npur blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c blender-2.63a/intern/opennl/superlu/get_perm_c.c ---- blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c 2012-05-10 16:46:04.000000000 +0200 -+++ blender-2.63a/intern/opennl/superlu/get_perm_c.c 2012-06-03 18:43:55.130127145 +0200 -@@ -10,7 +10,7 @@ - */ - - #include "ssp_defs.h" --#include "colamd.h" -+#include <colamd.h> - - extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, - int *, int *, int *, int *, int *); diff --git a/media-gfx/blender/files/blender-2.63a-desktop.patch b/media-gfx/blender/files/blender-2.63a-desktop.patch deleted file mode 100644 index 2894ee8616cb..000000000000 --- a/media-gfx/blender/files/blender-2.63a-desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- release/freedesktop/blender.desktop-original 2012-04-26 22:43:53.000000000 +0200 -+++ release/freedesktop/blender.desktop 2012-05-04 00:49:30.263479607 +0200 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Name=Blender -+Name=Blender-2.63a - GenericName=3D modeller - GenericName[es]=modelador 3D - GenericName[de]=3D-Modellierer -@@ -8,8 +8,8 @@ - Comment=3D modeling, animation, rendering and post-production - Comment[es]=modelado 3D, animación, renderizado y post-producción - Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung --Exec=blender --Icon=blender -+Exec=blender-2.63a %f -+Icon=blender-2.63a - Terminal=false - Type=Application - Categories=Graphics;3DGraphics; diff --git a/media-gfx/blender/files/blender-2.63a-eigen.patch b/media-gfx/blender/files/blender-2.63a-eigen.patch deleted file mode 100644 index 6638cd01ff3c..000000000000 --- a/media-gfx/blender/files/blender-2.63a-eigen.patch +++ /dev/null @@ -1,554 +0,0 @@ -diff -Npur blender-2.63a.orig/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh ---- blender-2.63a.orig/extern/libmv/bundle.sh 2012-05-10 16:54:39.000000000 +0200 -+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-03 17:08:48.536848484 +0200 -@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF - - set(INC - . -- ../Eigen3 - third_party/ssba - third_party/ldl/Include - ../colamd/Include - ) - - set(INC_SYS -+ /usr/include/eigen3 - \${PNG_INCLUDE_DIR} - \${ZLIB_INCLUDE_DIRS} - ) -@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=') - src = env.Glob("*.cpp") - $src - --incs = '. ../Eigen3' -+incs = '. /usr/include/eigen3' - incs += ' ' + env['BF_PNG_INC'] - incs += ' ' + env['BF_ZLIB_INC'] - -diff -Npur blender-2.63a.orig/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt ---- blender-2.63a.orig/extern/libmv/CMakeLists.txt 2012-05-10 16:54:39.000000000 +0200 -+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-03 17:08:48.536848484 +0200 -@@ -28,13 +28,13 @@ - - set(INC - . -- ../Eigen3 - third_party/ssba - third_party/ldl/Include - ../colamd/Include - ) - - set(INC_SYS -+ /usr/include/eigen3 - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff -Npur blender-2.63a.orig/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript ---- blender-2.63a.orig/extern/libmv/SConscript 2012-05-10 16:54:39.000000000 +0200 -+++ blender-2.63a/extern/libmv/SConscript 2012-06-03 17:08:48.553850645 +0200 -@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/ - src += env.Glob('third_party/ssba/Geometry/*.cpp') - src += env.Glob('third_party/ssba/Math/*.cpp') - --incs = '. ../Eigen3' -+incs = '. /usr/include/eigen3' - incs += ' ' + env['BF_PNG_INC'] - incs += ' ' + env['BF_ZLIB_INC'] - -diff -Npur blender-2.63a.orig/intern/dualcon/SConscript blender-2.63a/intern/dualcon/SConscript ---- blender-2.63a.orig/intern/dualcon/SConscript 2012-05-10 16:44:30.000000000 +0200 -+++ blender-2.63a/intern/dualcon/SConscript 2012-06-03 17:08:48.554850772 +0200 -@@ -3,7 +3,7 @@ Import ('env') - - sources = env.Glob('intern/*.cpp') - --incs = '. ../../extern/Eigen3' -+incs = '. /usr/include/eigen3' - defs = '' - - env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] ) -diff -Npur blender-2.63a.orig/intern/itasc/CMakeLists.txt blender-2.63a/intern/itasc/CMakeLists.txt ---- blender-2.63a.orig/intern/itasc/CMakeLists.txt 2012-05-10 16:46:17.000000000 +0200 -+++ blender-2.63a/intern/itasc/CMakeLists.txt 2012-06-03 17:08:48.555850899 +0200 -@@ -24,11 +24,11 @@ - # ***** END GPL LICENSE BLOCK ***** - - set(INC -- ../../extern/Eigen3 -+ - ) - - set(INC_SYS -- -+ /usr/include/eigen3 - ) - - set(SRC -@@ -121,201 +121,201 @@ set(SRC - kdl/framevel.inl - - # until we have another user... -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/misc/Kernel.h -- ../../extern/Eigen3/Eigen/src/misc/Image.h -- ../../extern/Eigen3/Eigen/src/misc/Solve.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/StlSupport/details.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h -- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h -- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h -- ../../extern/Eigen3/Eigen/src/Householder/Householder.h -- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h -- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h -- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h -- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h -- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h -- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h -- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h -- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/Determinant.h -- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h -- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/Inverse.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h -- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h -- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h -- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h -- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h -- ../../extern/Eigen3/Eigen/src/Core/Swap.h -- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h -- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/Stride.h -- ../../extern/Eigen3/Eigen/src/Core/Matrix.h -- ../../extern/Eigen3/Eigen/src/Core/Visitor.h -- ../../extern/Eigen3/Eigen/src/Core/Array.h -- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h -- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h -- ../../extern/Eigen3/Eigen/src/Core/Random.h -- ../../extern/Eigen3/Eigen/src/Core/Redux.h -- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h -- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h -- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h -- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h -- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h -- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h -- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h -- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h -- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h -- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h -- ../../extern/Eigen3/Eigen/src/Core/Select.h -- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h -- ../../extern/Eigen3/Eigen/src/Core/Dot.h -- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/Product.h -- ../../extern/Eigen3/Eigen/src/Core/Transpose.h -- ../../extern/Eigen3/Eigen/src/Core/Block.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h -- ../../extern/Eigen3/Eigen/src/Core/MapBase.h -- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h -- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h -- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h -- ../../extern/Eigen3/Eigen/src/Core/IO.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/Reverse.h -- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h -- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h -- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h -- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h -- ../../extern/Eigen3/Eigen/src/Core/Map.h -- ../../extern/Eigen3/Eigen/src/Core/Functors.h -- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h -- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h -- ../../extern/Eigen3/Eigen/src/Core/Replicate.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h -- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h -- ../../extern/Eigen3/Eigen/src/Core/Assign.h -- ../../extern/Eigen3/Eigen/src/Core/Flagged.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h -+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h -+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h -+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h -+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h -+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h -+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h -+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h -+ /usr/include/eigen3/Eigen/src/misc/Kernel.h -+ /usr/include/eigen3/Eigen/src/misc/Image.h -+ /usr/include/eigen3/Eigen/src/misc/Solve.h -+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h -+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h -+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h -+ /usr/include/eigen3/Eigen/src/StlSupport/details.h -+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h -+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h -+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h -+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h -+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h -+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h -+ /usr/include/eigen3/Eigen/src/Householder/Householder.h -+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h -+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h -+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h -+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h -+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h -+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h -+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h -+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h -+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h -+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h -+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h -+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h -+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h -+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h -+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h -+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h -+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h -+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h -+ /usr/include/eigen3/Eigen/src/LU/Determinant.h -+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h -+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h -+ /usr/include/eigen3/Eigen/src/LU/Inverse.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h -+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h -+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h -+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h -+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h -+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h -+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h -+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h -+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h -+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h -+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h -+ /usr/include/eigen3/Eigen/src/Core/Swap.h -+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h -+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h -+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h -+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h -+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h -+ /usr/include/eigen3/Eigen/src/Core/Stride.h -+ /usr/include/eigen3/Eigen/src/Core/Matrix.h -+ /usr/include/eigen3/Eigen/src/Core/Visitor.h -+ /usr/include/eigen3/Eigen/src/Core/Array.h -+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h -+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h -+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h -+ /usr/include/eigen3/Eigen/src/Core/Random.h -+ /usr/include/eigen3/Eigen/src/Core/Redux.h -+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h -+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h -+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h -+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h -+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h -+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h -+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h -+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h -+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h -+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h -+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h -+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h -+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h -+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h -+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h -+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h -+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h -+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h -+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h -+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h -+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h -+ /usr/include/eigen3/Eigen/src/Core/Select.h -+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h -+ /usr/include/eigen3/Eigen/src/Core/Dot.h -+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h -+ /usr/include/eigen3/Eigen/src/Core/Product.h -+ /usr/include/eigen3/Eigen/src/Core/Transpose.h -+ /usr/include/eigen3/Eigen/src/Core/Block.h -+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h -+ /usr/include/eigen3/Eigen/src/Core/MapBase.h -+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h -+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h -+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h -+ /usr/include/eigen3/Eigen/src/Core/IO.h -+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h -+ /usr/include/eigen3/Eigen/src/Core/Reverse.h -+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h -+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h -+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h -+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h -+ /usr/include/eigen3/Eigen/src/Core/Map.h -+ /usr/include/eigen3/Eigen/src/Core/Functors.h -+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h -+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h -+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h -+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h -+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h -+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h -+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h -+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h -+ /usr/include/eigen3/Eigen/src/Core/Replicate.h -+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h -+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h -+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h -+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h -+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h -+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h -+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h -+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h -+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h -+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h -+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h -+ /usr/include/eigen3/Eigen/src/Core/Assign.h -+ /usr/include/eigen3/Eigen/src/Core/Flagged.h -+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h -+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h - ) - - if(WIN32) -diff -Npur blender-2.63a.orig/intern/itasc/SConscript blender-2.63a/intern/itasc/SConscript ---- blender-2.63a.orig/intern/itasc/SConscript 2012-05-10 16:46:17.000000000 +0200 -+++ blender-2.63a/intern/itasc/SConscript 2012-06-03 17:08:48.556851026 +0200 -@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') - sources += env.Glob('kdl/*.cpp') - sources += env.Glob('kdl/utilities/*.cpp') - --incs = '. ../../extern/Eigen3' -+incs = '. /usr/include/eigen3' - - defs = [] - -diff -Npur blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63a/source/blender/ikplugin/CMakeLists.txt ---- blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt 2012-05-10 16:50:26.000000000 +0200 -+++ blender-2.63a/source/blender/ikplugin/CMakeLists.txt 2012-06-03 17:08:48.578853823 +0200 -@@ -49,9 +49,11 @@ set(SRC - if(WITH_IK_ITASC) - add_definitions(-DWITH_IK_ITASC) - list(APPEND INC -- ../../../extern/Eigen3 - ../../../intern/itasc - ) -+ list(APPEND INC_SYS -+ /usr/include/eigen3 -+ ) - list(APPEND SRC - intern/itasc_plugin.cpp - ) -diff -Npur blender-2.63a.orig/source/blender/ikplugin/SConscript blender-2.63a/source/blender/ikplugin/SConscript ---- blender-2.63a.orig/source/blender/ikplugin/SConscript 2012-05-10 16:50:26.000000000 +0200 -+++ blender-2.63a/source/blender/ikplugin/SConscript 2012-06-03 17:08:48.579853950 +0200 -@@ -4,7 +4,7 @@ defs = [] - sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') - - incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib' --incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3' -+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3' - - defs.append('WITH_IK_ITASC') - -diff -Npur blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt ---- blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-10 16:48:47.000000000 +0200 -+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt 2012-06-03 17:08:48.579853950 +0200 -@@ -50,7 +50,6 @@ set(INC - ../../blender/makesrna - ../../blender/windowmanager - ../../../extern/bullet2/src -- ../../../extern/Eigen3 - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include -@@ -60,6 +59,7 @@ set(INC - - set(INC_SYS - ${PTHREADS_INCLUDE_DIRS} -+ /usr/include/eigen3 - - ) - -diff -Npur blender-2.63a.orig/source/gameengine/Converter/SConscript blender-2.63a/source/gameengine/Converter/SConscript ---- blender-2.63a.orig/source/gameengine/Converter/SConscript 2012-05-10 16:48:47.000000000 +0200 -+++ blender-2.63a/source/gameengine/Converter/SConscript 2012-06-03 17:08:48.579853950 +0200 -@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager' - incs += ' #source/blender/makesrna' - incs += ' #source/blender/ikplugin' - incs += ' #extern/recastnavigation/Detour/Include' --incs += ' #extern/Eigen3' -+incs += ' /usr/include/eigen3' - - incs += ' ' + env['BF_BULLET_INC'] - diff --git a/media-gfx/blender/files/blender-2.63a-insecure.desktop b/media-gfx/blender/files/blender-2.63a-insecure.desktop deleted file mode 100644 index c4ccb308ca60..000000000000 --- a/media-gfx/blender/files/blender-2.63a-insecure.desktop +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Name=Blender-2.63a (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 -Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung -Comment[fr]=modeleur 3D, animation, rendu et post-production -Exec=blender-2.63a --enable-autoexec %f -Icon=blender-2.63a -Terminal=false -Type=Application -Categories=Graphics;3DGraphics; -MimeType=application/x-blender; diff --git a/media-gfx/blender/files/blender-2.63a-libav-0.8.patch b/media-gfx/blender/files/blender-2.63a-libav-0.8.patch deleted file mode 100644 index e4789d166eaa..000000000000 --- a/media-gfx/blender/files/blender-2.63a-libav-0.8.patch +++ /dev/null @@ -1,561 +0,0 @@ -diff -urNb blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp ---- blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-05-10 16:45:40.000000000 +0200 -+++ blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-07-13 22:10:47.615293287 +0200 -@@ -107,7 +107,7 @@ - m_position = 0; - m_pkgbuf_left = 0; - -- if(av_find_stream_info(m_formatCtx)<0) -+ if(avformat_find_stream_info(m_formatCtx, NULL)<0) - AUD_THROW(AUD_ERROR_FFMPEG, streaminfo_error); - - // find audio stream and codec -@@ -133,7 +133,7 @@ - if(!aCodec) - AUD_THROW(AUD_ERROR_FFMPEG, nodecoder_error); - -- if(avcodec_open(m_codecCtx, aCodec)<0) -+ if(avcodec_open2(m_codecCtx, aCodec, NULL)<0) - AUD_THROW(AUD_ERROR_FFMPEG, codecopen_error); - - // XXX this prints file information to stdout: -@@ -143,23 +143,23 @@ - - switch(m_codecCtx->sample_fmt) - { -- case SAMPLE_FMT_U8: -+ case AV_SAMPLE_FMT_U8: - m_convert = AUD_convert_u8_float; - m_specs.format = AUD_FORMAT_U8; - break; -- case SAMPLE_FMT_S16: -+ case AV_SAMPLE_FMT_S16: - m_convert = AUD_convert_s16_float; - m_specs.format = AUD_FORMAT_S16; - break; -- case SAMPLE_FMT_S32: -+ case AV_SAMPLE_FMT_S32: - m_convert = AUD_convert_s32_float; - m_specs.format = AUD_FORMAT_S32; - break; -- case SAMPLE_FMT_FLT: -+ case AV_SAMPLE_FMT_FLT: - m_convert = AUD_convert_copy<float>; - m_specs.format = AUD_FORMAT_FLOAT32; - break; -- case SAMPLE_FMT_DBL: -+ case AV_SAMPLE_FMT_DBL: - m_convert = AUD_convert_double_float; - m_specs.format = AUD_FORMAT_FLOAT64; - break; -@@ -189,7 +189,7 @@ - } - catch(AUD_Exception&) - { -- av_close_input_file(m_formatCtx); -+ avformat_close_input(&m_formatCtx); - throw; - } - } -@@ -227,8 +227,7 @@ - } - catch(AUD_Exception&) - { -- av_close_input_stream(m_formatCtx); -- av_free(m_aviocontext); -+ avformat_close_input(&m_formatCtx); - throw; - } - } -@@ -237,13 +236,7 @@ - { - avcodec_close(m_codecCtx); - -- if(m_aviocontext) -- { -- av_close_input_stream(m_formatCtx); -- av_free(m_aviocontext); -- } -- else -- av_close_input_file(m_formatCtx); -+ avformat_close_input(&m_formatCtx); - } - - int AUD_FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size) -diff -urNb blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp ---- blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-05-10 16:45:40.000000000 +0200 -+++ blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-07-13 22:11:17.910292184 +0200 -@@ -38,6 +38,8 @@ - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> - #include <libavformat/avio.h> -+#include <libavutil/mathematics.h> -+#include <libavutil/avstring.h> - #include "ffmpeg_compat.h" - } - -@@ -55,10 +57,15 @@ - { - static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" }; - -- if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str())) -- AUD_THROW(AUD_ERROR_FFMPEG, context_error); -+ m_formatCtx = avformat_alloc_context(); -+ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error); - -- m_outputFmt = m_formatCtx->oformat; -+ av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename)); -+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL); -+ if (!m_outputFmt) { -+ avformat_free_context(m_formatCtx); -+ AUD_THROW(AUD_ERROR_FFMPEG, context_error); -+ } - - switch(codec) - { -@@ -116,7 +123,7 @@ - if(m_outputFmt->audio_codec == CODEC_ID_NONE) - AUD_THROW(AUD_ERROR_SPECS, codec_error); - -- m_stream = av_new_stream(m_formatCtx, 0); -+ m_stream = avformat_new_stream(m_formatCtx, NULL); - if(!m_stream) - AUD_THROW(AUD_ERROR_FFMPEG, stream_error); - -@@ -133,23 +140,23 @@ - { - case AUD_FORMAT_U8: - m_convert = AUD_convert_float_u8; -- m_codecCtx->sample_fmt = SAMPLE_FMT_U8; -+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8; - break; - case AUD_FORMAT_S16: - m_convert = AUD_convert_float_s16; -- m_codecCtx->sample_fmt = SAMPLE_FMT_S16; -+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16; - break; - case AUD_FORMAT_S32: - m_convert = AUD_convert_float_s32; -- m_codecCtx->sample_fmt = SAMPLE_FMT_S32; -+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32; - break; - case AUD_FORMAT_FLOAT32: - m_convert = AUD_convert_copy<float>; -- m_codecCtx->sample_fmt = SAMPLE_FMT_FLT; -+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT; - break; - case AUD_FORMAT_FLOAT64: - m_convert = AUD_convert_float_double; -- m_codecCtx->sample_fmt = SAMPLE_FMT_DBL; -+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL; - break; - default: - AUD_THROW(AUD_ERROR_FFMPEG, format_error); -@@ -164,7 +171,7 @@ - if(!codec) - AUD_THROW(AUD_ERROR_FFMPEG, codec_error); - -- if(avcodec_open(m_codecCtx, codec)) -+ if(avcodec_open2(m_codecCtx, codec, NULL)) - AUD_THROW(AUD_ERROR_FFMPEG, codec_error); - - m_output_buffer.resize(FF_MIN_BUFFER_SIZE); -diff -urNb blender-2.63a.old//intern/ffmpeg/ffmpeg_compat.h blender-2.63a.new//intern/ffmpeg/ffmpeg_compat.h ---- blender-2.63a.old//intern/ffmpeg/ffmpeg_compat.h 2012-05-10 16:46:17.000000000 +0200 -+++ blender-2.63a.new//intern/ffmpeg/ffmpeg_compat.h 2012-07-13 21:22:36.462398523 +0200 -@@ -40,7 +40,6 @@ - #endif - - #include <libswscale/swscale.h> --#include <libavcodec/opt.h> - - #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105)) - #define FFMPEG_HAVE_AVIO 1 -diff -urNb blender-2.63a.old//source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a.new//source/blender/blenkernel/intern/writeffmpeg.c ---- blender-2.63a.old//source/blender/blenkernel/intern/writeffmpeg.c 2012-05-10 16:50:20.000000000 +0200 -+++ blender-2.63a.new//source/blender/blenkernel/intern/writeffmpeg.c 2012-07-13 22:54:42.429197382 +0200 -@@ -37,7 +37,6 @@ - #include <libavcodec/avcodec.h> - #include <libavutil/rational.h> - #include <libswscale/swscale.h> --#include <libavcodec/opt.h> - - #include "MEM_guardedalloc.h" - -@@ -449,7 +448,7 @@ - AVStream* st; - AVCodecContext* c; - AVCodec* codec; -- st = av_new_stream(of, 0); -+ st = avformat_new_stream(of, NULL); - if (!st) return NULL; - - /* Set up the codec context */ -@@ -515,24 +514,11 @@ - } - - // Keep lossless encodes in the RGB domain. -- if (codec_id == CODEC_ID_HUFFYUV) { -+ if (codec_id == CODEC_ID_HUFFYUV || codec_id == CODEC_ID_FFV1) { - /* HUFFYUV was PIX_FMT_YUV422P before */ - c->pix_fmt = PIX_FMT_RGB32; - } - -- if (codec_id == CODEC_ID_FFV1) { --#ifdef FFMPEG_FFV1_ALPHA_SUPPORTED -- if (rd->im_format.planes == R_IMF_PLANES_RGBA) { -- c->pix_fmt = PIX_FMT_RGB32; -- } -- else { -- c->pix_fmt = PIX_FMT_BGR0; -- } --#else -- c->pix_fmt = PIX_FMT_RGB32; --#endif -- } -- - if (codec_id == CODEC_ID_QTRLE ) { - if (rd->im_format.planes == R_IMF_PLANES_RGBA) { - c->pix_fmt = PIX_FMT_ARGB; -@@ -562,7 +548,7 @@ - - set_ffmpeg_properties(rd, c, "video"); - -- if (avcodec_open(c, codec) < 0) { -+ if (avcodec_open2(c, codec, NULL) < 0) { - // - //XXX error("Couldn't initialize codec"); - return NULL; -@@ -603,7 +589,7 @@ - AVCodecContext* c; - AVCodec* codec; - -- st = av_new_stream(of, 1); -+ st = avformat_new_stream(of, NULL); - if (!st) return NULL; - - c = st->codec; -@@ -612,7 +598,7 @@ - - c->sample_rate = rd->ffcodecdata.audio_mixrate; - c->bit_rate = ffmpeg_audio_bitrate*1000; -- c->sample_fmt = SAMPLE_FMT_S16; -+ c->sample_fmt = AV_SAMPLE_FMT_S16; - c->channels = rd->ffcodecdata.audio_channels; - codec = avcodec_find_encoder(c->codec_id); - if (!codec) { -@@ -622,7 +608,7 @@ - - set_ffmpeg_properties(rd, c, "audio"); - -- if (avcodec_open(c, codec) < 0) { -+ if (avcodec_open2(c, codec, NULL) < 0) { - //XXX error("Couldn't initialize audio codec"); - return NULL; - } -@@ -704,13 +690,10 @@ - of->oformat = fmt; - of->packet_size= rd->ffcodecdata.mux_packet_size; - if (ffmpeg_audio_codec != CODEC_ID_NONE) { -- of->mux_rate = rd->ffcodecdata.mux_rate; -- } -- else { -- of->mux_rate = 0; -+ av_opt_set_int(of, "muxrate", rd->ffcodecdata.mux_rate, 0); - } - -- of->preload = (int)(0.5*AV_TIME_BASE); -+ av_opt_set_int(of, "preload", (int)(0.5*AV_TIME_BASE), 0); - of->max_delay = (int)(0.7*AV_TIME_BASE); - - fmt->audio_codec = ffmpeg_audio_codec; -@@ -793,10 +776,6 @@ - return 0; - } - } -- if (av_set_parameters(of, NULL) < 0) { -- BKE_report(reports, RPT_ERROR, "Error setting output parameters."); -- return 0; -- } - if (!(fmt->flags & AVFMT_NOFILE)) { - if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) { - BKE_report(reports, RPT_ERROR, "Could not open file for writing."); -@@ -804,7 +783,7 @@ - } - } - -- if (av_write_header(of) < 0) { -+ if (avformat_write_header(of, NULL) < 0) { - BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination."); - return 0; - } -@@ -1102,7 +1081,7 @@ - - val.i = 0; - -- avcodec_get_context_defaults(&c); -+ avcodec_get_context_defaults3(&c, NULL); - - o = c.av_class->option + opt_index; - parent = c.av_class->option + parent_index; -@@ -1190,7 +1169,7 @@ - char * param; - IDProperty * prop; - -- avcodec_get_context_defaults(&c); -+ avcodec_get_context_defaults3(&c, NULL); - - strncpy(name_, str, sizeof(name_)); - -diff -urNb blender-2.63a.old//source/blender/imbuf/intern/anim_movie.c blender-2.63a.new//source/blender/imbuf/intern/anim_movie.c ---- blender-2.63a.old//source/blender/imbuf/intern/anim_movie.c 2012-05-10 16:50:59.000000000 +0200 -+++ blender-2.63a.new//source/blender/imbuf/intern/anim_movie.c 2012-07-14 00:12:49.157026789 +0200 -@@ -455,12 +455,12 @@ - - do_init_ffmpeg(); - -- if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) { -+ if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) { - return -1; - } - -- if (av_find_stream_info(pFormatCtx)<0) { -- av_close_input_file(pFormatCtx); -+ if (avformat_find_stream_info(pFormatCtx, NULL)<0) { -+ avformat_close_input(&pFormatCtx); - return -1; - } - -@@ -482,7 +482,7 @@ - } - - if (videoStream==-1) { -- av_close_input_file(pFormatCtx); -+ avformat_close_input(&pFormatCtx); - return -1; - } - -@@ -497,7 +497,7 @@ - - pCodecCtx->workaround_bugs = 1; - -- if (avcodec_open(pCodecCtx, pCodec) < 0) { -+ if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) { - av_close_input_file(pFormatCtx); - return -1; - } -@@ -990,7 +990,6 @@ - ret = av_seek_frame(anim->pFormatCtx, - -1, - pos, AVSEEK_FLAG_BYTE); -- av_update_cur_dts(anim->pFormatCtx, v_st, dts); - } - else { - av_log(anim->pFormatCtx, AV_LOG_DEBUG, -diff -urNb blender-2.63a.old//source/blender/imbuf/intern/indexer.c blender-2.63a.new//source/blender/imbuf/intern/indexer.c ---- blender-2.63a.old//source/blender/imbuf/intern/indexer.c 2012-05-10 16:50:59.000000000 +0200 -+++ blender-2.63a.new//source/blender/imbuf/intern/indexer.c 2012-07-14 00:23:44.775002926 +0200 -@@ -491,7 +491,7 @@ - - fprintf(stderr, "Starting work on proxy: %s\n", rv->of->filename); - -- rv->st = av_new_stream(rv->of, 0); -+ rv->st = avformat_new_stream(rv->of, NULL); - rv->c = rv->st->codec; - rv->c->codec_type = AVMEDIA_TYPE_VIDEO; - rv->c->codec_id = CODEC_ID_MJPEG; -@@ -533,13 +533,6 @@ - rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER; - } - -- if (av_set_parameters(rv->of, NULL) < 0) { -- fprintf(stderr, "Couldn't set output parameters? " -- "Proxy not built!\n"); -- av_free(rv->of); -- return 0; -- } -- - if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Couldn't open outputfile! " - "Proxy not built!\n"); -@@ -547,7 +540,7 @@ - return 0; - } - -- avcodec_open(rv->c, rv->codec); -+ avcodec_open2(rv->c, rv->codec, NULL); - - rv->video_buffersize = 2000000; - rv->video_buffer = (uint8_t*)MEM_mallocN( -@@ -576,7 +569,7 @@ - NULL, NULL, NULL); - } - -- av_write_header(rv->of); -+ avformat_write_header(rv->of, NULL); - - return rv; - } -@@ -739,12 +732,12 @@ - memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx)); - memset(context->indexer, 0, sizeof(context->indexer)); - -- if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) { -+ if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) { - MEM_freeN(context); - return NULL; - } - -- if (av_find_stream_info(context->iFormatCtx) < 0) { -+ if (avformat_find_stream_info(context->iFormatCtx, NULL) < 0) { - av_close_input_file(context->iFormatCtx); - MEM_freeN(context); - return NULL; -@@ -784,7 +777,7 @@ - - context->iCodecCtx->workaround_bugs = 1; - -- if (avcodec_open(context->iCodecCtx, context->iCodec) < 0) { -+ if (avcodec_open2(context->iCodecCtx, context->iCodec, NULL) < 0) { - av_close_input_file(context->iFormatCtx); - MEM_freeN(context); - return NULL; -diff -urNb blender-2.63a.old//source/blender/imbuf/intern/util.c blender-2.63a.new//source/blender/imbuf/intern/util.c ---- blender-2.63a.old//source/blender/imbuf/intern/util.c 2012-05-10 16:50:59.000000000 +0200 -+++ blender-2.63a.new//source/blender/imbuf/intern/util.c 2012-07-14 01:07:31.213907334 +0200 -@@ -261,14 +261,14 @@ - BLI_testextensie(filename, ".cin") || - BLI_testextensie(filename, ".wav")) return 0; - -- if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) { -+ if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) { - if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n"); - return 0; - } - -- if (av_find_stream_info(pFormatCtx)<0) { -+ if (avformat_find_stream_info(pFormatCtx, NULL)<0) { - if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_find_stream_info failed\n"); -- av_close_input_file(pFormatCtx); -+ avformat_close_input(&pFormatCtx); - return 0; - } - -@@ -300,7 +300,7 @@ - return 0; - } - -- if (avcodec_open(pCodecCtx, pCodec)<0) { -+ if (avcodec_open2(pCodecCtx, pCodec, NULL)<0) { - av_close_input_file(pFormatCtx); - return 0; - } -diff -urNb blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.cpp ---- blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.cpp 2012-05-10 16:48:50.000000000 +0200 -+++ blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.cpp 2012-07-13 21:22:36.464398523 +0200 -@@ -162,19 +162,19 @@ - } - - --int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams) -+int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary *opts) - { - AVFormatContext *formatCtx; - int i, videoStream; - AVCodec *codec; - AVCodecContext *codecCtx; - -- if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0) -+ if (avformat_open_input(&formatCtx, filename, inputFormat, &opts)!=0) - return -1; - -- if (av_find_stream_info(formatCtx)<0) -+ if (avformat_find_stream_info(formatCtx, &opts)<0) - { -- av_close_input_file(formatCtx); -+ avformat_close_input(&formatCtx); - return -1; - } - -@@ -203,13 +203,13 @@ - codec=avcodec_find_decoder(codecCtx->codec_id); - if (codec==NULL) - { -- av_close_input_file(formatCtx); -+ avformat_close_input(&formatCtx); - return -1; - } - codecCtx->workaround_bugs = 1; -- if (avcodec_open(codecCtx, codec)<0) -+ if (avcodec_open2(codecCtx, codec, &opts)<0) - { -- av_close_input_file(formatCtx); -+ avformat_close_input(&formatCtx); - return -1; - } - -@@ -546,7 +546,7 @@ - // It would be good to find this information from the context but there are no simple indication - !strncmp(filename, "http://", 7) || - #ifdef FFMPEG_PB_IS_POINTER -- (m_formatCtx->pb && m_formatCtx->pb->is_streamed) -+ (m_formatCtx->pb && m_formatCtx->pb->seekable) - #else - m_formatCtx->pb.is_streamed - #endif -@@ -586,13 +586,12 @@ - { - // open camera source - AVInputFormat *inputFormat; -- AVFormatParameters formatParams; -+ AVDictionary *opts = NULL; - AVRational frameRate; -- char *p, filename[28], rateStr[20]; -+ char *p, filename[28], videoStr[20], rateStr[20]; - - do_init_ffmpeg(); - -- memset(&formatParams, 0, sizeof(formatParams)); - #ifdef WIN32 - // video capture on windows only through Video For Windows driver - inputFormat = av_find_input_format("vfwcap"); -@@ -637,21 +636,18 @@ - *p = 0; - } - if (file && (p = strchr(file, ':')) != NULL) -- formatParams.standard = p+1; -+ av_dict_set(&opts, "standard", p+1, 0); - #endif - //frame rate - if (m_captRate <= 0.f) - m_captRate = defFrameRate; - sprintf(rateStr, "%f", m_captRate); -- av_parse_video_rate(&frameRate, rateStr); -- // populate format parameters -- // need to specify the time base = inverse of rate -- formatParams.time_base.num = frameRate.den; -- formatParams.time_base.den = frameRate.num; -- formatParams.width = m_captWidth; -- formatParams.height = m_captHeight; -+ av_dict_set(&opts, "framerate", rateStr, 0); -+ -+ sprintf(videoStr, "%dx%d", m_captWidth, m_captHeight); -+ av_dict_set(&opts, "video_size", videoStr, 0); - -- if (openStream(filename, inputFormat, &formatParams) != 0) -+ if (openStream(filename, inputFormat, opts) != 0) - return; - - // for video capture it is important to do non blocking read -diff -urNb blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.h ---- blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.h 2012-05-10 16:48:50.000000000 +0200 -+++ blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.h 2012-07-13 21:22:36.463398523 +0200 -@@ -172,7 +172,7 @@ - double actFrameRate (void) { return m_frameRate * m_baseFrameRate; } - - /// common function to video file and capture -- int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams); -+ int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary *opts); - - /// check if a frame is available and load it in pFrame, return true if a frame could be retrieved - AVFrame* grabFrame(long frame); |