Update to 2.65a
* Fix build on NetBSD current, repoted by dholland@ Fix NetBSD version conditional and link to libexecinfo Changelog: * More features * 200 over bug fixes
This commit is contained in:
parent
bb6da095db
commit
9ac912e0be
6 changed files with 1166 additions and 1316 deletions
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.83 2012/12/09 17:37:44 ryoon Exp $
|
||||
# $NetBSD: Makefile,v 1.84 2013/01/02 02:22:07 ryoon Exp $
|
||||
|
||||
DISTNAME= blender-2.64a
|
||||
PKGREVISION= 1
|
||||
DISTNAME= blender-2.65a
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://download.blender.org/source/
|
||||
|
||||
|
@ -13,7 +12,7 @@ LICENSE= gnu-gpl-v2
|
|||
USE_TOOLS+= gmake
|
||||
USE_LANGUAGES= c c++
|
||||
|
||||
PYTHON_VERSIONS_ACCEPTED= 32
|
||||
PYTHON_VERSIONS_ACCEPTED= 33
|
||||
|
||||
BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
|
||||
|
||||
|
@ -24,6 +23,12 @@ FIND_PREFIX:= SCONSDIR=scons
|
|||
|
||||
INSTALLATION_DIRS= bin share/blender
|
||||
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
.if !empty(OS_VERSION:M6.*)
|
||||
LDFLAGS+= -lexecinfo
|
||||
.endif
|
||||
.endif
|
||||
|
||||
# To pass LDFLAGS to compiler/linker
|
||||
MYLDFLAGS= `printf "'%s'," ${LDFLAGS} | sed -e 's:,$$::'`
|
||||
pre-configure:
|
||||
|
@ -64,7 +69,8 @@ do-install:
|
|||
cd ${WRKSRC} && \
|
||||
${SCONSDIR}/bin/scons ${SCONS_ARGS}
|
||||
|
||||
CHECK_INTERPRETER_SKIP= share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py
|
||||
CHECK_INTERPRETER_SKIP= share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py \
|
||||
share/blender/2.65/python/lib/python3.3/venv/scripts/posix/pydoc
|
||||
|
||||
post-install:
|
||||
${LN} -sf ${PREFIX}/share/blender/blender \
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,18 +1,18 @@
|
|||
$NetBSD: distinfo,v 1.33 2012/12/03 13:15:50 ryoon Exp $
|
||||
$NetBSD: distinfo,v 1.34 2013/01/02 02:22:07 ryoon Exp $
|
||||
|
||||
SHA1 (blender-2.64a.tar.gz) = 23aca6dc15e2ff149f51b54f008d0a1620436cdd
|
||||
RMD160 (blender-2.64a.tar.gz) = b2c78814441be92f1197c5d7ebc2c9fccb7acd4d
|
||||
Size (blender-2.64a.tar.gz) = 31388178 bytes
|
||||
SHA1 (blender-2.65a.tar.gz) = e00ea38aaa815bf19bace6dabccc22c822cc5490
|
||||
RMD160 (blender-2.65a.tar.gz) = 0381dc1be89cf4c8e7932d0d122a7a8e092f4221
|
||||
Size (blender-2.65a.tar.gz) = 31841541 bytes
|
||||
SHA1 (patch-SConstruct) = 4e3e81d3f4d8bf53a26102cb489ad507d14dd086
|
||||
SHA1 (patch-ab) = 8d101a8b780f3c1a41214db9dd295f2565f2e61c
|
||||
SHA1 (patch-ab) = 5669f269c922f9bd521d15fdb1b21ba1e58ac7f6
|
||||
SHA1 (patch-am) = d023b35fe2355e2e53e11a3c91730ebe21da6de8
|
||||
SHA1 (patch-build__files_scons_config_netbsd6-config.py) = 3a39966108612f2dc895ff8f9fe25f03517e2175
|
||||
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) = e50c9f7e36d219a789d027a5044846b105a662b0
|
||||
SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = fe674deb97e1ff8604b7fe505c715621b9fee5ee
|
||||
SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = 3d09eb0821a628c15e898b6fa432fe1d787f0eb8
|
||||
SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a
|
||||
SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 31fa525721adb920149186101f3662af2f4f8c08
|
||||
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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ab,v 1.9 2012/12/03 13:15:50 ryoon Exp $
|
||||
$NetBSD: patch-ab,v 1.10 2013/01/02 02:22:08 ryoon Exp $
|
||||
|
||||
--- source/blender/blenlib/intern/storage.c.orig 2012-10-09 18:40:29.000000000 +0000
|
||||
--- source/blender/blenlib/intern/storage.c.orig 2012-12-10 19:25:44.000000000 +0000
|
||||
+++ source/blender/blenlib/intern/storage.c
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <time.h>
|
||||
|
@ -26,6 +26,6 @@ $NetBSD: patch-ab,v 1.9 2012/12/03 13:15:50 ryoon Exp $
|
|||
|
||||
-#if defined(__sun__) || defined(__sun) || defined(__NetBSD__)
|
||||
+#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
if (statvfs(name, &disk)) return(-1);
|
||||
if (statvfs(name, &disk)) return(-1);
|
||||
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
|
||||
/* WARNING - This may not be supported by geeneric unix os's - Campbell */
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.1 2012/12/03 13:15:51 ryoon Exp $
|
||||
$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.2 2013/01/02 02:22:08 ryoon Exp $
|
||||
|
||||
* config file for NetBSD 6
|
||||
|
||||
--- build_files/scons/config/netbsd6-config.py.orig 2012-12-03 06:03:04.000000000 +0000
|
||||
--- build_files/scons/config/netbsd6-config.py.orig 2012-12-22 20:01:05.000000000 +0000
|
||||
+++ build_files/scons/config/netbsd6-config.py
|
||||
@@ -0,0 +1,226 @@
|
||||
@@ -0,0 +1,227 @@
|
||||
+CC = 'gcc'
|
||||
+CXX = 'g++'
|
||||
+
|
||||
|
@ -14,7 +14,7 @@ $NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.1 2012/12/03 13:1
|
|||
+BF_PYTHON_ABI_FLAGS = ''
|
||||
+BF_PYTHON = '/usr/local'
|
||||
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
|
||||
+BF_PYTHON_VERSION = '3.2'
|
||||
+BF_PYTHON_VERSION = '3.3'
|
||||
+WITH_BF_STATICPYTHON = False
|
||||
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
|
||||
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
|
||||
|
@ -182,6 +182,7 @@ $NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.1 2012/12/03 13:1
|
|||
+BF_BOOST = LIBDIR + '/boost'
|
||||
+BF_BOOST_INC = BF_BOOST + '/include'
|
||||
+BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
|
||||
+BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
|
||||
+BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
||||
+
|
||||
+WITH_BF_OPENMP = True
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-extern_libmv_third__party_glog_src_config__netbsd.h,v 1.1 2012/12/03 13:15:51 ryoon Exp $
|
||||
$NetBSD: patch-extern_libmv_third__party_glog_src_config__netbsd.h,v 1.2 2013/01/02 02:22:08 ryoon Exp $
|
||||
|
||||
* config file for NetBSD
|
||||
|
||||
|
@ -19,7 +19,7 @@ $NetBSD: patch-extern_libmv_third__party_glog_src_config__netbsd.h,v 1.1 2012/12
|
|||
+
|
||||
+#include <sys/param.h>
|
||||
+/* Define to 1 if you have the <execinfo.h> header file. */
|
||||
+#if __NetBSD_Version__ < 699001500
|
||||
+#if __NetBSD_Version__ > 699001500
|
||||
+#define HAVE_EXECINFO_H 1
|
||||
+#else
|
||||
+#undef HAVE_EXECINFO_H
|
||||
|
|
Loading…
Reference in a new issue