mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
blender: added WIP recipe for version 2.74
* missing: malloc_usable_size().
This commit is contained in:
47
media-gfx/blender/patches/blender-2.74.patchset
Normal file
47
media-gfx/blender/patches/blender-2.74.patchset
Normal file
@@ -0,0 +1,47 @@
|
||||
From fef1204371b16fcaec1a2e3563910e38b036b104 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 6 Jun 2015 10:06:04 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b52dd05..382c8a9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -183,7 +183,7 @@ endif()
|
||||
# Options
|
||||
|
||||
# First platform spesific non-cached vars
|
||||
-if(UNIX AND NOT APPLE)
|
||||
+if(UNIX AND NOT (APPLE OR HAIKU))
|
||||
set(WITH_X11 ON)
|
||||
endif()
|
||||
|
||||
diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/libmv/third_party/glog/src/config.h
|
||||
index f5c9c0b..2703b7b 100644
|
||||
--- a/extern/libmv/third_party/glog/src/config.h
|
||||
+++ b/extern/libmv/third_party/glog/src/config.h
|
||||
@@ -14,4 +14,6 @@
|
||||
#include "windows/config.h"
|
||||
#elif defined(__GNU__)
|
||||
#include "config_hurd.h"
|
||||
+#elif defined(__HAIKU__)
|
||||
+ #include "config_haiku.h"
|
||||
#endif
|
||||
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
|
||||
index 6cab1f0..95dcf55 100644
|
||||
--- a/intern/guardedalloc/intern/mallocn_intern.h
|
||||
+++ b/intern/guardedalloc/intern/mallocn_intern.h
|
||||
@@ -62,6 +62,9 @@
|
||||
#elif defined(WIN32)
|
||||
# include <malloc.h>
|
||||
# define malloc_usable_size _msize
|
||||
+#elif defined(__HAIKU__)
|
||||
+# include <malloc.h>
|
||||
+size_t malloc_usable_size(void *ptr);
|
||||
#else
|
||||
# error "We don't know how to use malloc_usable_size on your platform"
|
||||
#endif
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user