summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2026-06-14 02:04:02 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2026-06-14 02:04:02 -0300
commite8841d841bc9d4abad013b290018229c55b27679 (patch)
tree782a7709d777334bd2d04d54b04457bbb7cd8773
parent75a5798b46887b62b35c3271092d811ebb2bcf4c (diff)
downloadmeta-freescale-e8841d841bc9d4abad013b290018229c55b27679.tar.gz
assimp: import from meta-freescale-distro
Move the recipe into meta-freescale as part of consolidating all recipe content into a single layer. meta-freescale-distro is becoming a thin backward-compatibility layer that only keeps the distro definitions for the wrynose LTS lifetime and is no longer used for recipe development. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch52
-rw-r--r--recipes-graphics/vulkan/assimp_5.4.3.bb34
2 files changed, 86 insertions, 0 deletions
diff --git a/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch b/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch
new file mode 100644
index 000000000..1b2bb5b1a
--- /dev/null
+++ b/recipes-graphics/vulkan/assimp/0001-X3D-Fix-invalid-vector-back-usage-6283.patch
@@ -0,0 +1,52 @@
1From 59bc03d931270b6354690512d0c881eec8b97678 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kimkulling@users.noreply.github.com>
3Date: Fri, 25 Jul 2025 15:01:16 +0200
4Subject: [PATCH] X3D: Fix invalid vector::back usage (#6283)
5
6* X3D: Fix invalid vector::back usage
7
8Upstream-Status: Backport [https://github.com/assimp/assimp/commit/59bc03d931270b6354690512d0c881eec8b97678]
9---
10 code/AssetLib/X3D/X3DGeoHelper.cpp | 14 ++++++++++----
11 1 file changed, 10 insertions(+), 4 deletions(-)
12
13diff --git a/code/AssetLib/X3D/X3DGeoHelper.cpp b/code/AssetLib/X3D/X3DGeoHelper.cpp
14index 1c962a460..b90956d2c 100644
15--- a/code/AssetLib/X3D/X3DGeoHelper.cpp
16+++ b/code/AssetLib/X3D/X3DGeoHelper.cpp
17@@ -128,13 +128,17 @@ void X3DGeoHelper::rect_parallel_epiped(const aiVector3D &pSize, std::list<aiVec
18
19 #undef MESH_RectParallelepiped_CREATE_VERT
20
21+static constexpr int InvalidIndex = -1;
22+
23 void X3DGeoHelper::coordIdx_str2faces_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces, unsigned int &pPrimitiveTypes) {
24 std::vector<int32_t> f_data(pCoordIdx);
25 std::vector<unsigned int> inds;
26 unsigned int prim_type = 0;
27
28- if (f_data.back() != (-1)) {
29- f_data.push_back(-1);
30+ if (!f_data.empty()) {
31+ if (f_data.back() != InvalidIndex) {
32+ f_data.push_back(InvalidIndex);
33+ }
34 }
35
36 // reserve average size.
37@@ -191,8 +195,10 @@ mg_m_err:
38 void X3DGeoHelper::coordIdx_str2lines_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces) {
39 std::vector<int32_t> f_data(pCoordIdx);
40
41- if (f_data.back() != (-1)) {
42- f_data.push_back(-1);
43+ if (!f_data.empty()) {
44+ if (f_data.back() != InvalidIndex) {
45+ f_data.push_back(InvalidIndex);
46+ }
47 }
48
49 // reserve average size.
50--
512.34.1
52
diff --git a/recipes-graphics/vulkan/assimp_5.4.3.bb b/recipes-graphics/vulkan/assimp_5.4.3.bb
new file mode 100644
index 000000000..ff4fb7719
--- /dev/null
+++ b/recipes-graphics/vulkan/assimp_5.4.3.bb
@@ -0,0 +1,34 @@
1DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
2 various well-known 3D model formats in a uniform manner."
3HOMEPAGE = "http://www.assimp.org/"
4SECTION = "devel"
5
6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de"
8
9DEPENDS = "zlib"
10
11SRC_URI = "git://github.com/assimp/assimp.git;protocol=https;branch=master \
12 file://0001-X3D-Fix-invalid-vector-back-usage-6283.patch"
13UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
14
15SRCREV = "c35200e38ea8f058812b83de2ef32c6093b0ece2"
16
17inherit cmake
18
19do_unpack:append() {
20 bb.build.exec_func('remove_non_compliant_source', d)
21}
22
23remove_non_compliant_source() {
24 # Remove non-compliant files manually. A patch file cannot be used
25 # since many of the files are binary.
26 rm -rf ${S}/test/models-nonbsd ${S}/scripts/StepImporter/schema_ifc2x3.exp
27}
28
29EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}"
30
31BBCLASSEXTEND = "native nativesdk"
32
33# Work around do_package_qa error
34INSANE_SKIP:${PN}-dev += "buildpaths"