Re: [patch] Blender on Debian GNU/KFreeBSD
2008/10/6 Cyril Brulebois <kibi@debian.org>:
[...]
>> Can you please try to sync the package of Blender in Debian
>> GNU/KFreeBSD with that in Debian GNU/Linux?
>
> I'm currently waiting for 2.48 to be released (due since some days), and
> I'll package it for experimental, including an updated GNU/kFreeBSD
> patch.
Great!
>> I describe here what I modified to advance from the configuration
>> error to the compilation error (I am referring to Blender package
>> 2.46+dfsg-4).
>
> Thank you for that.
>
> BTW, usually one uses "diff -u" which provides with an even nicer
> output. ;-)
Sorry.
I now attouch the diffs created using "diff -u" (from inside
"debian/patches/" path).
Thanks.
Luca Favatella
--- series.bak 2008-10-06 18:21:56.000000000 +0200
+++ series 2008-10-06 18:05:01.000000000 +0200
@@ -1,5 +1,5 @@
-#10_gnukfreebsd_support
02_tmp_in_HOME
+06_gnukfreebsd_support
10_use_systemwide_ftgl
20_fix_ftbfs_with_latest_ftgl
30_gameengine_libgl_location_fix
--- 10_gnukfreebsd_support.bak 2008-10-06 18:21:56.000000000 +0200
+++ 06_gnukfreebsd_support 2008-10-06 18:10:46.000000000 +0200
@@ -1,6 +1,6 @@
--- a/SConstruct 2007-09-18 06:59:24.000000000 +0200
+++ b/SConstruct 2007-11-25 18:08:28.000000000 +0100
-@@ -185,7 +185,7 @@
+@@ -203,7 +203,7 @@
# see if this linux distro has libalut
@@ -86,20 +86,9 @@
cflags='-pthread'
env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
---- a/extern/bFTGL/src/FTVectoriser.cpp 2007-09-18 06:59:15.000000000 +0200
-+++ b/extern/bFTGL/src/FTVectoriser.cpp 2007-11-25 18:08:28.000000000 +0100
-@@ -7,7 +7,7 @@
-
- #ifdef __APPLE_CC__
- typedef GLvoid (*GLUTesselatorFunction)(...);
--#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__)
-+#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__FreeBSD_kernel__)
- typedef GLvoid (*GLUTesselatorFunction)();
- #elif defined ( WIN32)
- typedef GLvoid (CALLBACK *GLUTesselatorFunction)( );
--- a/source/blender/blenlib/intern/storage.c 2007-09-18 06:58:46.000000000 +0200
+++ b/source/blender/blenlib/intern/storage.c 2007-11-25 18:08:28.000000000 +0100
-@@ -54,7 +54,7 @@
+@@ -53,7 +53,7 @@
#include <sys/statfs.h>
#endif
@@ -110,7 +99,7 @@
#endif
--- a/release/plugins/bmake 2007-09-18 06:57:33.000000000 +0200
+++ b/release/plugins/bmake 2007-11-25 18:08:28.000000000 +0100
-@@ -58,7 +58,7 @@
+@@ -55,7 +55,7 @@
LD="ld";
LDFLAGS="-Bshareable";
Reply to: