[blender] New upstream release
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Oct 19 18:48:06 UTC 2011
commit 57c89447f27e6fe75105bfca51ea51316974eb44
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Oct 19 20:48:06 2011 +0200
New upstream release
.gitignore | 1 +
blender-2.48-python64.patch | 15 ----------
blender-2.57-cmake_include.patch | 12 --------
blender-2.58-nobuffer_ftoa_utf_link.patch | Bin 5259 -> 0 bytes
....58-syspath.patch => blender-2.60-syspath.patch | 30 +++++++++----------
blender.spec | 20 ++++++-------
sources | 2 +-
7 files changed, 25 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f58e319..3db6d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ blender-2.49b-repack.tar.bz2
/blender-2.58.tgz
/blender-2.58a.tar.gz
/blender-2.59.tar.gz
+/blender-2.60.tar.gz
diff --git a/blender-2.58-syspath.patch b/blender-2.60-syspath.patch
similarity index 58%
rename from blender-2.58-syspath.patch
rename to blender-2.60-syspath.patch
index 7e26d59..b1b5431 100644
--- a/blender-2.58-syspath.patch
+++ b/blender-2.60-syspath.patch
@@ -1,7 +1,7 @@
-diff -up blender-2.57/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.57/source/blender/blenfont/intern/blf_lang.c
---- blender-2.57/source/blender/blenfont/intern/blf_lang.c.syspath 2011-04-14 17:19:49.000000000 +0200
-+++ blender-2.57/source/blender/blenfont/intern/blf_lang.c 2011-04-16 21:26:46.734205021 +0200
-@@ -68,15 +68,15 @@ static char global_encoding_name[32];
+diff -up blender-2.60/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.60/source/blender/blenfont/intern/blf_lang.c
+--- blender-2.60/source/blender/blenfont/intern/blf_lang.c.syspath 2011-10-19 17:02:14.000000000 +0200
++++ blender-2.60/source/blender/blenfont/intern/blf_lang.c 2011-10-19 19:55:35.713250764 +0200
+@@ -99,15 +99,15 @@ static const char *locales[] = {
void BLF_lang_init(void)
{
@@ -20,15 +20,13 @@ diff -up blender-2.57/source/blender/blenfont/intern/blf_lang.c.syspath blender-
}
/* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */
-diff -up blender-2.58/source/blender/blenlib/intern/path_util.c.sp blender-2.58/source/blender/blenlib/intern/path_util.c
---- blender-2.58/source/blender/blenlib/intern/path_util.c.sp 2011-06-22 17:24:58.000000000 +0200
-+++ blender-2.58/source/blender/blenlib/intern/path_util.c 2011-06-30 17:47:50.532000005 +0200
-@@ -955,42 +955,7 @@ static int get_path_user(char *targetpat
- static int get_path_system(char *targetpath, const char *folder_name, const char *subfolder_name, const char *envvar, const int ver)
- {
+diff -up blender-2.60/source/blender/blenlib/intern/path_util.c.syspath blender-2.60/source/blender/blenlib/intern/path_util.c
+--- blender-2.60/source/blender/blenlib/intern/path_util.c.syspath 2011-10-19 17:02:11.000000000 +0200
++++ blender-2.60/source/blender/blenlib/intern/path_util.c 2011-10-19 20:04:44.681217452 +0200
+@@ -958,41 +958,6 @@ static int get_path_system(char *targetp
char system_path[FILE_MAX];
-- const char *system_base_path;
--
+ const char *system_base_path;
+
-
- /* first allow developer only overrides to the system path
- * these are only used when running blender from source */
@@ -37,7 +35,7 @@ diff -up blender-2.58/source/blender/blenlib/intern/path_util.c.sp blender-2.58/
- char bprogdir[FILE_MAX];
-
- /* use argv[0] (bprogname) to get the path to the executable */
-- BLI_split_dirfile(bprogname, bprogdir, NULL);
+- BLI_split_dirfile(bprogname, bprogdir, NULL, sizeof(bprogdir), 0);
-
- if(folder_name) {
- if (subfolder_name) {
@@ -63,7 +61,7 @@ diff -up blender-2.58/source/blender/blenlib/intern/path_util.c.sp blender-2.58/
- /* end developer overrides */
-
-
-+ const char *system_base_path;
-
+-
system_path[0] = '\0';
-
\ No newline at end of file
+
+ if (test_env_path(system_path, envvar)) {
diff --git a/blender.spec b/blender.spec
index 081f84a..c00c53c 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.59
+%global blender_api 2.60
# [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')
@@ -11,7 +11,7 @@
Name: blender
Epoch: 1
-Version: 2.59
+Version: 2.60
Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -27,15 +27,12 @@ Source5: blender.xml
Source10: macros.blender
Patch1: blender-2.44-bid.patch
-Patch2: blender-2.58-syspath.patch
+Patch2: blender-2.60-syspath.patch
-Patch3: blender-2.48-python64.patch
Patch4: blender-2.48-undefine-operation.patch
Patch5: blender-2.50-uninit-var.patch
Patch6: blender-2.56-gcc46.patch
-Patch7: blender-2.57-cmake_include.patch
-Patch8: blender-2.58-nobuffer_ftoa_utf_link.patch
-Patch9: blender-2.58-include_install_dir.patch
+
Patch10: blender-2.58-python_include.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,13 +137,11 @@ addon packages to extend blender.
%setup -q
%patch1 -p1 -b .bid
%patch2 -p1 -b .syspath
-%patch3 -p0
+
%patch4 -p0
%patch5 -p0
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-# %patch9 -p1
+
%patch10 -p1
find -name '.svn' -print | xargs rm -rf
@@ -301,6 +296,9 @@ fi || :
%{_sysconfdir}/rpm/macros.blender
%changelog
+* Wed Oct 19 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.60-1
+- New upstream release
+
* Sun Aug 14 2011 Jochen Schmitt <JOchen herr-schmitt de> 1:2.59-1
- New upstream release
diff --git a/sources b/sources
index d681ee8..24b2eca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f68fe3c3c2b6a85f1ba9ebc5b1155fe blender-2.59.tar.gz
+2951df9d5f004c5e0375b53969205a38 blender-2.60.tar.gz
More information about the scm-commits
mailing list