Mailinglist Archive: opensuse-commit (1159 mails)

< Previous Next >
commit blender
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 03 Oct 2007 16:59:35 +0200
  • Message-id: <20071003145935.A590B67817A@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package blender
checked in at Wed Oct 3 16:59:35 CEST 2007.

--------
--- blender/blender.changes     2007-07-05 13:59:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/blender/blender.changes        2007-10-03 14:01:59.645141000 +0200
@@ -1,0 +2,5 @@
+Wed Oct  3 14:01:45 CEST 2007 - coolo@xxxxxxx
+
+- update to 2.45 to fix compilation with gcc43
+
+-------------------------------------------------------------------

Old:
----
  blender-2.44.tar.bz2
  blender-2.44-uninitialized_memory.patch

New:
----
  blender-2.44-gcc43.patch
  blender-2.45.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ blender-doc.spec ++++++
--- /var/tmp/diff_new_pack.Q17864/_old  2007-10-03 16:55:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Q17864/_new  2007-10-03 16:55:56.000000000 +0200
@@ -12,14 +12,14 @@
 
 Name:           blender-doc
 BuildRequires:  find
-License:        GNU Free Documentation License, Version 1.1 (GFDL)
+License:        GNU Free Documentation License, Version 1.1 (GFDL 1.1)
 Group:          Productivity/Graphics/Visualization/Raytracers
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        2.3
-Release:        65
+Release:        82
 Source:         BlenderManualIen.23.html.tar.bz2
 BuildArch:    noarch
-URL:            http://www.blender.org
+Url:            http://www.blender.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Documentation for Blender 3D Animation and Rendering Software
 
@@ -60,7 +60,6 @@
 %dir /usr/share/doc/packages/blender
 %dir /usr/share/doc/packages/blender/BlenderManual
 %doc /usr/share/doc/packages/blender/BlenderManual/*
-
 %changelog
 * Thu Jun 29 2006 - pnemec@xxxxxxx
 - new spec file for package blender-doc

++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.Q17864/_old  2007-10-03 16:55:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Q17864/_new  2007-10-03 16:55:56.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package blender (Version 2.44)
+# spec file for package blender (Version 2.45)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -15,15 +15,15 @@
 # Patched code is built by default.
 # Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code.
 BuildRequires:  Mesa-devel OpenEXR-devel SDL-devel freealut-devel freetype2-devel ftgl-devel gcc-c++ libao-devel libdrm-devel libpng-devel libquicktime-devel libtiff-devel openal-devel openssl-devel python-devel scons update-desktop-files xorg-x11 yafray
-License:        GPL v2 or later, Dual license: GNU GPL / Blender License
+License:        GPL v2 or later
 %if %DISTRIBUTABLE <= 0
 BuildRequires:  ffmpeg-devel
 %endif
 Group:          Productivity/Graphics/Visualization/Raytracers
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       yafray
-Version:        2.44
-Release:        11
+Version:        2.45
+Release:        1
 %if %DISTRIBUTABLE <= 0
 Source:         %{name}-%{version}.tar.bz2
 %else
@@ -34,6 +34,7 @@
 Source2:        geeko.blend
 Source3:        geeko.README
 Source4:        blender-sample
+Source5:        blenderplayer.desktop
 Source6:        blender.xpm
 Source7:        blender_wrapper.tar.bz2
 #
@@ -52,9 +53,8 @@
 Patch9:         blender-undefined-op.patch
 Patch10:        blender-strncat.patch
 #
-# uninitialized_memory sent to upstream, remove as soon as it is upstreamed
-Patch11:        blender-2.44-uninitialized_memory.patch
-URL:            http://www.blender.org/
+Patch11:        blender-2.44-gcc43.patch
+Url:            http://www.blender.org/
 #Icon:           blender.xpm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        3D Animation and Rendering Software
@@ -121,7 +121,6 @@
        WITH_BF_FFMPEG=yes \
        %endif
        CFLAGS="${RPM_OPT_FLAGS}"
-       
 # just by sure this file will not be used #262776
 rm ./source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h
 %if %DISTRIBUTABLE <= 0
@@ -216,8 +215,9 @@
 %{_docdir}/%{name}
 /usr/share/applications/blender.desktop
 /usr/share/pixmaps/blender.xpm
-
 %changelog
+* Wed Oct 03 2007 - coolo@xxxxxxx
+- update to 2.45 to fix compilation with gcc43
 * Thu Jul 05 2007 - coolo@xxxxxxx
 - put desktop file into package
 * Tue Jun 05 2007 - pnemec@xxxxxxx

++++++ blender-2.44-gcc43.patch ++++++
--- intern/ghost/intern/GHOST_WindowX11.cpp.orig        2007-10-03 11:40:20.000000000 +0200
+++ intern/ghost/intern/GHOST_WindowX11.cpp     2007-10-03 11:49:45.000000000 +0200
@@ -34,6 +34,9 @@
 #include "STR_String.h"
 #include "GHOST_Debug.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 // For standard X11 cursors
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
--- intern/elbeem/intern/utilities.cpp.orig     2007-10-03 11:40:21.000000000 +0200
+++ intern/elbeem/intern/utilities.cpp  2007-10-03 11:56:50.000000000 +0200
@@ -8,6 +8,7 @@
  *****************************************************************************/
 
 
