mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
blender: bump version, still crashes on start up.
This commit is contained in:
Jerome Duval
@@ -10,11 +10,12 @@ benefit from its unified pipeline and responsive development process.
|
||||
"
|
||||
HOMEPAGE="http://www.blender.org"
|
||||
SOURCE_URI="http://download.blender.org/source/blender-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="0ca3ceb6c656ae7c556f81ab0994e6aa7a6c64324824cbc94a87caf36f0a119d"
|
||||
CHECKSUM_SHA256="5b99649a89bdcd53bef8e668fbf2be5b3e9611f52f9e9c5f7e7c814c778e5835"
|
||||
REVISION="1"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2002-2009 Blender Foundation"
|
||||
ARCHITECTURES="!x86 x86_64"
|
||||
PYTHON_VERSION="3.5"
|
||||
|
||||
PATCHES="blender-$portVersion.patchset"
|
||||
|
||||
@@ -35,7 +36,7 @@ REQUIRES="
|
||||
lib:libtiff$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
lib:libopenimageio$secondaryArchSuffix
|
||||
lib:libpython3.4m$secondaryArchSuffix
|
||||
lib:libpython${PYTHON_VERSION}m$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
@@ -49,12 +50,13 @@ BUILD_REQUIRES="
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:libopenimageio$secondaryArchSuffix
|
||||
devel:libpython3.4m$secondaryArchSuffix
|
||||
devel:libpython${PYTHON_VERSION}m$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
python3_numpy
|
||||
cmd:python3.4
|
||||
python3_requests
|
||||
cmd:python${PYTHON_VERSION}
|
||||
cmd:cmake
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
@@ -65,12 +67,14 @@ BUILD()
|
||||
{
|
||||
mkdir -p build_haiku
|
||||
make $jobArgs BUILD_DIR=`pwd`/build_haiku \
|
||||
BUILD_CMAKE_ARGS="-DPYTHON_INCLUDE_DIR=/system/develop/headers/python3.4m/ \
|
||||
-DPYTHON_LIBRARY=/system/lib/libpython3.4m.so.1.0 \
|
||||
-DPYTHON_EXECUTABLE=/bin/python3.4 \
|
||||
BUILD_CMAKE_ARGS="-DPYTHON_INCLUDE_DIR=/system/develop/headers/python${PYTHON_VERSION}m/ \
|
||||
-DPYTHON_LIBRARY=/system/lib/libpython${PYTHON_VERSION}m.so.1.0 \
|
||||
-DPYTHON_EXECUTABLE=/bin/python${PYTHON_VERSION} \
|
||||
-DWITH_CYCLES=OFF \
|
||||
-DWITH_BOOST=OFF \
|
||||
-DWITH_PYTHON_INSTALL=OFF \
|
||||
-DWITH_PYTHON_INSTALL_NUMPY=OFF \
|
||||
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix"
|
||||
}
|
||||
|
||||
@@ -84,7 +88,7 @@ INSTALL()
|
||||
mv $prefix/GPL-license.txt $prefix/LICENSE-bfont.ttf.txt \
|
||||
$prefix/Python-license.txt $prefix/copyright.txt $prefix/readme.html \
|
||||
$prefix/blender.svg $docDir
|
||||
mv $prefix/2.74/* $dataDir/
|
||||
mv $prefix/$portVersion/* $dataDir/
|
||||
mv $prefix/blender.desktop $appsDir/
|
||||
rmdir $prefix/2.74
|
||||
rmdir $prefix/$portVersion
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
From 52160fdf8796197a09e63a393ca9911cdf3983bd Mon Sep 17 00:00:00 2001
|
||||
From cd9bf78ae65a160e0e21143ace41dd7b86747c30 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..6ffe6fb 100644
|
||||
index 029198f..17e976b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -183,7 +183,7 @@ endif()
|
||||
@@ -189,7 +189,7 @@ endif()
|
||||
# Options
|
||||
|
||||
# First platform spesific non-cached vars
|
||||
@@ -17,7 +17,7 @@ index b52dd05..6ffe6fb 100644
|
||||
set(WITH_X11 ON)
|
||||
endif()
|
||||
|
||||
@@ -1104,7 +1104,8 @@ if(UNIX AND NOT APPLE)
|
||||
@@ -1159,7 +1159,8 @@ if(UNIX AND NOT APPLE)
|
||||
endif()
|
||||
|
||||
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
|
||||
@@ -28,10 +28,10 @@ index b52dd05..6ffe6fb 100644
|
||||
find_package(Threads REQUIRED)
|
||||
list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT})
|
||||
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
|
||||
index 33c7644..1457f65 100644
|
||||
index 90c4fbd..7d1e389 100644
|
||||
--- a/build_files/cmake/macros.cmake
|
||||
+++ b/build_files/cmake/macros.cmake
|
||||
@@ -1390,6 +1390,7 @@ macro(find_python_package
|
||||
@@ -1446,6 +1446,7 @@ function(find_python_package
|
||||
PATH_SUFFIXES
|
||||
site-packages
|
||||
dist-packages
|
||||
@@ -39,14 +39,14 @@ index 33c7644..1457f65 100644
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
@@ -1399,6 +1400,8 @@ macro(find_python_package
|
||||
@@ -1455,6 +1456,8 @@ function(find_python_package
|
||||
"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
|
||||
"'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
|
||||
"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
|
||||
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/vendor-packages/${package}', "
|
||||
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/vendor-packages/${package}', "
|
||||
"WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
|
||||
set(WITH_PYTHON_INSTALL_${_upper_package} OFF)
|
||||
set(WITH_PYTHON_INSTALL_${_upper_package} OFF PARENT_SCOPE)
|
||||
else()
|
||||
diff --git a/extern/libmv/libmv/numeric/numeric.h b/extern/libmv/libmv/numeric/numeric.h
|
||||
index 55d4c7d..d8ebd72 100644
|
||||
@@ -251,10 +251,10 @@ index 0000000..7d19272
|
||||
+# define NO_FRAME_POINTER
|
||||
+#endif
|
||||
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
|
||||
index 6cab1f0..95dcf55 100644
|
||||
index 3f7e462..38abccb 100644
|
||||
--- a/intern/guardedalloc/intern/mallocn_intern.h
|
||||
+++ b/intern/guardedalloc/intern/mallocn_intern.h
|
||||
@@ -62,6 +62,9 @@
|
||||
@@ -63,6 +63,9 @@
|
||||
#elif defined(WIN32)
|
||||
# include <malloc.h>
|
||||
# define malloc_usable_size _msize
|
||||
@@ -262,15 +262,15 @@ index 6cab1f0..95dcf55 100644
|
||||
+# 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
|
||||
# pragma message "We don't know how to use malloc_usable_size on your platform"
|
||||
# undef USE_MALLOC_USABLE_SIZE
|
||||
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
|
||||
index 1a4a4bd..36cebb2 100644
|
||||
index 9004985..7432ab7 100644
|
||||
--- a/source/blender/blenkernel/intern/bvhutils.c
|
||||
+++ b/source/blender/blenkernel/intern/bvhutils.c
|
||||
@@ -48,6 +48,17 @@
|
||||
|
||||
static ThreadRWMutex cache_rwlock = BLI_RWLOCK_INITIALIZER;
|
||||
@@ -52,6 +52,17 @@ static ThreadRWMutex cache_rwlock = BLI_RWLOCK_INITIALIZER;
|
||||
/** \name Local Callbacks
|
||||
* \{ */
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+static pthread_once_t sInitOnce = PTHREAD_ONCE_INIT;
|
||||
@@ -285,8 +285,8 @@ index 1a4a4bd..36cebb2 100644
|
||||
+
|
||||
/* Math stuff for ray casting on mesh faces and for nearest surface */
|
||||
|
||||
float bvhtree_ray_tri_intersection(const BVHTreeRay *ray, const float UNUSED(m_dist), const float v0[3], const float v1[3], const float v2[3])
|
||||
@@ -812,6 +823,9 @@ void bvhcache_insert(BVHCache *cache, BVHTree *tree, int type)
|
||||
float bvhtree_ray_tri_intersection(
|
||||
@@ -1192,6 +1203,9 @@ void bvhcache_insert(BVHCache *cache, BVHTree *tree, int type)
|
||||
|
||||
void bvhcache_init(BVHCache *cache)
|
||||
{
|
||||
@@ -297,7 +297,7 @@ index 1a4a4bd..36cebb2 100644
|
||||
}
|
||||
|
||||
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
|
||||
index 2adf8eb..06d2807 100644
|
||||
index 23261b6..9a81af7 100644
|
||||
--- a/source/blender/blenkernel/intern/font.c
|
||||
+++ b/source/blender/blenkernel/intern/font.c
|
||||
@@ -64,6 +64,16 @@
|
||||
@@ -330,10 +330,10 @@ index 2adf8eb..06d2807 100644
|
||||
/* Set font data */
|
||||
vfont = cu->vfont;
|
||||
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
|
||||
index b7ebcfa..9fc872a 100644
|
||||
index 9c72012..7b0570c 100644
|
||||
--- a/source/blender/blenkernel/intern/particle_system.c
|
||||
+++ b/source/blender/blenkernel/intern/particle_system.c
|
||||
@@ -106,6 +106,16 @@
|
||||
@@ -107,6 +107,16 @@
|
||||
|
||||
static ThreadRWMutex psys_bvhtree_rwlock = BLI_RWLOCK_INITIALIZER;
|
||||
|
||||
@@ -350,7 +350,7 @@ index b7ebcfa..9fc872a 100644
|
||||
/************************************************/
|
||||
/* Reacting to system events */
|
||||
/************************************************/
|
||||
@@ -4034,6 +4044,11 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
|
||||
@@ -4042,6 +4052,11 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
|
||||
ParticleSimulationData sim= {0};
|
||||
ParticleSettings *part = psys->part;
|
||||
float cfra;
|
||||
@@ -363,10 +363,10 @@ index b7ebcfa..9fc872a 100644
|
||||
/* drawdata is outdated after ANY change */
|
||||
if (psys->pdd) psys->pdd->flag &= ~PARTICLE_DRAW_DATA_UPDATED;
|
||||
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
|
||||
index 9519c7b..6e03981 100644
|
||||
index 509ca9c..d3525dc 100644
|
||||
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
|
||||
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
|
||||
@@ -80,6 +80,17 @@ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
|
||||
@@ -89,6 +89,17 @@ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
|
||||
static ThreadRWMutex loops_cache_rwlock = BLI_RWLOCK_INITIALIZER;
|
||||
static ThreadRWMutex origindex_cache_rwlock = BLI_RWLOCK_INITIALIZER;
|
||||
|
||||
@@ -384,7 +384,7 @@ index 9519c7b..6e03981 100644
|
||||
static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
|
||||
int drawInteriorEdges,
|
||||
int useSubsurfUv,
|
||||
@@ -3392,6 +3403,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
|
||||
@@ -4335,6 +4346,10 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
|
||||
MPoly *mpoly = NULL;
|
||||
bool has_edge_cd;
|
||||
|
||||
@@ -392,14 +392,14 @@ index 9519c7b..6e03981 100644
|
||||
+ pthread_once(&sInitOnce, &init_cache_rwlock);
|
||||
+#endif
|
||||
+
|
||||
DM_from_template(&ccgdm->dm, dm, DM_TYPE_CCGDM,
|
||||
ccgSubSurf_getNumFinalVerts(ss),
|
||||
ccgSubSurf_getNumFinalEdges(ss),
|
||||
edgeSize = ccgSubSurf_getEdgeSize(ss);
|
||||
gridSize = ccgSubSurf_getGridSize(ss);
|
||||
gridFaces = gridSize - 1;
|
||||
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
|
||||
index 74291ca..9d031ba 100644
|
||||
index 6ae833d..c7729f6 100644
|
||||
--- a/source/blender/blenlib/BLI_threads.h
|
||||
+++ b/source/blender/blenlib/BLI_threads.h
|
||||
@@ -126,7 +126,11 @@ void BLI_spin_end(SpinLock *spin);
|
||||
@@ -127,7 +127,11 @@ void BLI_spin_end(SpinLock *spin);
|
||||
#define THREAD_LOCK_READ 1
|
||||
#define THREAD_LOCK_WRITE 2
|
||||
|
||||
@@ -412,10 +412,10 @@ index 74291ca..9d031ba 100644
|
||||
typedef pthread_rwlock_t ThreadRWMutex;
|
||||
|
||||
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
|
||||
index d6fe5e5..a81355d 100644
|
||||
index ef9a7c0..6d80ae7 100644
|
||||
--- a/source/blender/blenlib/intern/fileops.c
|
||||
+++ b/source/blender/blenlib/intern/fileops.c
|
||||
@@ -583,6 +583,10 @@ static int recursive_operation(const char *startfrom, const char *startto,
|
||||
@@ -616,6 +616,10 @@ static int recursive_operation(const char *startfrom, const char *startto,
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
const struct dirent * const dirent = dirlist[i];
|
||||
@@ -426,7 +426,7 @@ index d6fe5e5..a81355d 100644
|
||||
|
||||
if (FILENAME_IS_CURRPAR(dirent->d_name))
|
||||
continue;
|
||||
@@ -591,7 +595,13 @@ static int recursive_operation(const char *startfrom, const char *startto,
|
||||
@@ -624,7 +628,13 @@ static int recursive_operation(const char *startfrom, const char *startto,
|
||||
if (to)
|
||||
join_dirfile_alloc(&to_path, &to_alloc_len, to, dirent->d_name);
|
||||
|
||||
@@ -441,11 +441,11 @@ index d6fe5e5..a81355d 100644
|
||||
ret = recursive_operation(from_path, to_path, callback_dir_pre, callback_file, callback_dir_post);
|
||||
}
|
||||
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
|
||||
index 46c5a11..a38bbb3 100644
|
||||
index 7fdf6ec..30d4c4c 100644
|
||||
--- a/source/blender/blenlib/intern/storage.c
|
||||
+++ b/source/blender/blenlib/intern/storage.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <time.h>
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__sun)
|
||||
@@ -454,5 +454,5 @@ index 46c5a11..a38bbb3 100644
|
||||
# include <sys/statvfs.h>
|
||||
# define USE_STATFS_STATVFS
|
||||
--
|
||||
1.8.3.4
|
||||
2.2.2
|
||||
|
||||
Reference in New Issue
Block a user