Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b2c1ce0fe0 | ||
|
11269f39a1 | ||
|
62b4183c47 |
8 changed files with 3 additions and 247 deletions
|
|
@ -1 +0,0 @@
|
|||
yafray-0.0.9.tar.gz
|
||||
0
.gitignore
vendored
Normal file
0
.gitignore
vendored
Normal file
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: yafray
|
||||
# $Id$
|
||||
NAME := yafray
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
3
dead.package
Normal file
3
dead.package
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
This package is deprecated against yafr[a]ray
|
||||
It was needed by blender older than 2.49,
|
||||
current blender 2.49b uses yafaray only.
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
7365122e0ca6f439988f51e8b4db935c yafray-0.0.9.tar.gz
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
--- 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
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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;
|
||||
114
yafray.spec
114
yafray.spec
|
|
@ -1,114 +0,0 @@
|
|||
Name: yafray
|
||||
Version: 0.0.9
|
||||
Release: 10%{?dist}
|
||||
Summary: Yet Another Free RAYtracer
|
||||
|
||||
Group: Applications/Multimedia
|
||||
License: LGPLv2+
|
||||
URL: http://www.yafray.org
|
||||
Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz
|
||||
Patch0: yafray-0.0.9-gcc43.patch
|
||||
Patch1: yafray-0.0.9-gcc44.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
BuildRequires: scons
|
||||
|
||||
Obsoletes: yafray-devel
|
||||
|
||||
|
||||
%description
|
||||
Yafray is yet another free raytracer, still in development. Some
|
||||
features like caustics, filters, depth of field, etc. are implemented.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%patch0 -p0 -b .gcc43
|
||||
%patch1 -p1 -b .gcc44
|
||||
#sed -i "s|/usr/local|%{_prefix}|" linux-settings.py
|
||||
sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py
|
||||
sed -i "s|/lib|/%{_lib}|" linux-settings.py
|
||||
chmod 0644 ChangeLog AUTHORS LICENSE COPYING NEWS README
|
||||
find src -name '*.h' -exec chmod 0644 {} ';'
|
||||
find src -name '*.cc' -exec chmod 0644 {} ';'
|
||||
|
||||
|
||||
%build
|
||||
CXXFLAGS="$RPM_OPT_FLAGS" scons prefix=%{_prefix}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
scons prefix=$RPM_BUILD_ROOT%{_prefix} install
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/.sconsign
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/.sconsign
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/yafray/.sconsign
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
install -pm 0644 $RPM_BUILD_ROOT%{_prefix}/etc/gram.yafray $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
rm -rf $RPM_BUILD_ROOT%{_prefix}/etc
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog AUTHORS LICENSE README
|
||||
%{_bindir}/yafray
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/yafray/
|
||||
%config(noreplace) %{_sysconfdir}/gram.yafray
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.9-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.0.9-9
|
||||
- Fix gcc44
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.9-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 0.0.9-7
|
||||
- Rebuild for gcc43
|
||||
|
||||
* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.0.9-6
|
||||
- Fix gcc43
|
||||
|
||||
* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-5
|
||||
- Fix: yafray libs are dlopened
|
||||
|
||||
* Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.0.9-4
|
||||
- Rebuild
|
||||
|
||||
* Sun Aug 26 2007 kwizart < kwizart at gmail.com > - 0.0.9-3
|
||||
- Rebuild for BuildID
|
||||
- Update the License field
|
||||
|
||||
* Sun May 20 2007 kwizart < kwizart at gmail.com > - 0.0.9-2
|
||||
- Fix /lib is /lib64 on x86_64 and ppc64
|
||||
|
||||
* Sat Oct 14 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.0.9-1
|
||||
- new version 0.0.9
|
||||
|
||||
* Sun Jun 18 2006 Gerard Milmeister <gemi@bluewin.ch> - 0.0.8-2
|
||||
- BR: OpenEXR-devel
|
||||
- use $RPM_OPT_FLAGS
|
||||
|
||||
* Fri Jul 8 2005 Gerard Milmeister <gemi@bluewin.ch> - 0.0.8-1
|
||||
- New Version 0.0.8
|
||||
|
||||
* Tue Mar 23 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:0.0.6-0.fdr.1
|
||||
- First Fedora release
|
||||
Reference in a new issue