sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to version 2.70a

Browse source 
Changelog: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.70/Bug_Fixes#Fixes_since_2.70_release
This commit is contained in:
Marcus von Appen 2014-04-13 15:34:19 +00:00
parent ab887551f5
commit 26a6160fe0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=351225
5 changed files with 52 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/blender/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= blender
PORTVERSION= 2.70
PORTVERSION= 2.70a
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@ -32,6 +32,7 @@ SHEBANG_FILES= release/bin/blender-thumbnailer.py \
SUB_FILES= blender blenderplayer
WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION}
OUTDIR= ${INSTALL_WRKSRC}/bin/2.70
.include "${.CURDIR}/Makefile.options"
@ -91,7 +92,10 @@ LIBMV_CMAKE_OFF= -DWITH_LIBMV:BOOL=OFF
MENU_USES= desktop-file-utils
NLS_CMAKE_ON= -DWITH_INTERNATIONAL:BOOL=ON
NLS_CMAKE_OFF= -DWITH_INTERNATIONAL:BOOL=OFF
NLS_USES= gettext iconv
# Use iconv:wchar_t to force the usage of iconv from ports.
# libboost_locale.so uses libiconv_open, while we only provide
# iconv_open in 10.x+
NLS_USES= gettext iconv:lib,wchar_t
OPENCOLORIO_CMAKE_ON= -DWITH_OPENCOLORIO:BOOL=ON
OPENCOLORIO_CMAKE_OFF= -DWITH_OPENCOLORIO:BOOL=OFF
OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio

4
graphics/blender/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (blender-2.70.tar.gz) = 2695c3cab21721d1108c90e6e9cb4b279817f551904d5276793fb3adaef3e348
SIZE (blender-2.70.tar.gz) = 55298021
SHA256 (blender-2.70a.tar.gz) = eb2d82e4bace4028e05eef2ac9799104231eafd91f1500b91c32471bac8cf3e5
SIZE (blender-2.70a.tar.gz) = 55875629

10
graphics/blender/files/patch-CMakeLists.txt Normal file
View file

@ -0,0 +1,10 @@
--- CMakeLists.txt.orig 2014-04-13 12:03:21.000000000 +0200
+++ CMakeLists.txt 2014-04-13 12:13:07.000000000 +0200
@@ -740,6 +740,7 @@
set(__boost_packages filesystem regex system thread date_time)
if(WITH_INTERNATIONAL)
list(APPEND __boost_packages locale)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale needs it !
endif()
if(WITH_CYCLES_NETWORK)
list(APPEND __boost_packages serialization)

14
graphics/blender/files/patch-extern_carve_include_mesh_ops.hpp
View file

@ -1,14 +0,0 @@
--- extern/carve/include/carve/mesh_ops.hpp.orig 2014-03-22 13:19:46.000000000 +0100
+++ extern/carve/include/carve/mesh_ops.hpp 2014-03-22 13:20:36.000000000 +0100
@@ -580,8 +580,10 @@
std::vector<VertexInfo *> queue;
void checkheap() {
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), order_by_score()));
+#elif defined(__clang__) && defined(_LIBCPP_VERSION)
+ CARVE_ASSERT(std::is_heap(queue.begin(), queue.end(), order_by_score()));
#endif
}

34
graphics/blender/files/patch-source_blender_editors_sculpt_paint_paint_cursor.c Normal file
View file

@ -0,0 +1,34 @@
--- source/blender/editors/sculpt_paint/paint_cursor.c.orig 2014-04-12 23:54:53.000000000 +0200
+++ source/blender/editors/sculpt_paint/paint_cursor.c 2014-04-12 23:58:59.000000000 +0200
@@ -210,6 +210,13 @@
int i;
float y;
float len;
+ int thread_num;
+
+#ifdef _OPENMP
+ thread_num = omp_get_thread_num();
+#else
+ thread_num = 0;
+#endif
for (i = 0; i < size; i++) {
@@ -249,7 +256,7 @@
if (col) {
float rgba[4];
- paint_get_tex_pixel_col(mtex, x, y, rgba, pool, omp_get_thread_num());
+ paint_get_tex_pixel_col(mtex, x, y, rgba, pool, thread_num);
buffer[index * 4] = rgba[0] * 255;
buffer[index * 4 + 1] = rgba[1] * 255;
@@ -257,7 +264,7 @@
buffer[index * 4 + 3] = rgba[3] * 255;
}
else {
- float avg = paint_get_tex_pixel(mtex, x, y, pool, omp_get_thread_num());
+ float avg = paint_get_tex_pixel(mtex, x, y, pool, thread_num);
avg += br->texture_sample_bias;