mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
tiopex
@@ -1,37 +0,0 @@
|
||||
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>
|
||||
[Rebased on 5.0.1]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
code/FBX/FBXConverter.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/code/FBX/FBXConverter.cpp b/code/FBXConverter.cpp
|
||||
index e0c6b9c..b1e9a71 100644
|
||||
--- a/code/FBX/FBXConverter.cpp
|
||||
+++ b/code/FBX/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
|
||||
|
||||
39
package/assimp/0001-code-disable-Werror.patch
Normal file
39
package/assimp/0001-code-disable-Werror.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
From 5146e1c4d58174e302dbdcf2a85c2023be1cffc6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Fri, 10 Dec 2021 15:15:30 +0100
|
||||
Subject: [PATCH] code: disable -Werror
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes:
|
||||
|
||||
.../build/assimp-5.1.3/code/PostProcessing/TriangulateProcess.cpp:285:50: error: argument 1 value ‘4294967294’ exceeds maximum object size 2147483647 [-Werror=alloc-size-larger-than=]
|
||||
285 | std::unique_ptr<bool[]> done(new bool[max_out]);
|
||||
| ^
|
||||
[...]
|
||||
.../host/opt/ext-toolchain/powerpc-buildroot-linux-uclibc/include/c++/9.3.0/new:127:26: note: in a call to allocation function ‘void* operator new [](std::size_t)’ declared here
|
||||
127 | _GLIBCXX_NODISCARD void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc)
|
||||
| ^~~~~~~~
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
code/CMakeLists.txt | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
|
||||
index e45bf8a2a..f71b6583d 100644
|
||||
--- a/code/CMakeLists.txt
|
||||
+++ b/code/CMakeLists.txt
|
||||
@@ -1167,8 +1167,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
|
||||
# enable warnings as errors ########################################
|
||||
IF (MSVC)
|
||||
TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
|
||||
-ELSE()
|
||||
- TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)
|
||||
ENDIF()
|
||||
|
||||
# adds C_FLAGS required to compile zip.c on old GCC 4.x compiler
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From 3fef857a570d1ef2c96401358fe8e239625b48c9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Fri, 10 Apr 2020 18:11:50 +0200
|
||||
Subject: [PATCH] contrib/zip: fix ssize_t typedef mismatch for musl compile
|
||||
|
||||
Musl uses defines __DEFINED_ssize_t to indicate ssize_t
|
||||
availability. So backport this part of upstream commit [1]
|
||||
to fixl musl compile.
|
||||
|
||||
https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
contrib/zip/src/zip.h | 13 +++++++++++--
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h
|
||||
index 5f39df50..4672eb3e 100644
|
||||
--- a/contrib/zip/src/zip.h
|
||||
+++ b/contrib/zip/src/zip.h
|
||||
@@ -20,8 +20,9 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \
|
||||
- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
|
||||
-#define _SSIZE_T
|
||||
+ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \
|
||||
+ !defined(_SSIZE_T) && !defined(_SSIZE_T_)
|
||||
+
|
||||
// 64-bit Windows is the only mainstream platform
|
||||
// where sizeof(long) != sizeof(void*)
|
||||
#ifdef _WIN64
|
||||
@@ -29,6 +30,14 @@ typedef long long ssize_t; /* byte count or error */
|
||||
#else
|
||||
typedef long ssize_t; /* byte count or error */
|
||||
#endif
|
||||
+
|
||||
+#define _SSIZE_T_DEFINED
|
||||
+#define _SSIZE_T_DEFINED_
|
||||
+#define __DEFINED_ssize_t
|
||||
+#define __ssize_t_defined
|
||||
+#define _SSIZE_T
|
||||
+#define _SSIZE_T_
|
||||
+
|
||||
#endif
|
||||
|
||||
#ifndef MAX_PATH
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 2b8684aded0c383be64bac0fa59e39870252963f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 12 Apr 2020 18:19:13 +0200
|
||||
Subject: [PATCH] contrib/zlib: disable dynamic library building
|
||||
|
||||
Fixes compile failure for static only toolchains (and assimp
|
||||
links against the static one).
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
contrib/zlib/CMakeLists.txt | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt
|
||||
index 9d1fcc94..78346233 100644
|
||||
--- a/contrib/zlib/CMakeLists.txt
|
||||
+++ b/contrib/zlib/CMakeLists.txt
|
||||
@@ -195,10 +195,7 @@ if(MINGW)
|
||||
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
|
||||
endif(MINGW)
|
||||
|
||||
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
||||
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
||||
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
|
||||
-set_target_properties(zlib PROPERTIES SOVERSION 1)
|
||||
|
||||
INSTALL( TARGETS zlibstatic
|
||||
LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@@ -2,6 +2,9 @@ config BR2_PACKAGE_ASSIMP
|
||||
bool "assimp"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
|
||||
help
|
||||
Open Asset Import Library (assimp) is a portable Open Source
|
||||
library to import various well-known 3D model formats in a
|
||||
@@ -13,3 +16,6 @@ config BR2_PACKAGE_ASSIMP
|
||||
|
||||
comment "assimp needs a toolchain w/ C++, wchar"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
|
||||
|
||||
comment "assimp needs exception_ptr"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc assimp-5.0.1.tar.gz
|
||||
sha256 a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8 LICENSE
|
||||
sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz
|
||||
sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE
|
||||
|
||||
@@ -4,10 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ASSIMP_VERSION = 5.0.1
|
||||
ASSIMP_VERSION = 5.1.6
|
||||
ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION))
|
||||
ASSIMP_LICENSE = BSD-3-Clause
|
||||
ASSIMP_LICENSE_FILES = LICENSE
|
||||
ASSIMP_CPE_ID_VENDOR = assimp
|
||||
ASSIMP_DEPENDENCIES = zlib
|
||||
ASSIMP_INSTALL_STAGING = YES
|
||||
|
||||
# relocation truncated to fit: R_68K_GOT16O. We also need to disable
|
||||
@@ -36,7 +38,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
ASSIMP_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF \
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user