diff --git a/media-gfx/blender/blender-2.47-haiku.diff b/media-gfx/blender/blender-2.47-haiku.diff index d727aeeb7..e00092a61 100644 --- a/media-gfx/blender/blender-2.47-haiku.diff +++ b/media-gfx/blender/blender-2.47-haiku.diff @@ -1356,6 +1356,19 @@ Index: intern/ghost/intern/GHOST_WindowHaiku.cpp + fGSystem->pushEvent(event); + } +} +Index: source/blender/imbuf/intern/imbuf.h +=================================================================== +--- source/blender/imbuf/intern/imbuf.h (revision 19951) ++++ source/blender/imbuf/intern/imbuf.h (working copy) +@@ -51,7 +51,7 @@ + #include + #endif + +-#if !defined(WIN32) && !defined(__BeOS) ++#if !defined(WIN32) && !defined(__BeOS) && !defined(__HAIKU__) + #define O_BINARY 0 + #endif + Index: source/blender/blenlib/intern/storage.c =================================================================== --- source/blender/blenlib/intern/storage.c (revision 19951) @@ -1485,8 +1498,10 @@ Index: config/haiku1-config.py =================================================================== --- config/haiku1-config.py (revision 0) +++ config/haiku1-config.py (revision 0) -@@ -0,0 +1,191 @@ +@@ -0,0 +1,194 @@ +import os ++import subprocess ++import sys + +HAIKU_DEVELOP_DIR = '/boot/develop' +HAIKU_DEVELOP_LIB = HAIKU_DEVELOP_DIR + '/lib/x86' # TODO arch @@ -1506,7 +1521,9 @@ Index: config/haiku1-config.py +BF_PYTHON_BINARY = BF_PYTHON + '/bin/python' + BF_PYTHON_VERSION +BF_PYTHON_LIB = 'python' + BF_PYTHON_VERSION +BF_PYTHON_LIBPATH = HAIKU_COMMON_LIB -+BF_PYTHON_LINKFLAGS = os.popen("python-config' + BF_PYTHON_VERSION + ' --ldflags").readline() ++pipe = subprocess.Popen(['python' + BF_PYTHON_VERSION + '-config', '--ldflags'], stdout=subprocess.PIPE) ++BF_PYTHON_LINKFLAGS = pipe.communicate()[0] ++pipe.stdout.close() + +WITH_BF_OPENAL = 'false' # TODO +#BF_OPENAL = '/usr' @@ -1674,6 +1691,5 @@ Index: config/haiku1-config.py +BF_DEBUG = 'false' +BF_DEBUG_FLAGS = '-g' + -+BF_BUILDDIR = '../build-haiku1' -+BF_INSTALLDIR='../install-haiku1' -+ ++BF_BUILDDIR = '../build-' + sys.platform ++BF_INSTALLDIR='../install-' + sys.platform