Update to 2.68a
Changelog: * New features * Bugfixes * Many improvements
This commit is contained in:
parent
7e56b94694
commit
78a0aa962d
11 changed files with 1299 additions and 1262 deletions
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.96 2013/09/01 12:14:07 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.97 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
DISTNAME= blender-2.66a
|
||||
PKGREVISION= 5
|
||||
DISTNAME= blender-2.68a
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://download.blender.org/source/
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,20 +1,16 @@
|
|||
$NetBSD: distinfo,v 1.37 2013/03/13 20:28:48 ryoon Exp $
|
||||
$NetBSD: distinfo,v 1.38 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
SHA1 (blender-2.66a.tar.gz) = f48555f3840f6ebde78603919d686672163c36ea
|
||||
RMD160 (blender-2.66a.tar.gz) = b0251067f6a6273ba1889cefafa7f8dd283e622e
|
||||
Size (blender-2.66a.tar.gz) = 36911037 bytes
|
||||
SHA1 (patch-SConstruct) = 4e3e81d3f4d8bf53a26102cb489ad507d14dd086
|
||||
SHA1 (patch-ab) = 5669f269c922f9bd521d15fdb1b21ba1e58ac7f6
|
||||
SHA1 (patch-am) = d023b35fe2355e2e53e11a3c91730ebe21da6de8
|
||||
SHA1 (blender-2.68a.tar.gz) = b01e73b560c791f5a6086deaed6072ef5f8dd3b3
|
||||
RMD160 (blender-2.68a.tar.gz) = ee451f735f0814e067f178097d95eb5d89592fee
|
||||
Size (blender-2.68a.tar.gz) = 40042207 bytes
|
||||
SHA1 (patch-ab) = 2541584b0a4317f32558f581649a8c5c9ac427b7
|
||||
SHA1 (patch-build__files_scons_config_netbsd6-config.py) = 520fa968b4f1f9f10adb1055803e05dafc96f0fe
|
||||
SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098
|
||||
SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 273c88e258ca49f29367a1f3246c25df800b920a
|
||||
SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = fe674deb97e1ff8604b7fe505c715621b9fee5ee
|
||||
SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = 3d09eb0821a628c15e898b6fa432fe1d787f0eb8
|
||||
SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 52c9ee0e0c73b9b9628a3d82292a9588ff0060da
|
||||
SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = 37649c996eda56c2a6e0776b9933df28fac645e3
|
||||
SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = be5fe12d44221bde94326cccb30316bcf29f9aba
|
||||
SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a
|
||||
SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 423dda12bb5871f810938666c0267ac73b3f856e
|
||||
SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f
|
||||
SHA1 (patch-intern_ghost_SConscript) = 84dad76663e6dfc3bd6636fe8924921fe04caa2f
|
||||
SHA1 (patch-intern_guardedalloc_MEM__sys__types.h) = 7b3ee6dc5d1b66a785a838c07507b8d93f7f1d1d
|
||||
SHA1 (patch-intern_opennl_superlu_superlu__sys__types.h) = 99fa9ffa655914067173481d5fe6c498ad069717
|
||||
SHA1 (patch-user-config.py) = a3cf1a22185496f13b068a31d4b9638c8821f941
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
$NetBSD: patch-SConstruct,v 1.1 2012/12/03 13:15:50 ryoon Exp $
|
||||
|
||||
--- SConstruct.orig 2012-10-09 18:43:46.000000000 +0000
|
||||
+++ SConstruct
|
||||
@@ -140,20 +140,7 @@ else:
|
||||
B.quickie=[]
|
||||
|
||||
toolset = B.arguments.get('BF_TOOLSET', None)
|
||||
-if toolset:
|
||||
- print "Using " + toolset
|
||||
- if toolset=='mstoolkit':
|
||||
- env = BlenderEnvironment(ENV = os.environ)
|
||||
- env.Tool('mstoolkit', [toolpath])
|
||||
- else:
|
||||
- env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
|
||||
- if env:
|
||||
- btools.SetupSpawn(env)
|
||||
-else:
|
||||
- if bitness==64 and platform=='win32':
|
||||
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
|
||||
- else:
|
||||
- env = BlenderEnvironment(ENV = os.environ)
|
||||
+env = BlenderEnvironment(ENV = os.environ)
|
||||
|
||||
if not env:
|
||||
print "Could not create a build environment"
|
|
@ -1,17 +1,24 @@
|
|||
$NetBSD: patch-ab,v 1.10 2013/01/02 02:22:08 ryoon Exp $
|
||||
$NetBSD: patch-ab,v 1.11 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
--- source/blender/blenlib/intern/storage.c.orig 2012-12-10 19:25:44.000000000 +0000
|
||||
--- source/blender/blenlib/intern/storage.c.orig 2013-04-25 16:35:57.000000000 +0000
|
||||
+++ source/blender/blenlib/intern/storage.c
|
||||
@@ -43,7 +43,7 @@
|
||||
@@ -42,13 +42,13 @@
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#if defined(__sun__) || defined(__sun) || defined(__NetBSD__)
|
||||
+#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
#include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
|
||||
# include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
|
||||
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
|
||||
#include <sys/statfs.h>
|
||||
@@ -163,7 +163,7 @@ double BLI_dir_free_space(const char *di
|
||||
# include <sys/statfs.h>
|
||||
#endif
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
# include <sys/param.h>
|
||||
# include <sys/mount.h>
|
||||
#endif
|
||||
@@ -173,7 +173,7 @@ double BLI_dir_free_space(const char *di
|
||||
return (double) (freec * bytesps * sectorspc);
|
||||
#else
|
||||
|
||||
|
@ -20,7 +27,7 @@ $NetBSD: patch-ab,v 1.10 2013/01/02 02:22:08 ryoon Exp $
|
|||
struct statvfs disk;
|
||||
#else
|
||||
struct statfs disk;
|
||||
@@ -186,7 +186,7 @@ double BLI_dir_free_space(const char *di
|
||||
@@ -198,7 +198,7 @@ double BLI_dir_free_space(const char *di
|
||||
if (statfs(name, &disk)) return(-1);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-am,v 1.2 2012/12/03 13:15:51 ryoon Exp $
|
||||
|
||||
--- source/blender/blenloader/BLO_sys_types.h.orig 2012-10-09 18:40:21.000000000 +0000
|
||||
+++ source/blender/blenloader/BLO_sys_types.h
|
||||
@@ -123,7 +123,7 @@ unsigned long __attribute__((__stdcall__
|
||||
#define ntohl(x) correctByteOrder(x)
|
||||
#endif
|
||||
#endif
|
||||
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__)
|
||||
#include <sys/param.h>
|
||||
#elif defined(__APPLE__)
|
||||
#include <sys/types.h>
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-doc_python__api_sphinx__doc__gen.sh,v 1.2 2013/02/27 15:25:28 ryoon Exp $
|
||||
$NetBSD: patch-doc_python__api_sphinx__doc__gen.sh,v 1.3 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
* Improve portability
|
||||
|
||||
--- doc/python_api/sphinx_doc_gen.sh.orig 2013-02-20 14:22:36.000000000 +0000
|
||||
--- doc/python_api/sphinx_doc_gen.sh.orig 2013-04-19 13:00:21.000000000 +0000
|
||||
+++ doc/python_api/sphinx_doc_gen.sh
|
||||
@@ -32,7 +32,7 @@ blender_version_char=$(grep BLENDER_VERS
|
||||
blender_version_cycle=$(grep BLENDER_VERSION_CYCLE $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-extern_libmv_libmv_numeric_numeric.h,v 1.1 2012/12/03 13:15:51 ryoon Exp $
|
||||
$NetBSD: patch-extern_libmv_libmv_numeric_numeric.h,v 1.2 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
--- extern/libmv/libmv/numeric/numeric.h.orig 2012-10-09 18:42:49.000000000 +0000
|
||||
--- extern/libmv/libmv/numeric/numeric.h.orig 2013-04-05 09:23:20.000000000 +0000
|
||||
+++ extern/libmv/libmv/numeric/numeric.h
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <Eigen/QR>
|
||||
#include <Eigen/SVD>
|
||||
|
||||
-#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)) && !defined(__MINGW64__)
|
||||
+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(__MINGW64__)
|
||||
void static sincos (double x, double *sinx, double *cosx) {
|
||||
+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(__MINGW64__)
|
||||
static void sincos(double x, double *sinx, double *cosx) {
|
||||
*sinx = sin(x);
|
||||
*cosx = cos(x);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.1 2012/12/03 13:15:51 ryoon Exp $
|
||||
$NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.2 2013/10/12 22:11:00 ryoon Exp $
|
||||
|
||||
--- extern/libmv/libmv/tracking/brute_region_tracker.cc.orig 2012-10-09 18:42:52.000000000 +0000
|
||||
--- extern/libmv/libmv/tracking/brute_region_tracker.cc.orig 2013-04-05 09:23:20.000000000 +0000
|
||||
+++ extern/libmv/libmv/tracking/brute_region_tracker.cc
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <emmintrin.h>
|
||||
|
@ -19,4 +19,4 @@ $NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.1 2012/
|
|||
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
void *result;
|
||||
|
||||
if(posix_memalign(&result, alignment, size)) {
|
||||
if (posix_memalign(&result, alignment, size)) {
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-intern_guardedalloc_MEM__sys__types.h,v 1.1 2012/12/03 13:15:52 ryoon Exp $
|
||||
|
||||
--- intern/guardedalloc/MEM_sys_types.h.orig 2012-10-09 18:34:13.000000000 +0000
|
||||
+++ intern/guardedalloc/MEM_sys_types.h
|
||||
@@ -131,7 +131,7 @@ unsigned long __attribute__((__stdcall__
|
||||
#define ntohl(x) correctByteOrder(x)
|
||||
#endif
|
||||
#endif
|
||||
-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
|
||||
+#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
|
||||
#include <sys/param.h>
|
||||
#elif defined (__APPLE__)
|
||||
#include <sys/types.h>
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-intern_opennl_superlu_superlu__sys__types.h,v 1.1 2012/12/03 13:15:52 ryoon Exp $
|
||||
|
||||
--- intern/opennl/superlu/superlu_sys_types.h.orig 2012-10-09 18:34:26.000000000 +0000
|
||||
+++ intern/opennl/superlu/superlu_sys_types.h
|
||||
@@ -119,7 +119,7 @@ unsigned long __attribute__((__stdcall__
|
||||
#define ntohl(x) correctByteOrder(x)
|
||||
#endif
|
||||
#endif
|
||||
-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
|
||||
+#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
|
||||
#include <sys/param.h>
|
||||
#elif defined (__APPLE__)
|
||||
#include <sys/types.h>
|
Loading…
Reference in a new issue