From owner-svn-ports-all@FreeBSD.ORG Sun Apr 13 15:34:21 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21229D2E; Sun, 13 Apr 2014 15:34:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C69E196C; Sun, 13 Apr 2014 15:34:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DFYKas004798; Sun, 13 Apr 2014 15:34:20 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DFYKuv004791; Sun, 13 Apr 2014 15:34:20 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201404131534.s3DFYKuv004791@svn.freebsd.org> From: Marcus von Appen Date: Sun, 13 Apr 2014 15:34:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351225 - in head/graphics/blender: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 15:34:21 -0000 Author: mva Date: Sun Apr 13 15:34:19 2014 New Revision: 351225 URL: http://svnweb.freebsd.org/changeset/ports/351225 QAT: https://qat.redports.org/buildarchive/r351225/ Log: - Update to version 2.70a Changelog: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.70/Bug_Fixes#Fixes_since_2.70_release Added: head/graphics/blender/files/patch-CMakeLists.txt (contents, props changed) head/graphics/blender/files/patch-source_blender_editors_sculpt_paint_paint_cursor.c (contents, props changed) Deleted: head/graphics/blender/files/patch-extern_carve_include_mesh_ops.hpp Modified: head/graphics/blender/Makefile head/graphics/blender/distinfo Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Sun Apr 13 14:55:59 2014 (r351224) +++ head/graphics/blender/Makefile Sun Apr 13 15:34:19 2014 (r351225) @@ -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-thumb 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 Modified: head/graphics/blender/distinfo ============================================================================== --- head/graphics/blender/distinfo Sun Apr 13 14:55:59 2014 (r351224) +++ head/graphics/blender/distinfo Sun Apr 13 15:34:19 2014 (r351225) @@ -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 Added: head/graphics/blender/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-CMakeLists.txt Sun Apr 13 15:34:19 2014 (r351225) @@ -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) Added: head/graphics/blender/files/patch-source_blender_editors_sculpt_paint_paint_cursor.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-source_blender_editors_sculpt_paint_paint_cursor.c Sun Apr 13 15:34:19 2014 (r351225) @@ -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; +