[blender/f18] New upstream release
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Dec 13 11:57:02 UTC 2012
commit 1f229ef0448e84321d4e18561a1552a111ed30a1
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Dec 13 11:41:42 2012 +0100
New upstream release
.gitignore | 1 +
blender-2.58-python_include.patch | 11 -----
blender-2.64-syspath.patch | 60 -------------------------
blender-2.64a-droid.patch | 88 -------------------------------------
blender-2.65-droid.patch | 74 +++++++++++++++++++++++++++++++
blender-2.65-syspath.patch | 63 ++++++++++++++++++++++++++
blender.spec | 40 +++++++++--------
sources | 2 +-
8 files changed, 161 insertions(+), 178 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a312ab7..f1aff71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ blender-2.49b-repack.tar.bz2
/blender-2.63a.tar.gz
/blender-2.64.tar.gz
/blender-2.64a.tar.gz
+/blender-2.65.tar.gz
diff --git a/blender-2.65-droid.patch b/blender-2.65-droid.patch
new file mode 100644
index 0000000..ea03cb9
--- /dev/null
+++ b/blender-2.65-droid.patch
@@ -0,0 +1,74 @@
+diff -up blender-2.65/source/blender/blenfont/intern/blf_translation.c.droid blender-2.65/source/blender/blenfont/intern/blf_translation.c
+--- blender-2.65/source/blender/blenfont/intern/blf_translation.c.droid 2012-12-10 20:25:45.000000000 +0100
++++ blender-2.65/source/blender/blenfont/intern/blf_translation.c 2012-12-11 22:22:12.890424604 +0100
+@@ -53,18 +53,12 @@ static int unifont_size = 0;
+
+ unsigned char *BLF_get_unifont(int *unifont_size_r)
+ {
+- if (unifont_ttf == NULL) {
+- char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
+- if (fontpath) {
+- char unifont_path[1024];
+-
+- BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
++ const char *fontpath = "/usr/share/fonts/google-droid";
+
+- unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
+- }
+- else {
+- printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
+- }
++ if (unifont_ttf == NULL) {
++ char unifont_path[1024];
++ BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
++ unifont_ttf = (unsigned char *)BLI_file_to_mem(unifont_path, &unifont_size);
+ }
+
+ *unifont_size_r = unifont_size;
+diff -up blender-2.65/source/blender/blenlib/BLI_fileops.h.droid blender-2.65/source/blender/blenlib/BLI_fileops.h
+--- blender-2.65/source/blender/blenlib/BLI_fileops.h.droid 2012-12-10 20:25:44.000000000 +0100
++++ blender-2.65/source/blender/blenlib/BLI_fileops.h 2012-12-11 22:04:17.442332100 +0100
+@@ -81,6 +81,8 @@ int BLI_file_touch(const char *file);
+ int BLI_file_gzip(const char *from, const char *to);
+ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r);
+
++char *BLI_file_to_mem(const char *from_file, int *size_r);
++
+ size_t BLI_file_descriptor_size(int file);
+ size_t BLI_file_size(const char *file);
+
+diff -up blender-2.65/source/blender/blenlib/intern/fileops.c.droid blender-2.65/source/blender/blenlib/intern/fileops.c
+--- blender-2.65/source/blender/blenlib/intern/fileops.c.droid 2012-12-10 20:25:44.000000000 +0100
++++ blender-2.65/source/blender/blenlib/intern/fileops.c 2012-12-11 22:04:17.442332100 +0100
+@@ -155,6 +155,31 @@ char *BLI_file_ungzip_to_mem(const char
+ return mem;
+ }
+
++char *BLI_file_to_mem(const char *from_file, int *size_r)
++{
++ int file;
++ int size = 0;
++ char *mem = NULL;
++
++ file = BLI_open(from_file, O_RDONLY, 0);
++
++ size = BLI_file_descriptor_size(file);
++
++ if (size == 0) {
++ close (file);
++ return 0;
++ }
++
++ mem = MEM_callocN(size, "BLI_ungzip_to_mem");
++
++ read(file, mem, size);
++
++ close (file);
++
++ *size_r = size;
++
++ return mem;
++}
+
+ /* return 1 when file can be written */
+ int BLI_file_is_writable(const char *filename)
diff --git a/blender-2.65-syspath.patch b/blender-2.65-syspath.patch
new file mode 100644
index 0000000..4351983
--- /dev/null
+++ b/blender-2.65-syspath.patch
@@ -0,0 +1,63 @@
+diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.65/source/blender/blenfont/intern/blf_lang.c
+--- blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath 2012-12-10 20:25:45.000000000 +0100
++++ blender-2.65/source/blender/blenfont/intern/blf_lang.c 2012-12-13 10:38:50.273961152 +0100
+@@ -83,7 +83,7 @@ static void free_locales(void)
+
+ static void fill_locales(void)
+ {
+- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
++ char *languages_path = "/usr/share/blender";
+ LinkNode *lines = NULL, *line;
+ char *str;
+ int idx = 0;
+@@ -184,7 +184,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_prop
+
+ void BLF_lang_init(void)
+ {
+- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
++ char *messagepath = "/usr/share/locale";
+
+ if (messagepath) {
+ bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
+diff -up blender-2.65/source/blender/blenlib/intern/path_util.c.syspath blender-2.65/source/blender/blenlib/intern/path_util.c
+--- blender-2.65/source/blender/blenlib/intern/path_util.c.syspath 2012-12-10 20:25:44.000000000 +0100
++++ blender-2.65/source/blender/blenlib/intern/path_util.c 2012-12-11 23:06:50.847028569 +0100
+@@ -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.spec b/blender.spec
index ed8c266..853b1b2 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.64
+%global blender_api 2.65
# [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: 3%{?dist}
+Version: %{blender_api}
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -27,22 +27,20 @@ Source5: blender.xml
Source10: macros.blender
-Patch1: blender-2.64-syspath.patch
+Patch1: blender-2.65-syspath.patch
-Patch2: blender-2.58-python_include.patch
-Patch3: blender-2.64-openjpeg_stdbool.patch
# fix build on non-x86 64-bit arches
-Patch4: blender-2.64-64bit.patch
+Patch2: blender-2.64-64bit.patch
-Patch5: blender-2.64a-droid.patch
+Patch3: blender-2.65-droid.patch
# fix typo in big endian support
-Patch6: blender-2.64a-big-endian.patch
+Patch4: blender-2.64a-big-endian.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libtool
BuildRequires: openssl-devel
-BuildRequires: python3-devel >= 3.2
+BuildRequires: python3-devel >= 3.3
BuildRequires: cmake
BuildRequires: SDL-devel
BuildRequires: expat-devel
@@ -90,6 +88,8 @@ BuildRequires: jack-audio-connection-kit-devel
BuildRequires: openCOLLADA-devel >= svn825
+BuildRequires: subversion-devel
+
BuildRequires: libspnav-devel
Requires(post): desktop-file-utils
@@ -143,12 +143,9 @@ addon packages to extend blender.
%setup -q
%patch1 -p1 -b .syspath
-%patch2 -p1
-%patch3 -p1 -b .openjpeg_stdbool
-%patch4 -p1 -b .64bit
-
-%patch5 -p1 -b .droid
-%patch6 -p1 -b .big-endian
+%patch2 -p1 -b .64bit
+%patch3 -p1 -b .droid
+%patch4 -p1 -b .big-endian
find -name '.svn' -print | xargs rm -rf
@@ -178,9 +175,10 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DWITH_BUILTIN_GLEW=OFF \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_SAFETY=ON \
- -DWITH_PLAYER=ON
+ -DWITH_PLAYER=ON \
+ -DBOOST_ROOT=%{_prefix}
-make
+make VERBOSE=1
%install
cd cmake-make
@@ -240,6 +238,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
>${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.blender
+mv ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages \
+ ${RPM_BUILD_ROOT}/%{_datadir}/blender/
+
%find_lang %{name}
%post
@@ -280,6 +281,9 @@ fi || :
%{_sysconfdir}/rpm/macros.blender
%changelog
+* Tue Dec 11 2012 Jochen Schmitt <Jochen herr schmitt de> - 1:2.65-1
+- New upstream release
+
* Mon Oct 29 2012 Dan Horák <dan[at]danny.cz> - 1:2.64a-3
- fix build on big endian arches
diff --git a/sources b/sources
index 4fab698..f3f641d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-227627840e373914e3b92043925597cb blender-2.64a.tar.gz
+cbb41d2db90b7bcbdc17af404058e76a blender-2.65.tar.gz
More information about the scm-commits
mailing list