update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
From 30a2ecc7939449f235282eb6de42e367fc5b1867 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 14 Jan 2016 22:13:15 +0100
|
||||
Subject: [PATCH] Fix FBXConverter: use proper 64-bit constant
|
||||
|
||||
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
|
||||
|
||||
code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
|
||||
code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
|
||||
code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
|
||||
code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
|
||||
code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
|
||||
code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
code/FBXConverter.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
|
||||
index e0c6b9c..b1e9a71 100644
|
||||
--- a/code/FBXConverter.cpp
|
||||
+++ b/code/FBXConverter.cpp
|
||||
@@ -67,7 +67,7 @@ namespace FBX {
|
||||
|
||||
#define MAGIC_NODE_TAG "_$AssimpFbx$"
|
||||
|
||||
-#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L
|
||||
+#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL
|
||||
|
||||
// XXX vc9's debugger won't step into anonymous namespaces
|
||||
//namespace {
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 8457f3eff89dae35d43f679a66842ceedfd08808 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
|
||||
<zmoelnig@umlautQ.umlaeute.mur.at>
|
||||
Date: Fri, 13 Nov 2015 22:33:20 +0100
|
||||
Subject: [PATCH] fix compilation on BigEndian
|
||||
|
||||
cannot pass a function by reference where an lvalue is expected
|
||||
(only applies to bigendian, where a macro expands to a byteswap function)
|
||||
|
||||
Closes https://github.com/assimp/assimp/issues/613
|
||||
|
||||
Taken from [1] for buildroot assimp package compile fix.
|
||||
|
||||
[1] https://github.com/assimp/assimp/commit/756cfd4f74b866e3183caede69daa8c105b73bab.patch
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
code/Bitmap.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp
|
||||
index 13ec372..829fd02 100644
|
||||
--- a/code/Bitmap.cpp
|
||||
+++ b/code/Bitmap.cpp
|
||||
@@ -84,7 +84,12 @@ namespace Assimp {
|
||||
|
||||
template<typename T>
|
||||
inline std::size_t Copy(uint8_t* data, T& field) {
|
||||
+#ifdef AI_BUILD_BIG_ENDIAN
|
||||
+ T field_swapped=AI_BE(field);
|
||||
+ std::memcpy(data, &field_swapped, sizeof(field)); return sizeof(field);
|
||||
+#else
|
||||
std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void Bitmap::WriteHeader(Header& header, IOStream* file) {
|
||||
--
|
||||
2.1.4
|
||||
|
||||
19
bsp/buildroot-2017.02.11/package/assimp/Config.in
Normal file
19
bsp/buildroot-2017.02.11/package/assimp/Config.in
Normal file
@@ -0,0 +1,19 @@
|
||||
config BR2_PACKAGE_ASSIMP
|
||||
bool "assimp"
|
||||
# All gcc versions affected by
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
|
||||
# cause an infinite loop in gcc when building this package.
|
||||
depends on !BR2_microblaze
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Open Asset Import Library (assimp) is a portable Open Source
|
||||
library to import various well-known 3D model formats in a uniform
|
||||
manner. The most recent version also knows how to export 3d files
|
||||
and is therefore suitable as a general-purpose 3D model converter.
|
||||
|
||||
http://www.assimp.org
|
||||
|
||||
comment "assimp needs a toolchain w/ C++"
|
||||
depends on !BR2_microblaze
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
2
bsp/buildroot-2017.02.11/package/assimp/assimp.hash
Normal file
2
bsp/buildroot-2017.02.11/package/assimp/assimp.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a assimp-v3.2.tar.gz
|
||||
30
bsp/buildroot-2017.02.11/package/assimp/assimp.mk
Normal file
30
bsp/buildroot-2017.02.11/package/assimp/assimp.mk
Normal file
@@ -0,0 +1,30 @@
|
||||
################################################################################
|
||||
#
|
||||
# assimp
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ASSIMP_VERSION = v3.2
|
||||
ASSIMP_SITE = $(call github,assimp,assimp,$(ASSIMP_VERSION))
|
||||
ASSIMP_LICENSE = BSD-3c
|
||||
ASSIMP_LICENSE_FILES = LICENSE
|
||||
ASSIMP_DEPENDENCIES = zlib
|
||||
ASSIMP_INSTALL_STAGING = YES
|
||||
|
||||
# relocation truncated to fit: R_68K_GOT16O
|
||||
ifeq ($(BR2_m68k),y)
|
||||
ASSIMP_CXXFLAGS += -mxgot
|
||||
endif
|
||||
|
||||
# workaround SuperH compiler failure when static linking (i.e -fPIC is
|
||||
# not passed) in gcc versions 5.x or older. The -Os optimization level
|
||||
# causes a "unable to find a register to spill in class
|
||||
# ‘GENERAL_REGS’" error. -O2 works fine.
|
||||
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
|
||||
ASSIMP_CXXFLAGS += -O2
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user