diff options
Diffstat (limited to 'graphics/yafray/files')
| -rw-r--r-- | graphics/yafray/files/patch-SConstruct | 13 | ||||
| -rw-r--r-- | graphics/yafray/files/patch-configure | 10 | ||||
| -rw-r--r-- | graphics/yafray/files/patch-freebsd-settings.py | 32 | ||||
| -rw-r--r-- | graphics/yafray/files/patch-src::yafraycore::buffer.h | 13 | ||||
| -rw-r--r-- | graphics/yafray/files/patch-src_yafraycore_threadedscene.cc | 13 | ||||
| -rw-r--r-- | graphics/yafray/files/patch-src_yafraycore_y_alloc.h | 24 |
6 files changed, 82 insertions, 23 deletions
diff --git a/graphics/yafray/files/patch-SConstruct b/graphics/yafray/files/patch-SConstruct new file mode 100644 index 000000000000..844f3f07e7b3 --- /dev/null +++ b/graphics/yafray/files/patch-SConstruct @@ -0,0 +1,13 @@ +--- SConstruct.orig Tue Jun 20 13:24:00 2006 ++++ SConstruct Thu Sep 14 01:13:55 2006 +@@ -8,6 +8,10 @@ + ficheros = { + 'darwin' : 'darwin-settings', + 'linux2' : 'linux-settings', ++'freebsd4' : 'freebsd-settings', ++'freebsd5' : 'freebsd-settings', ++'freebsd6' : 'freebsd-settings', ++'freebsd7' : 'freebsd-settings', + 'win32' : 'win32-settings', + 'sunos5' : 'sunos5-settings' + } diff --git a/graphics/yafray/files/patch-configure b/graphics/yafray/files/patch-configure deleted file mode 100644 index d17586d40ac4..000000000000 --- a/graphics/yafray/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Thu Jun 12 21:31:41 2003 -+++ configure Thu Jun 12 21:32:01 2003 -@@ -7842,6 +7842,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='${SHELL} /usr/local/bin/libtool' diff --git a/graphics/yafray/files/patch-freebsd-settings.py b/graphics/yafray/files/patch-freebsd-settings.py new file mode 100644 index 000000000000..454943db3bb7 --- /dev/null +++ b/graphics/yafray/files/patch-freebsd-settings.py @@ -0,0 +1,32 @@ +--- freebsd-settings.py.orig Sat Sep 23 00:21:17 2006 ++++ freebsd-settings.py Sat Sep 23 00:21:29 2006 +@@ -10,6 +10,7 @@ + global prefix + prefix = args.get('prefix','/usr/local') + ++def get_include(args): return prefix+"/usr/local/include" + def get_libpath(args): return prefix+"/lib" + def get_pluginpath(args): return prefix+"/lib/yafray" + def get_binpath(args): return prefix+"/bin" +@@ -46,9 +47,9 @@ + class jpeg(globalinfo.library): + C_ID = 'JPEG' + +- def present(args): return os.path.exists("/usr/include/jpeglib.h") +- def get_include(args): return [] +- def get_libpath(args): return [] ++ def present(args): return os.path.exists("/usr/local/include/jpeglib.h") ++ def get_include(args): return ['/usr/local/include'] ++ def get_libpath(args): return ['/usr/local/lib'] + def get_libs(args): return ['jpeg'] + + class pthread(globalinfo.library): +@@ -73,7 +74,7 @@ + def present(args): return True + def get_include(args): return [] + def get_libpath(args): return [] +- def get_libs(args): return ['dl'] ++ def get_libs(args): return [''] + + def derive_shared_env(common_env): + return common_env.Copy() diff --git a/graphics/yafray/files/patch-src::yafraycore::buffer.h b/graphics/yafray/files/patch-src::yafraycore::buffer.h deleted file mode 100644 index 84dd8b1e22fe..000000000000 --- a/graphics/yafray/files/patch-src::yafraycore::buffer.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/yafraycore/buffer.h.orig Thu Sep 30 14:31:34 2004 -+++ src/yafraycore/buffer.h Thu Sep 30 14:42:42 2004 -@@ -27,7 +27,10 @@ - #include<config.h> - #endif - -+#include <iostream> - #include <stdio.h> -+ -+using namespace std; - - __BEGIN_YAFRAY - diff --git a/graphics/yafray/files/patch-src_yafraycore_threadedscene.cc b/graphics/yafray/files/patch-src_yafraycore_threadedscene.cc new file mode 100644 index 000000000000..fa5e770f96a6 --- /dev/null +++ b/graphics/yafray/files/patch-src_yafraycore_threadedscene.cc @@ -0,0 +1,13 @@ +--- src/yafraycore/threadedscene.cc.orig Mon Jul 4 11:01:46 2005 ++++ src/yafraycore/threadedscene.cc Sat Sep 23 00:16:35 2006 +@@ -35,6 +35,10 @@ + #include <semaphore.h> + #include<map> + ++#ifdef __FreeBSD__ ++#include<sys/time.h> ++#endif ++ + sem_t pstop; + + diff --git a/graphics/yafray/files/patch-src_yafraycore_y_alloc.h b/graphics/yafray/files/patch-src_yafraycore_y_alloc.h new file mode 100644 index 000000000000..e45f3b6b2172 --- /dev/null +++ b/graphics/yafray/files/patch-src_yafraycore_y_alloc.h @@ -0,0 +1,24 @@ +--- src/yafraycore/y_alloc.h.orig Thu Jul 13 12:35:02 2006 ++++ src/yafraycore/y_alloc.h Tue Sep 19 03:33:32 2006 +@@ -5,7 +5,7 @@ + #include<config.h> + #endif + +-#ifdef __APPLE__ ++#ifdef __FreeBSD__ + #include <stdlib.h> + #else + #include <malloc.h> +@@ -26,6 +26,12 @@ + // however, malloc is supposed to return at least SSE2 compatible alignment, which has to be enough. + // alternative would be valloc, but i have no good info on its effects. + return malloc(size); ++#elif defined(__FreeBSD__) ++ void *ret; ++ if (posix_memalign(&ret, bound, size) != 0) ++ return (NULL); ++ else ++ return (ret); + #else + return memalign(bound, size); + #endif |