summaryrefslogtreecommitdiff
path: root/graphics/blender/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/blender/patches')
-rw-r--r--graphics/blender/patches/patch-aa14
-rw-r--r--graphics/blender/patches/patch-ad13
-rw-r--r--graphics/blender/patches/patch-ae126
-rw-r--r--graphics/blender/patches/patch-af13
-rw-r--r--graphics/blender/patches/patch-ag13
-rw-r--r--graphics/blender/patches/patch-ai13
6 files changed, 26 insertions, 166 deletions
diff --git a/graphics/blender/patches/patch-aa b/graphics/blender/patches/patch-aa
deleted file mode 100644
index 92f97f39359..00000000000
--- a/graphics/blender/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/02/12 21:52:19 joerg Exp $
-
---- intern/ghost/intern/GHOST_SystemCarbon.cpp.orig 2006-02-12 22:17:07.000000000 +0100
-+++ intern/ghost/intern/GHOST_SystemCarbon.cpp
-@@ -527,7 +527,8 @@ static char g_firstFileBuf[512];
-
- extern "C" int GHOST_HACK_getFirstFile(char buf[512]) {
- if (g_hasFirstFile) {
-- strcpy(buf, g_firstFileBuf);
-+ strncpy(buf, g_firstFileBuf, sizeof(buf) - 1);
-+ buf[sizeof(buf) - 1] = '\0';
- return 1;
- } else {
- return 0;
diff --git a/graphics/blender/patches/patch-ad b/graphics/blender/patches/patch-ad
new file mode 100644
index 00000000000..e456ae5b11e
--- /dev/null
+++ b/graphics/blender/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2008/01/04 19:56:45 markd Exp $
+
+--- extern/bFTGL/src/FTVectoriser.cpp.orig 2007-12-05 02:15:19.000000000 +1300
++++ extern/bFTGL/src/FTVectoriser.cpp
+@@ -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( __NetBSD__ )
+ typedef GLvoid (*GLUTesselatorFunction)();
+ #elif defined ( WIN32)
+ typedef GLvoid (CALLBACK *GLUTesselatorFunction)( );
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
deleted file mode 100644
index 210292c9bfd..00000000000
--- a/graphics/blender/patches/patch-ae
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/02/23 20:15:22 joerg Exp $
-
---- SConstruct.orig 2006-01-22 23:46:29.000000000 +0100
-+++ SConstruct
-@@ -38,7 +38,7 @@ else:
- playername = 'blenderplayer$PROGSUFFIX'
-
- # Build directory.
--# root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep
-+root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep
-
- bs_config.parseOpts()
-
-@@ -61,7 +61,102 @@ sdl_env = Environment (ENV = os.environ)
- freetype_env = Environment (ENV = os.environ)
- env = Environment (ENV = os.environ)
-
--if sys.platform == 'linux2' or sys.platform == 'linux-i386':
-+# pkgsrc patch
-+#
-+sys.platform = 'pkgsrc'
-+if sys.platform == 'pkgsrc':
-+ print "Building for pkgsrc systems"
-+ use_international = 'false'
-+ use_gameengine = 'true'
-+ use_openal = 'false'
-+ use_fmod = 'false'
-+ use_quicktime = 'false'
-+ use_sumo = 'true'
-+ use_ode = 'false'
-+ use_bullet = 'true'
-+ use_buildinfo = 'true'
-+ use_fluidsim = 'true'
-+ build_blender_dynamic = 'true'
-+ build_blender_static = 'false'
-+ build_blender_player = 'false'
-+ build_blender_plugin = 'false'
-+ release_flags = string.split(os.environ[ 'CFLAGS' ])
-+ debug_flags = ['-O2', '-g']
-+ extra_flags = ['-pipe', '-fPIC', '-funsigned-char']
-+ cxxflags = []
-+ defines = []
-+ warn_flags = ['-Wall','-W']
-+ window_system = 'X11'
-+ platform_libs = ['m', 'stdc++', 'util']
-+ platform_libpath = []
-+ platform_linkflags = string.split(os.environ['PTHREAD_LDFLAGS']) + string.split(os.environ['PTHREAD_LIBS'])
-+ extra_includes = []
-+ z_lib = ['z']
-+ z_libpath = []
-+ z_include = []
-+ # png library information
-+ png_lib = ['png']
-+ png_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
-+ png_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
-+ # jpeg library information
-+ jpeg_lib = ['jpeg']
-+ jpeg_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
-+ jpeg_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
-+ # tiff library information
-+ tiff_lib = ['tiff']
-+ tiff_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
-+ tiff_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
-+ # OpenGL library information
-+ opengl_lib = ['GL', 'GLU']
-+ opengl_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
-+ opengl_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
-+ opengl_static = ['libGL.a', 'libGLU.a']
-+ # SDL library information
-+ sdl_env.ParseConfig ('sdl-config --cflags --libs')
-+ sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
-+ sdl_include = sdl_env.Dictionary()['CPPPATH']
-+ sdl_libpath = sdl_env.Dictionary()['LIBPATH']
-+ sdl_lib = sdl_env.Dictionary()['LIBS']
-+ # SOLID library information
-+ solid_lib = [] # TODO
-+ solid_libpath = [] # TODO
-+ solid_include = ['#extern/solid']
-+ qhull_lib = [] # TODO
-+ qhull_libpath = [] # TODO
-+ qhull_include = ['#extern/qhull/include']
-+ # Bullet library information
-+ bullet_lib = []
-+ bullet_libpath = []
-+ bullet_include = ['#extern/bullet','#extern/bullet/LinearMath','#extern/bullet/Bullet','#extern/bullet/BulletDynamics']
-+ # ODE library information
-+ ode_lib = ['ode']
-+ ode_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
-+ ode_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
-+ # Python library information
-+ python_lib = ['python%d.%d' % sys.version_info[0:2]]
-+ python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
-+ python_include = [sysconfig.get_python_inc ()]
-+ python_linkflags = Split (sysconfig.get_config_var('LINKFORSHARED'))
-+ # International support information
-+ ftgl_lib = ['ftgl']
-+ ftgl_libpath = ['#../lib/linux-glibc2.2.5-i386/ftgl/lib']
-+ ftgl_include = ['#../lib/linux-glibc2.2.5-i386/ftgl/include']
-+ freetype_env.ParseConfig('pkg-config --cflags --libs freetype2')
-+ freetype_lib = freetype_env.Dictionary()['LIBS']
-+ freetype_libpath = freetype_env.Dictionary()['LIBPATH']
-+ freetype_include = freetype_env.Dictionary()['CPPPATH']
-+ gettext_lib = []
-+ gettext_libpath = []
-+ gettext_include = []
-+ # OpenAL library information
-+ openal_lib = ['openal']
-+ openal_libpath = []
-+ openal_include = []
-+
-+elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
-+ print "Building for FreeBSD"
-+
-+elif sys.platform == 'linux2' or sys.platform == 'linux-i386':
- use_international = 'true'
- use_gameengine = 'true'
- use_openal = 'true'
-@@ -561,7 +656,7 @@ elif string.find (sys.platform, 'irix')
- use_openal = 'false'
- use_fmod = 'false'
- use_quicktime = 'false'
-- use_sumo = 'false'
-+ use_sumo = 'true'
- use_ode = 'false'
- use_bullet = 'false'
- use_buildinfo = 'false'
diff --git a/graphics/blender/patches/patch-af b/graphics/blender/patches/patch-af
deleted file mode 100644
index 53be24fddaf..00000000000
--- a/graphics/blender/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/02/23 20:15:22 joerg Exp $
-
---- extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp.orig 2006-02-10 20:35:26.000000000 +0100
-+++ extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
-@@ -36,7 +36,7 @@
- #if defined (WIN32)
- #include <malloc.h>
- #else
--#if defined (__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <stdlib.h>
- #else
- #include <alloca.h>
diff --git a/graphics/blender/patches/patch-ag b/graphics/blender/patches/patch-ag
deleted file mode 100644
index 396351b2fb1..00000000000
--- a/graphics/blender/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/02/23 20:15:22 joerg Exp $
-
---- extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp.orig 2006-02-10 20:42:45.000000000 +0100
-+++ extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
-@@ -42,7 +42,7 @@
- #if defined (WIN32)
- #include <malloc.h>
- #else
--#if defined (__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <stdlib.h>
- #else
- #include <alloca.h>
diff --git a/graphics/blender/patches/patch-ai b/graphics/blender/patches/patch-ai
new file mode 100644
index 00000000000..47c49b2c6c5
--- /dev/null
+++ b/graphics/blender/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2008/01/04 19:56:46 markd Exp $
+
+--- CMakeLists.txt.orig 2007-12-07 15:07:16.000000000 +1300
++++ CMakeLists.txt
+@@ -133,6 +133,8 @@ IF(UNIX)
+ )
+ IF(INTL_LIBRARY AND ICONV_LIBRARY)
+ SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
++ ELSEIF(INTL_LIBRARY)
++ SET(GETTEXT_LIB ${INTL_LIBRARY})
+ ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+
+ FIND_PATH(FREETYPE_INC
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 08:19:46 +0000