Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=generic.git;a=commitdiff;h=12f136f7f416579bb9ba664ee574acc89871d922
commit 12f136f7f416579bb9ba664ee574acc89871d922 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Tue Jul 22 21:21:17 2008 +0200 blender-2.46-1-i686 - version bump diff --git a/source/xapps-extra/blender/20_gcc4.3_support.diff b/source/xapps-extra/blender/20_gcc4.3_support.diff deleted file mode 100644 index 32b2dbd..0000000 --- a/source/xapps-extra/blender/20_gcc4.3_support.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- a/intern/SoundSystem/intern/SND_Utils.cpp -+++ b/intern/SoundSystem/intern/SND_Utils.cpp -@@ -47,6 +47,7 @@ - #include <fcntl.h> - #include <math.h> - #include <string.h> -+#include <cstdlib> - - #if defined(WIN32) - #include <io.h> ---- a/intern/ghost/intern/GHOST_WindowX11.cpp -+++ b/intern/ghost/intern/GHOST_WindowX11.cpp -@@ -42,6 +42,8 @@ - #include <strings.h> - #endif - -+#include <cstdio> -+ - - // For obscure full screen mode stuuf - // lifted verbatim from blut. ---- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h -+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h -@@ -54,7 +54,9 @@ - /* Header file version number, required by OpenGL ABI for Linux */ - /* glext.h last updated 2005/06/20 */ - /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -+#ifndef GL_GLEXT_VERSION - #define GL_GLEXT_VERSION 29 -+#endif - - #ifndef GL_VERSION_1_2 - #define GL_UNSIGNED_BYTE_3_3_2 0x8032 ---- a/intern/string/STR_String.h -+++ b/intern/string/STR_String.h -@@ -47,6 +47,8 @@ - - #include <vector> - #include <limits.h> -+#include <cstring> -+#include <cstdlib> - using namespace std; - - ---- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp -+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp -@@ -30,6 +30,8 @@ - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -+#include <cstdlib> -+ - #include "GPC_KeyboardDevice.h" - - /** ---- a/source/blender/yafray/intern/yafray_Render.cpp -+++ b/source/blender/yafray/intern/yafray_Render.cpp -@@ -7,6 +7,7 @@ - #include "yafray_Render.h" - - #include <math.h> -+#include <cstring> - - using namespace std; - ---- a/source/blender/yafray/intern/export_Plugin.cpp -+++ b/source/blender/yafray/intern/export_Plugin.cpp -@@ -1,6 +1,7 @@ - #include "export_Plugin.h" - - #include <math.h> -+#include <cstring> - using namespace std; - - ---- a/source/blender/yafray/intern/export_File.cpp -+++ b/source/blender/yafray/intern/export_File.cpp -@@ -1,6 +1,7 @@ - #include "export_File.h" - - #include <math.h> -+#include <cstring> - - using namespace std; - diff --git a/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff b/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff deleted file mode 100644 index 75e093d..0000000 --- a/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/source/blender/imbuf/intern/radiance_hdr.c -+++ b/source/blender/imbuf/intern/radiance_hdr.c -@@ -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'); diff --git a/source/xapps-extra/blender/FrugalBuild b/source/xapps-extra/blender/FrugalBuild index 65d3d4d..dead8e9 100644 --- a/source/xapps-extra/blender/FrugalBuild +++ b/source/xapps-extra/blender/FrugalBuild @@ -3,9 +3,9 @@ # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=blender -pkgver=2.45 +pkgver=2.46 pkgextraver= -pkgrel=2 +pkgrel=1 pkgdesc="A 3D modeling/rendering/animation/gaming application" url="http://blender.org"; Finclude python @@ -15,7 +15,11 @@ archs=('i686' 'x86_64') makedepends=('cmake' 'ftgl') up2date="lynx -dump http://www.blender.org/download/source-code/ |grep tar |sed -ne 's/.*r \(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz \ - blender.desktop blender.png py$_F_python_ver.patch 20_gcc4.3_support.diff 30_fix_CVE-2008-1102.diff) + blender.desktop blender.png py$_F_python_ver.patch) +sha1sums=('c5f17700a18d44409a5920e852a97a87ff37d06e' \ + '44ee67a0ed814481aacca0dfc8cf45ae7a48eed5' \ + '5d2583d847735c913c26c96ace8192a646323da8' \ + 'c7357731664aa7fa704d05d74b75d9e101cf7af5') build() { unset MAKEFLAGS @@ -34,19 +38,14 @@ build() { Fexerel bin/blender $Fprefix/bin/blender Fexerel bin/blenderplayer $Fprefix/bin/blenderplayer Ffile $pkgname-$pkgver/source/blender/blenpluginapi/*.h $Fprefix/lib/blender/plugins/include - Fcprrel bin/plugins $Fprefix/lib/blender - chmod +x $Fdestdir/$Fprefix/lib/blender/plugins/bmake || Fdie - make -C $Fdestdir/$Fprefix/lib/blender/plugins || Fdie - Ffilerel bin/*.{txt,html} /usr/share/doc/blender-$pkgver Ffile /usr/share/pixmaps/blender.png Ffile /usr/share/applications/blender.desktop Ffilerel lib/* $Fprefix/lib + cd - >/dev/null + Fcprel release/plugins $Fprefix/lib/blender + chmod +x $Fdestdir/$Fprefix/lib/blender/plugins/bmake || Fdie + make -C $Fdestdir/$Fprefix/lib/blender/plugins || Fdie + Fdocrel release/text/* } -sha1sums=('ff66ec5f0129fd04a2ba5c063627ef13033c0598' \ - '44ee67a0ed814481aacca0dfc8cf45ae7a48eed5' \ - '5d2583d847735c913c26c96ace8192a646323da8' \ - 'c7357731664aa7fa704d05d74b75d9e101cf7af5' \ - 'ca4a990b760be8415444241e3950eb929937e8bb' \ - 'e9dae2704eec86ec1d042097ddf2d39b16949137') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
