rpms/blender/EL-5 blender-2.44-bid.patch, NONE, 1.1 blender-2.45-cve-2008-1102.patch, NONE, 1.1 blender-2.45-gcc43.patch, NONE, 1.1 blender-2.45-sc.patch, NONE, 1.1 blender-2.45-yafray.patch, NONE, 1.1 blender.spec, 1.39, 1.40 sources, 1.12, 1.13
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Tue Apr 29 16:01:15 UTC 2008
- Previous message (by thread): rpms/initscripts/devel .cvsignore, 1.143, 1.144 initscripts.spec, 1.168, 1.169 sources, 1.159, 1.160
- Next message (by thread): rpms/selinux-policy/F-9 policy-20071130.patch, 1.134, 1.135 selinux-policy.spec, 1.660, 1.661
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/blender/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908
Modified Files:
blender.spec sources
Added Files:
blender-2.44-bid.patch blender-2.45-cve-2008-1102.patch
blender-2.45-gcc43.patch blender-2.45-sc.patch
blender-2.45-yafray.patch
Log Message:
Initial EPEL-package
blender-2.44-bid.patch:
--- NEW FILE blender-2.44-bid.patch ---
--- 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";
blender-2.45-cve-2008-1102.patch:
--- NEW FILE blender-2.45-cve-2008-1102.patch ---
diff -up blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv blender-2.45/source/blender/imbuf/intern/radiance_hdr.c
--- blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv 2008-04-24 16:22:36.000000000 +0200
+++ blender-2.45/source/blender/imbuf/intern/radiance_hdr.c 2008-04-24 16:25:59.000000000 +0200
@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char
}
}
if (found) {
- sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width);
+ if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height,
+ (char*)&oriX, &width) != 4) return NULL;
/* find end of this line, data right behind it */
ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n');
blender-2.45-gcc43.patch:
--- NEW FILE blender-2.45-gcc43.patch ---
diff -up blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 blender-2.45/source/blender/yafray/intern/yafray_Render.cpp
--- blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp 2008-01-17 20:49:05.000000000 +0100
@@ -8,6 +8,8 @@
#include <math.h>
+#include <cstring>
+
using namespace std;
void yafrayRender_t::clearAll()
diff -up blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_File.cpp
--- blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-01-17 20:49:05.000000000 +0100
@@ -2,6 +2,8 @@
#include <math.h>
+#include <cstring>
+
using namespace std;
static string command_path = "";
diff -up blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_Plugin.cpp
--- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-01-17 20:49:05.000000000 +0100
@@ -1,6 +1,9 @@
#include "export_Plugin.h"
#include <math.h>
+
+#include <cstring>
+
using namespace std;
diff -up blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
--- blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 2008-01-17 20:56:36.000000000 +0100
+++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp 2008-01-17 20:57:03.000000000 +0100
@@ -32,6 +32,8 @@
#include "GPC_KeyboardDevice.h"
+#include <cstdlib>
+
/**
* NextFrame toggles currentTable with previousTable,
* and copies relevant event information from previous to current table
diff -up blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
--- blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 2007-09-18 06:58:17.000000000 +0200
+++ blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h 2008-01-17 20:49:05.000000000 +0100
@@ -56,7 +56,7 @@
# undef GL_ARB_vertex_program
#endif
-#include "glext.h"
+// #include "glext.h"
#include "EXT_separate_specular_color.h"
#include "ARB_multitexture.h"
diff -up blender-2.45/intern/string/STR_String.h.gcc43 blender-2.45/intern/string/STR_String.h
--- blender-2.45/intern/string/STR_String.h.gcc43 2007-09-18 06:58:01.000000000 +0200
+++ blender-2.45/intern/string/STR_String.h 2008-01-17 20:49:05.000000000 +0100
@@ -47,6 +47,10 @@
#include <vector>
#include <limits.h>
+
+#include <cstring>
+#include <cstdlib>
+
using namespace std;
diff -up blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp
--- blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 2007-09-18 06:57:51.000000000 +0200
+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-01-17 20:49:05.000000000 +0100
@@ -42,6 +42,8 @@
#include <strings.h>
#endif
+#include <cstring>
+#include <cstdio>
// For obscure full screen mode stuuf
// lifted verbatim from blut.
blender-2.45-sc.patch:
--- NEW FILE blender-2.45-sc.patch ---
diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py
--- blender-2.45/tools/btools.py.scons 2007-09-18 07:00:48.000000000 +0200
+++ blender-2.45/tools/btools.py 2008-04-27 21:23:27.000000000 +0200
@@ -1,7 +1,10 @@
import os
import os.path
import SCons.Options
-import SCons.Options.BoolOption
+try:
+ import SCons.Options.BoolOption
+except ImportError:
+ pass
try:
import subprocess
except ImportError:
blender-2.45-yafray.patch:
--- NEW FILE blender-2.45-yafray.patch ---
--- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.orig 2007-09-18 05:58:44.000000000 +0100
+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-02-05 14:32:07.000000000 +0000
@@ -97,8 +97,8 @@
#else
static char *alternative[]=
{
- "/usr/local/lib/",
- "/usr/lib/",
+ "/usr/local/lib64/",
+ "/usr/lib64/",
NULL
};
@@ -120,8 +120,8 @@
#else
static char *alternative[]=
{
- "/usr/local/lib/yafray",
- "/usr/lib/yafray",
+ "/usr/local/lib64/yafray",
+ "/usr/lib64/yafray",
NULL
};
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/EL-5/blender.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- blender.spec 23 May 2007 15:20:10 -0000 1.39
+++ blender.spec 29 Apr 2008 16:00:36 -0000 1.40
@@ -1,15 +1,14 @@
%define blenderlib %{_datadir}/blender
%define plugins %{_libdir}/blender/plugins
-%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
Name: blender
-Version: 2.44
-Release: 4%{?dist}.1
+Version: 2.45
+Release: 13%{?dist}
Summary: 3D modeling, animation, rendering and post-production
Group: Applications/Multimedia
-License: GPL
+License: GPLv2
URL: http://www.blender.org
# During a Legel issue (#239476) the package contains a cusromized
# source package created as fellow.
@@ -27,6 +26,12 @@
Source7: blender-2.44.config
Patch1: blender-2.44-scons.patch
+Patch2: blender-2.44-bid.patch
+Patch3: blender-2.45-gcc43.patch
+Patch4: blender-2.45-yafray.patch
+Patch5: blender-2.45-sc.patch
+
+Patch100: blender-2.45-cve-2008-1102.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,8 +58,6 @@
buildRequires: freetype-devel
BuildRequires: OpenEXR-devel
-Requires: python-abi = %{pyver}
-
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
@@ -67,10 +70,26 @@
Professionals and novices can easily and inexpensively publish stand-alone,
secure, multi-platform content to the web, CD-ROMs, and other media.
+This version doesn't contains ffmpeg support, so that any features may be not
+available.
+
%prep
%setup -q
%patch1 -p1 -b .org
-sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+%patch2 -p1 -b .bid
+%patch3 -p1 -b .gcc43
+%patch5 -p1 -b .scons
+
+
+%if "%{?_lib}" == "lib64"
+%patch4 -p1
+%endif
+
+%patch100 -p1 -b .cve
+
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
+
+sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
<%{SOURCE7} >user-config.py
%build
@@ -111,6 +130,7 @@
pushd bin/.blender/locale
mv pt_br pt_BR
mv zh_cn uh_CN
+rm -rf $(find -name '.svn' -print)
popd
cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -148,7 +168,6 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
-
%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -170,9 +189,52 @@
%{_datadir}/mime/packages/blender.xml
%changelog
-* Wed May 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-4.1
+* Sun Apr 27 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-13
+- More generic patch for scons issue
+
+* Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-12
+- Fix odd scons compatibility issue
+
+* Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-11
+- Fix CVS-2008-1102 (#443937)
+
+* Wed Mar 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-10
+- Clarification of restrictions caused by legal issues
+
+* Tue Mar 4 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-9
+- Apply yafray patch only on 64-bit systems
+
+* Thu Feb 28 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-8
+- Fix yafray load bug (#451571)
+
+* Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-7
+- Rebuild for gcc-4.3
+
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> 2.45-6
+- Rebuild for new gettext
+
+* Thu Jan 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-5
+- Fix gcc-4.3 related issues
+
+* Tue Oct 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-4
+- Rebuild again for OpenEXR
+
+* Sun Oct 14 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-3
- Rebuild
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
+- Change method how to determinate python version
+
+* Thu Sep 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
+- New upstream release
+
+* Thu Aug 9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-8
+- Fix koji-python issue
+
+* Wed Aug 8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-6
+- Changing license tag
+- Add python as an BR
+
* Mon May 21 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-4
- Use of $$RPM_OPT_FLAGS to compile blender
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 23 May 2007 14:59:51 -0000 1.12
+++ sources 29 Apr 2008 16:00:36 -0000 1.13
@@ -1 +1 @@
-c078195e1563bb95b7b228f3f679c48d blender-2.44-noffmpeg.tar.gz
+2f88b8a5860f6919bd72dc9946a55f3b blender-2.45-noffmpeg.tar.gz
- Previous message (by thread): rpms/initscripts/devel .cvsignore, 1.143, 1.144 initscripts.spec, 1.168, 1.169 sources, 1.159, 1.160
- Next message (by thread): rpms/selinux-policy/F-9 policy-20071130.patch, 1.134, 1.135 selinux-policy.spec, 1.660, 1.661
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list