+#include <stdlib.h>
 #include <iostream>
 #include <sstream>
 #ifdef WIN32
--- intern/elbeem/intern/solver_util.cpp.orig   2007-10-03 11:40:21.000000000 +0200
+++ intern/elbeem/intern/solver_util.cpp        2007-10-03 11:56:15.000000000 +0200
@@ -7,6 +7,7 @@
  *
  *****************************************************************************/
 
+#include <stdlib.h>
 #include "solver_class.h"
 #include "solver_relax.h"
 #include "particletracer.h"
--- intern/elbeem/intern/solver_interface.cpp.orig      2007-10-03 11:40:21.000000000 +0200
+++ intern/elbeem/intern/solver_interface.cpp   2007-10-03 11:54:55.000000000 +0200
@@ -10,6 +10,8 @@
  * 
  *****************************************************************************/
 
+#include <stdlib.h>
+
 /* LBM Files */ 
 #include "ntl_matrices.h"
 #include "solver_interface.h" 
--- intern/string/STR_String.h.orig     2007-10-03 11:40:21.000000000 +0200
+++ intern/string/STR_String.h  2007-10-03 11:46:11.000000000 +0200
@@ -45,6 +45,8 @@
 #define        assertd(exp)                    ((void)NULL)
 #endif
 
+#include <stdlib.h>
+#include <string.h>
 #include <vector>
 #include <limits.h>
 using namespace std;
--- intern/string/intern/STR_String.cpp.orig    2007-10-03 11:40:21.000000000 +0200
+++ intern/string/intern/STR_String.cpp 2007-10-03 11:48:51.000000000 +0200
@@ -561,7 +561,7 @@ STR_String&     STR_String::TrimLeft()
 {
        int skip;
        assertd(pData != NULL);
-       for (skip=0; isSpace(pData[skip]); skip++, Len--);
+       for (skip=0; isSpace(pData[skip]); skip++, Len--) ;
        memmove(pData, pData+skip, Len+1);
        return *this;
 }
@@ -600,7 +600,7 @@ STR_String&     STR_String::TrimLeft(char *s
 {
        int skip;
        assertd(pData != NULL);
-       for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--);
+       for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--) ;
        memmove(pData, pData+skip, Len+1);
        return *this;
 }
--- source/blender/yafray/intern/yafray_Render.cpp.orig 2007-10-03 11:40:31.000000000 +0200
+++ source/blender/yafray/intern/yafray_Render.cpp      2007-10-03 12:10:24.000000000 +0200
@@ -4,6 +4,7 @@
 // For anyone else looking at this, this was designed for a tabspacing of 2 (YafRay/Jandro standard :)
 //----------------------------------------------------------------------------------------------------
 
+#include <string.h>
 #include "yafray_Render.h"
 
 #include <math.h>
--- source/blender/yafray/intern/export_File.cpp.orig   2007-10-03 11:40:31.000000000 +0200
+++ source/blender/yafray/intern/export_File.cpp        2007-10-03 12:02:50.000000000 +0200
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "export_File.h"
 
 #include <math.h>
--- source/blender/yafray/intern/export_Plugin.cpp.orig 2007-10-03 11:40:31.000000000 +0200
+++ source/blender/yafray/intern/export_Plugin.cpp      2007-10-03 12:03:36.000000000 +0200
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "export_Plugin.h"
 
 #include <math.h>
++++++ blender-2.44.tar.bz2 -> blender-2.45.tar.bz2 ++++++
blender/blender-2.44.tar.bz2 /mounts/work_src_done/STABLE/blender/blender-2.45.tar.bz2 differ: byte 11, line 1









++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages