[blender] New upstream release
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Oct 3 20:40:07 UTC 2012
commit bf7a74566166f60da9c36ca607cc8c5c13b8ca0b
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Oct 3 22:39:22 2012 +0200
New upstream release
.gitignore | 1 +
blender-2.44-bid.patch | 16 ------
blender-2.48-undefine-operation.patch | 20 -------
blender-2.50-uninit-var.patch | 28 ----------
blender-2.58-blenkernel.patch | 38 --------------
blender-2.58-include_install_dir.patch | 12 ----
blender-2.61-openjpeg_stdbool.patch | 11 ----
blender-2.63a-cve.patch | 42 ---------------
blender-2.64-openjpeg_stdbool.patch | 11 ++++
....63-syspath.patch => blender-2.64-syspath.patch | 30 +++++------
blender-boost150.patch | 44 ----------------
blender.spec | 55 +++++---------------
sources | 2 +-
13 files changed, 40 insertions(+), 270 deletions(-)
---
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.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 <stdbool.h>
+ #include "openjpeg.h"
+
+ #define JP2_FILEHEADER_SIZE 14
diff --git a/blender-2.63-syspath.patch b/blender-2.64-syspath.patch
similarity index 52%
rename from blender-2.63-syspath.patch
rename to blender-2.64-syspath.patch
index e3920dd..7e261d4 100644
--- a/blender-2.63-syspath.patch
+++ b/blender-2.64-syspath.patch
@@ -1,14 +1,10 @@
-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[] = {
+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));
- 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));
- }
@@ -16,14 +12,14 @@ diff -up blender-2.63/source/blender/blenfont/intern/blf_lang.c.syspath blender-
- printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
- global_messagepath[0] = '\0';
- }
-+ *global_messagepath = "/usr/share/locale/";
-
++ *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
+ /* 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;
@@ -42,7 +38,7 @@ diff -up blender-2.63/source/blender/blenlib/intern/path_util.c.syspath blender-
- }
- }
- else {
-- relfolder[0]= '\0';
+- relfolder[0] = '\0';
- }
-
- /* try CWD/release/folder_name */
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 <Jochen herr-schmitt de> - 1:2.64-1
+- New upstream release
+
* Fri Sep 7 2012 Jochen Schmitt <JOchen herr-schmitt de> - 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
More information about the scm-commits
mailing list