Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=845157372886dbd81a40e86e43d1b2bf4130b038
commit 845157372886dbd81a40e86e43d1b2bf4130b038 Author: bouleetbil <[email protected]> Date: Sun May 16 15:13:50 2010 +0200 yafray-0.1.1-1-x86_64 *version bump diff --git a/source/xapps-extra/yafray/FrugalBuild b/source/xapps-extra/yafray/FrugalBuild index a4668a4..0c196aa 100644 --- a/source/xapps-extra/yafray/FrugalBuild +++ b/source/xapps-extra/yafray/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=yafray -pkgver=0.0.9 -pkgrel=2 +pkgver=0.1.1 +pkgrel=1 pkgdesc="YafRay is a powerful raytracer, under the LGPL license." url="http://www.yafray.org"; -depends=('openexr>=1.4.0a' 'libjpeg' 'zlib' 'libstdc++') +depends=('openexr>=1.4.0a' 'libjpeg>=8a' 'zlib' 'libstdc++') makedepends=('scons') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.yafray.org/sec/2/downloads/ |Flasttar" -source=(http://www.yafray.org/sec/2/downloads/$pkgname-$pkgver.tar.gz \ - 01-scons-install-fix.dpatch.diff) -sha1sums=('30eaf082f66da4948cc6fb9651b4945914929f74' \ - '000e60eaad16863af733f15aff841bbaee5db8c1') +source=(http://static.yafaray.org/sources/YafaRay.$pkgver.zip gcc43.diff gcc44.diff) +sha1sums=('430deeb5462ebef27fb433ad5d8ca868d8f291c2' \ + '9292c277901c38af0f9ac80bc4f73b22b63b05a5' \ + '83333d1f3ca71a49d7a01fc2d20650b62edf2ee4') build() { Fcd $pkgname diff --git a/source/xapps-extra/yafray/gcc43.diff b/source/xapps-extra/yafray/gcc43.diff new file mode 100644 index 0000000..d3d084c --- /dev/null +++ b/source/xapps-extra/yafray/gcc43.diff @@ -0,0 +1,98 @@ +--- src/loader/mlex.cc ++++ src/loader/mlex.cc +@@ -31,6 +31,8 @@ + #define WARNING cerr<<"[Warning]: " + #define ERROR cerr<<"[Error]: " + ++#include <cstring> ++ + char sops[]={ + '<', + '>', +--- src/shaders/basictex.cc ++++ src/shaders/basictex.cc +@@ -31,6 +31,8 @@ + #include "EXR_io.h" + #endif + ++#include <cstring> ++ + using namespace std; + + __BEGIN_YAFRAY +--- src/yafraycore/HDR_io.cc ++++ src/yafraycore/HDR_io.cc +@@ -9,6 +9,8 @@ + #include<config.h> + #endif + ++#include <cstring> ++ + __BEGIN_YAFRAY + + //--------------------------------------------------------------------------- +--- src/yafraycore/buffer.h ++++ src/yafraycore/buffer.h +@@ -31,6 +31,8 @@ + #include <iostream> + #include "color.h" + ++#include <cstdlib> ++ + __BEGIN_YAFRAY + + template<typename T1, unsigned char T2> +--- src/yafraycore/ccthreads.cc ++++ src/yafraycore/ccthreads.cc +@@ -1,6 +1,8 @@ + #include"ccthreads.h" + #include<iostream> + ++#include <cstdlib> ++ + using namespace std; + + namespace yafthreads { +--- src/yafraycore/geometree.h ++++ src/yafraycore/geometree.h +@@ -1,6 +1,8 @@ + #ifndef __GEOMETREE_H + #define __GEOMETREE_H + ++#include <limits> ++ + #include"bound.h" + + __BEGIN_YAFRAY +--- src/yafraycore/renderblock.cc ++++ src/yafraycore/renderblock.cc +@@ -1,6 +1,8 @@ + + #include "renderblock.h" + ++#include <cstdlib> ++ + using namespace std; + + __BEGIN_YAFRAY +--- src/yafraycore/kdtree.cc ++++ src/yafraycore/kdtree.cc +@@ -4,6 +4,7 @@ + #include <math.h> + #include <limits> + #include <time.h> ++#include <cstring> + + __BEGIN_YAFRAY + +--- src/yafraycore/targaIO.cc ++++ src/yafraycore/targaIO.cc +@@ -3,6 +3,7 @@ + //-------------------------------------------------------------------------------- + #include "targaIO.h" + #include "vector3d.h" ++#include <cstring> + + //-------------------------------------------------------------------------------- + // Save uncompressed 24 bit targa + diff --git a/source/xapps-extra/yafray/gcc44.diff b/source/xapps-extra/yafray/gcc44.diff new file mode 100644 index 0000000..ecedd3b --- /dev/null +++ b/source/xapps-extra/yafray/gcc44.diff @@ -0,0 +1,12 @@ +diff -up yafray/src/shaders/basictex.cc.gcc44 yafray/src/shaders/basictex.cc +--- yafray/src/shaders/basictex.cc.gcc44 2009-03-02 11:26:49.000000000 +0100 ++++ yafray/src/shaders/basictex.cc 2009-03-02 11:27:25.000000000 +0100 +@@ -261,7 +261,7 @@ textureImage_t::textureImage_t(const cha + intp_type = BICUBIC; + + // Load image, try to determine from extensions first +- char *ext = strrchr(filename, '.'); ++ const char *ext = strrchr(filename, '.'); + bool jpg_tried = false; + bool tga_tried = false; + bool hdr_tried = false; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
