diff --git a/.gitignore b/.gitignore index ffa9b38..7f67625 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.62.tar.gz /blender-2.63.tar.gz /blender-2.63a.tar.gz +/blender-2.64.tar.gz diff --git a/blender-2.44-bid.patch b/blender-2.44-bid.patch deleted file mode 100644 index e6acba8..0000000 --- a/blender-2.44-bid.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- blender-2.44/release/plugins/bmake.bid 2004-12-27 20:28:48.000000000 +0100 -+++ blender-2.44/release/plugins/bmake 2007-08-09 18:13:34.000000000 +0200 -@@ -60,10 +60,10 @@ elif ( test $UNAME = "OpenBSD" ) then - LDFLAGS="-Bshareable"; - elif ( test $UNAME = "Linux" ) then - CC="gcc"; -- CFLAGS="-fPIC -funsigned-char -O2"; -+ CFLAGS="${RPM_OPT_FLAGS} -fPIC -funsigned-char"; - -- LD="ld"; -- LDFLAGS="-Bshareable"; -+ LD="gcc"; -+ LDFLAGS="--shared ${RPM_OPT_FLAGS}"; - elif ( test $UNAME = "SunOS" ) then - CC="cc"; - CFLAGS="-O"; diff --git a/blender-2.48-undefine-operation.patch b/blender-2.48-undefine-operation.patch deleted file mode 100644 index 4dc331e..0000000 --- a/blender-2.48-undefine-operation.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: release/plugins/sequence/dnr.c -=================================================================== ---- release/plugins/sequence/dnr.c.orig 2008-11-12 23:16:53.000000000 +0200 -+++ release/plugins/sequence/dnr.c 2010-10-28 14:56:30.000000000 +0200 -@@ -110,9 +110,12 @@ static void doit(unsigned char * src_, u - unsigned char * dst = dst_; - - while (count--) { -- *dst = table[(*src++ << 8) | *dst]; dst++; -- *dst = table[(*src++ << 8) | *dst]; dst++; -- *dst = table[(*src++ << 8) | *dst]; dst++; -+ *dst = table[(*src++ << 8) | *dst]; -+ dst++; -+ *dst = table[(*src++ << 8) | *dst]; -+ dst++; -+ *dst = table[(*src++ << 8) | *dst]; -+ dst++; - *dst++ = *src++; - } - diff --git a/blender-2.50-uninit-var.patch b/blender-2.50-uninit-var.patch deleted file mode 100644 index 73bc315..0000000 --- a/blender-2.50-uninit-var.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: extern/bullet2/src/LinearMath/btVector3.h -=================================================================== ---- extern/bullet2/src/LinearMath/btVector3.h.orig 2009-03-17 23:44:58.000000000 +0200 -+++ extern/bullet2/src/LinearMath/btVector3.h 2010-10-28 14:56:38.000000000 +0200 -@@ -63,7 +63,8 @@ public: - public: - - /**@brief No initialization constructor */ -- SIMD_FORCE_INLINE btVector3() {} -+ SIMD_FORCE_INLINE btVector3() { -+ m_floats[0]=m_floats[1]=m_floats[2]=m_floats[3]=btScalar(0.);} - - - -Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h -=================================================================== ---- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h.orig 2009-09-14 16:45:32.000000000 +0200 -+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2010-10-28 14:56:38.000000000 +0200 -@@ -94,7 +94,8 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimized - //for child nodes - int m_subPart; - int m_triangleIndex; -- int m_padding[5];//bad, due to alignment -+ int:5*8*sizeof(int); -+// int m_padding[5];//bad, due to alignment - - - }; diff --git a/blender-2.58-blenkernel.patch b/blender-2.58-blenkernel.patch deleted file mode 100644 index 8190bd6..0000000 --- a/blender-2.58-blenkernel.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur blender-cycles-2.58.orig/source/blender/blenkernel/CMakeLists.txt blender-cycles-2.58/source/blender/blenkernel/CMakeLists.txt ---- blender-cycles-2.58.orig/source/blender/blenkernel/CMakeLists.txt 2011-06-28 10:00:42.821785000 -0500 -+++ blender-cycles-2.58/source/blender/blenkernel/CMakeLists.txt 2011-07-07 10:41:51.119709118 -0500 -@@ -144,7 +144,6 @@ - intern/unit.c - intern/world.c - intern/writeavi.c -- intern/writeffmpeg.c - intern/writeframeserver.c - - BKE_DerivedMesh.h -@@ -225,7 +224,6 @@ - BKE_utildefines.h - BKE_world.h - BKE_writeavi.h -- BKE_writeffmpeg.h - BKE_writeframeserver.h - depsgraph_private.h - intern/CCGSubSurf.h -diff -Naur blender-cycles-2.58.orig/source/gameengine/VideoTexture/CMakeLists.txt blender-cycles-2.58/source/gameengine/VideoTexture/CMakeLists.txt ---- blender-cycles-2.58.orig/source/gameengine/VideoTexture/CMakeLists.txt 2011-06-21 10:47:18.042624000 -0500 -+++ blender-cycles-2.58/source/gameengine/VideoTexture/CMakeLists.txt 2011-07-07 10:43:00.184382880 -0500 -@@ -67,7 +67,6 @@ - PyTypeList.cpp - Texture.cpp - VideoBase.cpp -- VideoFFmpeg.cpp - blendVideoTex.cpp - - BlendType.h -@@ -86,7 +85,6 @@ - PyTypeList.h - Texture.h - VideoBase.h -- VideoFFmpeg.h - ) - - if(WITH_CODEC_FFMPEG) diff --git a/blender-2.58-include_install_dir.patch b/blender-2.58-include_install_dir.patch deleted file mode 100644 index 713c5c3..0000000 --- a/blender-2.58-include_install_dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur blender.orig/source/creator/CMakeLists.txt blender/source/creator/CMakeLists.txt ---- blender.orig/source/creator/CMakeLists.txt 2011-06-28 10:00:42.821785000 -0500 -+++ blender/source/creator/CMakeLists.txt 2011-08-04 15:59:20.323230307 -0500 -@@ -242,7 +242,7 @@ - ${CMAKE_SOURCE_DIR}/intern/guardedalloc/MEM_guardedalloc.h - ${CMAKE_SOURCE_DIR}/source/blender/blenloader/BLO_sys_types.h - ${CMAKE_SOURCE_DIR}/source/blender/makesdna/DNA_listBase.h -- DESTINATION ${INCLUDE_OUTPUT_PATH}) -+ DESTINATION ${INCLUDE_INSTALL_DIR}) - - # install target - if(UNIX AND NOT APPLE) diff --git a/blender-2.61-openjpeg_stdbool.patch b/blender-2.61-openjpeg_stdbool.patch deleted file mode 100644 index f0eb9bb..0000000 --- a/blender-2.61-openjpeg_stdbool.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up blender-2.61/source/blender/imbuf/intern/jp2.c.stdbool blender-2.61/source/blender/imbuf/intern/jp2.c ---- blender-2.61/source/blender/imbuf/intern/jp2.c.stdbool 2011-12-13 13:50:45.000000000 -0600 -+++ blender-2.61/source/blender/imbuf/intern/jp2.c 2012-02-11 22:24:26.078025463 -0600 -@@ -36,6 +36,7 @@ - #include "IMB_allocimbuf.h" - #include "IMB_filetype.h" - -+#include - #include "openjpeg.h" - - #define JP2_FILEHEADER_SIZE 14 diff --git a/blender-2.63-syspath.patch b/blender-2.63-syspath.patch deleted file mode 100644 index e3920dd..0000000 --- a/blender-2.63-syspath.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up blender-2.63/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.63/source/blender/blenfont/intern/blf_lang.c ---- blender-2.63/source/blender/blenfont/intern/blf_lang.c.syspath 2012-04-26 22:51:30.000000000 +0200 -+++ blender-2.63/source/blender/blenfont/intern/blf_lang.c 2012-04-27 22:47:56.812999801 +0200 -@@ -110,17 +110,7 @@ static const char *locales[] = { - - void BLF_lang_init(void) - { -- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); -- -- BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); -- -- if (messagepath) { -- BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); -- } -- else { -- printf("%s: 'locale' data path for translations not found, continuing\n", __func__); -- global_messagepath[0] = '\0'; -- } -+ *global_messagepath = "/usr/share/locale/"; - - } - -diff -up blender-2.63/source/blender/blenlib/intern/path_util.c.syspath blender-2.63/source/blender/blenlib/intern/path_util.c ---- blender-2.63/source/blender/blenlib/intern/path_util.c.syspath 2012-04-26 22:51:28.000000000 +0200 -+++ blender-2.63/source/blender/blenlib/intern/path_util.c 2012-04-27 23:00:51.268999825 +0200 -@@ -994,38 +994,6 @@ static int get_path_system(char *targetp - char system_path[FILE_MAX]; - const char *system_base_path; - -- -- /* first allow developer only overrides to the system path -- * these are only used when running blender from source */ -- char cwd[FILE_MAX]; -- char relfolder[FILE_MAX]; -- -- if (folder_name) { -- if (subfolder_name) { -- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); -- } -- else { -- BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); -- } -- } -- else { -- relfolder[0]= '\0'; -- } -- -- /* try CWD/release/folder_name */ -- if (BLI_current_working_dir(cwd, sizeof(cwd))) { -- if (test_path(targetpath, cwd, "release", relfolder)) { -- return 1; -- } -- } -- -- /* try EXECUTABLE_DIR/release/folder_name */ -- if (test_path(targetpath, bprogdir, "release", relfolder)) -- return 1; -- /* end developer overrides */ -- -- -- - system_path[0] = '\0'; - - if (test_env_path(system_path, envvar)) { diff --git a/blender-2.63a-cve.patch b/blender-2.63a-cve.patch deleted file mode 100644 index d3ef24a..0000000 --- a/blender-2.63a-cve.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up blender-2.63a/source/blender/blenkernel/intern/blender.c.cve blender-2.63a/source/blender/blenkernel/intern/blender.c ---- blender-2.63a/source/blender/blenkernel/intern/blender.c.cve 2012-05-10 16:50:20.000000000 +0200 -+++ blender-2.63a/source/blender/blenkernel/intern/blender.c 2012-09-07 10:10:05.518999947 +0200 -@@ -40,6 +40,7 @@ - # define write _write - #endif - -+#include - #include - #include - #include -@@ -706,7 +707,8 @@ void BKE_undo_save_quit(void) - { - UndoElem *uel; - MemFileChunk *chunk; -- int file; -+ int file = -1; -+ int flags = O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL; - char str[FILE_MAX]; - - if ( (U.uiflag & USER_GLOBALUNDO)==0) return; -@@ -722,10 +724,16 @@ void BKE_undo_save_quit(void) - - BLI_make_file_string("/", str, BLI_temporary_dir(), "quit.blend"); - -- file = BLI_open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); -- if (file == -1) { -- //XXX error("Unable to save %s, check you have permissions", str); -- return; -+ while (file == -1) { -+ file = BLI_open(str,flags, 0666); -+ if (file == -1) { -+ if (errno == EEXIST) { -+ flags ^= O_CREAT; -+ } else { -+ //XXX error("Unable to save %s, check you have permissions", str); -+ return; -+ } -+ } - } - - chunk= uel->memfile.chunks.first; diff --git a/blender-2.64-openjpeg_stdbool.patch b/blender-2.64-openjpeg_stdbool.patch new file mode 100644 index 0000000..6f58548 --- /dev/null +++ b/blender-2.64-openjpeg_stdbool.patch @@ -0,0 +1,11 @@ +diff -up blender-2.64/source/blender/imbuf/intern/jp2.c.openjpeg_stdbool blender-2.64/source/blender/imbuf/intern/jp2.c +--- blender-2.64/source/blender/imbuf/intern/jp2.c.openjpeg_stdbool 2012-10-03 16:43:39.000000000 +0200 ++++ blender-2.64/source/blender/imbuf/intern/jp2.c 2012-10-03 20:00:25.238000524 +0200 +@@ -39,6 +39,7 @@ + #include "IMB_colormanagement.h" + #include "IMB_colormanagement_intern.h" + ++#include + #include "openjpeg.h" + + #define JP2_FILEHEADER_SIZE 14 diff --git a/blender-2.64-syspath.patch b/blender-2.64-syspath.patch new file mode 100644 index 0000000..7e261d4 --- /dev/null +++ b/blender-2.64-syspath.patch @@ -0,0 +1,60 @@ +diff -up blender-2.64/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.64/source/blender/blenfont/intern/blf_lang.c +--- blender-2.64/source/blender/blenfont/intern/blf_lang.c.syspath 2012-10-03 16:43:53.000000000 +0200 ++++ blender-2.64/source/blender/blenfont/intern/blf_lang.c 2012-10-03 20:57:24.878000025 +0200 +@@ -117,13 +117,7 @@ void BLF_lang_init(void) + + BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); + +- if (messagepath) { +- BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); +- } +- else { +- printf("%s: 'locale' data path for translations not found, continuing\n", __func__); +- global_messagepath[0] = '\0'; +- } ++ *global_messagepath = "/usr/share/locale/"; + } + + /* Get LANG/LANGUAGE environment variable. */ +diff -up blender-2.64/source/blender/blenlib/intern/path_util.c.syspath blender-2.64/source/blender/blenlib/intern/path_util.c +--- blender-2.64/source/blender/blenlib/intern/path_util.c.syspath 2012-10-03 16:43:53.000000000 +0200 ++++ blender-2.64/source/blender/blenlib/intern/path_util.c 2012-10-03 20:51:37.886000008 +0200 +@@ -983,38 +983,6 @@ static int get_path_system(char *targetp + char system_path[FILE_MAX]; + const char *system_base_path; + +- +- /* first allow developer only overrides to the system path +- * these are only used when running blender from source */ +- char cwd[FILE_MAX]; +- char relfolder[FILE_MAX]; +- +- if (folder_name) { +- if (subfolder_name) { +- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); +- } +- else { +- BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); +- } +- } +- else { +- relfolder[0] = '\0'; +- } +- +- /* try CWD/release/folder_name */ +- if (BLI_current_working_dir(cwd, sizeof(cwd))) { +- if (test_path(targetpath, cwd, "release", relfolder)) { +- return 1; +- } +- } +- +- /* try EXECUTABLE_DIR/release/folder_name */ +- if (test_path(targetpath, bprogdir, "release", relfolder)) +- return 1; +- /* end developer overrides */ +- +- +- + system_path[0] = '\0'; + + if (test_env_path(system_path, envvar)) { diff --git a/blender-boost150.patch b/blender-boost150.patch deleted file mode 100644 index 1df6e81..0000000 --- a/blender-boost150.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: intern/cycles/util/util_cache.cpp -=================================================================== ---- intern/cycles/util/util_cache.cpp (revision 48835) -+++ intern/cycles/util/util_cache.cpp (revision 48836) -@@ -26,8 +26,6 @@ - #include "util_path.h" - #include "util_types.h" - --#define BOOST_FILESYSTEM_VERSION 2 -- - #include - #include - -@@ -117,7 +115,7 @@ - boost::filesystem::directory_iterator it(dir), it_end; - - for(; it != it_end; it++) { -- string filename = it->path().filename(); -+ string filename = it->path().filename().string(); - - if(boost::starts_with(filename, name)) - if(except.find(filename) == except.end()) -Index: intern/cycles/util/util_path.cpp -=================================================================== ---- intern/cycles/util/util_path.cpp (revision 48835) -+++ intern/cycles/util/util_path.cpp (revision 48836) -@@ -26,8 +26,6 @@ - - #include - --#define BOOST_FILESYSTEM_VERSION 2 -- - #include - #include - -@@ -60,7 +58,7 @@ - - string path_filename(const string& path) - { -- return boost::filesystem::path(path).filename(); -+ return boost::filesystem::path(path).filename().string(); - } - - string path_dirname(const string& path) diff --git a/blender.spec b/blender.spec index 9fb7475..417984c 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.63 +%global blender_api 2.64 # [Fedora] Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -12,8 +12,8 @@ Name: blender Epoch: 1 -Version: %{blender_api}a -Release: 10%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -27,18 +27,10 @@ Source5: blender.xml Source10: macros.blender -Patch1: blender-2.44-bid.patch -Patch2: blender-2.63-syspath.patch +Patch1: blender-2.64-syspath.patch -Patch4: blender-2.48-undefine-operation.patch -Patch5: blender-2.50-uninit-var.patch - -Patch10: blender-2.58-python_include.patch -Patch11: blender-2.61-openjpeg_stdbool.patch -Patch12: blender-boost150.patch - -# Security Patch for CVE-2008-1103 -Patch13: blender-2.63a-cve.patch +Patch2: blender-2.58-python_include.patch +Patch3: blender-2.64-openjpeg_stdbool.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -142,18 +134,11 @@ This package provides rpm macros to support the creation of third-party addon packages to extend blender. %prep -%setup -q -%patch1 -p1 -b .bid -%patch2 -p1 -b .syspath - -%patch4 -p0 -%patch5 -p0 - -%patch10 -p1 -%patch11 -p1 -b .openjpeg_stdbool -%patch12 -p0 -b .boost - -%patch13 -p1 -b .cve +%setup -q + +%patch1 -p1 -b .syspath +%patch2 -p1 +%patch3 -p1 -b .openjpeg_stdbool find -name '.svn' -print | xargs rm -rf @@ -186,14 +171,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_PLAYER=ON make -cd .. - -install -d release/plugins/include -install -m 644 source/blender/blenpluginapi/*.h release/plugins/include - -chmod +x release/plugins/bmake - -make -C release/plugins/ %install cd cmake-make @@ -206,13 +183,6 @@ cd .. mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/texture} -# -# Install plugins -# - -install -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence -install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture - find release/datafiles/locale -name '.svn' -exec rm -f {} ';' cp -a release/datafiles/locale ${RPM_BUILD_ROOT}%{_datadir} @@ -300,6 +270,9 @@ fi || : %{_sysconfdir}/rpm/macros.blender %changelog +* Wed Oct 3 2012 Jochen Schmitt - 1:2.64-1 +- New upstream release + * Fri Sep 7 2012 Jochen Schmitt - 1:2.63a-10 - Add forgotten O_EXCL to CVE-patch diff --git a/sources b/sources index a323880..64cd479 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31a60b3ce5466d965cb7e2648995e092 blender-2.63a.tar.gz +caec080d2a3dcd57fe1ca20c51c00e53 blender-2.64.tar.gz