commit 0a0a5e34fb76d3a5e514d4666e01f2860717376c Author: Adrian Schröter Date: Mon Dec 18 16:58:52 2023 +0100 Sync from SUSE:ALP:Source:Standard:1.0 assimp revision 1f246e338f594a9ee081beecdf1e5d44 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/0001-Don-t-build-the-collada-importer-exporter-tests.patch b/0001-Don-t-build-the-collada-importer-exporter-tests.patch new file mode 100644 index 0000000..b90d767 --- /dev/null +++ b/0001-Don-t-build-the-collada-importer-exporter-tests.patch @@ -0,0 +1,27 @@ +From a0628aa4b175b6764ac6ea481a5e65f91cd118fa Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Wed, 4 Oct 2023 16:23:17 +0200 +Subject: [PATCH] Don't build the collada importer/exporter tests + +--- + test/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afe487411..d8f044501 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -141,8 +141,8 @@ SET( IMPORTERS + unit/utBlendImportMaterials.cpp + unit/utBlenderWork.cpp + unit/utBVHImportExport.cpp +- unit/utColladaExport.cpp +- unit/utColladaImportExport.cpp ++ # unit/utColladaExport.cpp ++ # unit/utColladaImportExport.cpp + unit/utCSMImportExport.cpp + unit/utB3DImportExport.cpp + #unit/utM3DImportExport.cpp +-- +2.42.0 + diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..12b151e --- /dev/null +++ b/_constraints @@ -0,0 +1,23 @@ + + + + + ppc64 + + + + 6 + + + + + + ppc64 + + + + 4 + + + + diff --git a/_service b/_service new file mode 100644 index 0000000..aeec165 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git + https://github.com/assimp/assimp + v5.3.1 + @PARENT_TAG@ + v(.*) + + test/models-nonbsd + + + *.tar + xz + + + diff --git a/assimp-5.3.1.tar.xz b/assimp-5.3.1.tar.xz new file mode 100644 index 0000000..760104d --- /dev/null +++ b/assimp-5.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f29853a0bb53791fa361d368161a19b47d4d2bdbb4207dcde86f6f5afa8fa7b3 +size 26664400 diff --git a/assimp.changes b/assimp.changes new file mode 100644 index 0000000..7bb5169 --- /dev/null +++ b/assimp.changes @@ -0,0 +1,435 @@ +------------------------------------------------------------------- +Wed Oct 4 14:14:08 UTC 2023 - Christophe Marin + +- Disable the collada importer/exporter due to a long standing + security issue (boo#1207377, CVE-2022-45748, gh#assimp/assimp#4286) +- Add patch: + * 0001-Don-t-build-the-collada-importer-exporter-tests.patch + +------------------------------------------------------------------- +Fri Sep 29 13:23:52 UTC 2023 - Ferdinand Thiessen + +- Update to 5.3.1 + * Fixes CVE-2022-38528 (boo#1203187) + * Mainly bug fixes + * Fix: Use ASCII treeview in assimp-cmd. + * Fix: Fix head overflow in MD5-parser. + * Fix: C++ std::tuple constexpr initial list on old compiler + * Make FBX parser resilient to missing data streams + * Fix incorrect documentation of defaults + * Fixed issue with clang complaining about sprintf and vsprintf being depreciated + * Fix build error: ‘temp’ may be used uninitialized in this function + * Fix: Use correct epsilon + * Fix: Add missing handling for double export in json + * Full change log https://github.com/assimp/assimp/releases/tag/v5.3.0 + +------------------------------------------------------------------- +Wed Apr 5 11:29:32 UTC 2023 - Predrag Ivanović + +- Enable build of CLI tools. + +------------------------------------------------------------------- +Mon Sep 12 13:37:16 UTC 2022 - Dirk Müller + +- update to 5.2.5: + * Add unittest to reproduce undefined behavior + * Cleanups + * Link static linkage for std_image. + * fix msvc warnings-as-errors + * Remove dll-export tags from static library builds. + * Fix Import a specific FBX model will freeze the app + * Create SECURITY.md + * Pragma warnings cause build fail with MinGW + * Fixed FBXConverter build error when using double precision + * Fix possible nullptr exception + * [Experimental] New skeleton container for bones + * Add support for GCC v12 + * Remove unused variable. + * Infinite loop on bad import files + * Utilize AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES flag for Collada meshes. + * Fix Windows 32-bit builds + * Fix GNUC check on Windows + * Update the name of the package + * Kimkulling/fix invalid opengex token match + * Disable build for tools per default + * Use mingw.include + * Fix a memory leak + * Fix nested animation name being lost in Collada + * Fix possible bad_alloc exception for an invalid file + * Bump JesseTG/rm from 1.0.2 to 1.0.3 + * Bump actions/cache from 2 to 3 + * Kimkulling/fix texture loading 3MF, reladed issue-4568 + * Bump actions/upload-artifact from 2 to 3 + * Bump actions/checkout from 2 to 3 + * Remove assertion test + * Fix memory leak in D3MFOpcPackage + * Fix typo in installation instructions for ubuntu. + * Build fix for compiling against minizip. + * Fix stl for over 4 GB + * Fix uninitialized variable. + * Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue + * Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace + * Fixes Heap-buffer-overflow in std::__1::basic_string + +- Update to 5.2.4 + * Use static runtime only when the option is selected + * Fix compile error: When enabling macro ASSIMP_DOUBLE_PRECISION + * Detect Roughness factor exported by Blender + * Updated Android build script + * Prevent nullptr access to normals-array in bitangent computation + * Avoid setting PBR properties when they are not found on mtl file + * Fix ogre xml serializer + * Fix draco building error when import assimp with cmake add_subdirectory + * FbxConverter: update bone mOffsetMatrix + * Some Windows/MSYS2-specific fixes + * Document fuzz folder + * Fix out-of-range access in ASE-Parser + * Disable assertion tests floating point against inf for Intel oneAPI + * Delete README + * Rename TextureTypeToString() to aiTextureTypeToString() + * Fixed library names for MinGW/MSYS2 + * Update pugixml dependency to v1.12.1 + * Add an option to treat warnings as errors + * Minor updates to ASSIMP Viewer + * Add badge to show open issue in percentage + * Clang-Tidy performance fixes (make values const-ref where needed) + * MMD (pmx) fixes + * Resource script updates + * Accelerate the Merge vertex post processing step + +------------------------------------------------------------------- +Wed May 11 15:37:28 UTC 2022 - Christophe Giboudeaux + +- Don't use -Werror to prevent build issues with GCC 12 + +------------------------------------------------------------------- +Sun Mar 20 07:34:20 UTC 2022 - Christophe Giboudeaux + +- Update to 5.2.3: + * Show warning when assimp_viewer cannot be build on + target platform + * Fix ordering of member initialization + * Fix possible negative array access + * Expose the original OBJ "illum" value + * Optimize the problem of excessive memory allocation in + FBX import + * Update version of Hunter to v0.24.0 that supports VS 2022 + * update LWO importer(available lwo3) + * Reinstate a deprecated gltfpbr macro: AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS + * Fix parsing OBJ with free-form curve/surface body statements + * Fix missing members and do some small refactorings. + * Fix 'i >= 0' always true + * Update AI_TEXTURE_TYPE_MAX + * Fix getting anisotropy in obj + * glTF2: Metallic roughness split + * Add properties information on assimp info command line + * Added missing ObjMaterial.h to CMakeLists + * Update version in doxy-config + * add ifndef guard for resolve to fails to compil + * Add USE_STATIC_CRT option + * Fix nullptr dereferencing + * Fix stack-overflow in MDLLoader + * GLTF2 attribute name/parse bug + +------------------------------------------------------------------- +Mon Feb 21 09:56:15 UTC 2022 - Christophe Giboudeaux + +- Update to 5.2.2 + * Fix missing include for size_t + * introduce compression + * Refactoring: add usage of ai_epsilon to FBX-Importer. + * CMake: Fix Assimp target install rule fully specifying component + * Fix stat for 32-bit Linux + * Update the calculation and orthogonalization for bitangent + * Update CMakeLists.txt + * Added support for "map_Bump -bm" + +------------------------------------------------------------------- +Mon Feb 7 09:51:05 UTC 2022 - Christophe Giboudeaux + +- Update to 5.2.1 + * ASE: Fix warning unreachable code + * HMP: Fix override during copying position data + * use fully qualified namespace in byteswap macros + * fix compilation with clangcl on windows + * Delete .travis.sh by @kimkulling + * Update ccpp.yml by @kimkulling + * LWO: validate enum value before parsing it +- Drop 0001-use-fully-qualified-namespace-in-byteswap-macros.patch + Merged upstream + +------------------------------------------------------------------- +Wed Feb 2 10:24:27 UTC 2022 - Christophe Giboudeaux + +- Add patch to fix build in big endian archs: + * 0001-use-fully-qualified-namespace-in-byteswap-macros.patch + +------------------------------------------------------------------- +Tue Jan 25 13:02:13 UTC 2022 - Christophe Giboudeaux + +- Update to 5.2.0 + * Update copyrights + * Fix imported target include directory + * Assimp Patch Android LTS NDK 23 Fix + * Allow dlclose of so library by avoiding unique symbols. + * Move Base64 encode/decode functionality to the common folder + * Locale independent meter scale + * add Inter-Quake Model (IQM) Importer + * Collada: Read all instance_material child nodes + * Krishty new file detection + * ASE: Fix material parsing + * IFC Reading: Fix opening reading. + * CMAKE: Respect top-level CMAKE_*_OUTPUT_DIRECTORY variables + +------------------------------------------------------------------- +Mon Jan 10 09:28:29 UTC 2022 - Christophe Giboudeaux + +- Update to 5.1.6: + * Add link to used enum for a better understandability + * Fix fuzzer crashes + * Fix nullptr-dereferencing + * Fix bone fitted check in gltf2 exporter +- Add patch: + * 0001-Fix-build-with-zlib.patch (gh#assimp/assimp#4334) + +------------------------------------------------------------------- +Tue Jan 4 11:59:17 UTC 2022 - Christophe Giboudeaux + +- Update to 5.1.5: + * Make sure no overflow can happen + * LWS-Import: Avoid access to empty string token + * MDL: Do not try to copy empty embedded texture + * Add console progresshandler + * CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW + * fix fbx import metalness + * RFC: BlenderScene: use explicit namespace instead of using + namespace + * Support PBR properties/maps in Obj importer + +------------------------------------------------------------------- +Mon Dec 27 10:43:59 UTC 2021 - Dirk Müller + +- update to 5.1.4: + * Fix division + * Fix nullptr dereferencing from std::shared_ptr + * Revert "FBXConverter : Fix timescales of FBX animations" + * Use correct XmlParser-methods and add some missing casts + * Bug: Export crashes when any of the meshes contains texture + coordinate names #4243 + * Bugfix/import crashes + * Fix a typo in the Visual-Studio Dll-Versions + * Enable C++11 and C99 + * Fixed cmake error: No known features for C compiler when using + the assimp library from another project + * fix test/models/3DS/IMAGE1.bmp: is jpg + * Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define. + +------------------------------------------------------------------- +Sun Dec 5 08:52:33 UTC 2021 - Christophe Giboudeaux + +- Update to 5.1.3 + * Update blender importer to work with Blender 2.8+ files + * Added checks for out of bounds data access/writing + * Interpolate euler rotations for quaternion animations + * Fix file-extension check for X3D-files + * Update CMakeLists.txt + +------------------------------------------------------------------- +Thu Dec 2 12:05:31 UTC 2021 - Christophe Giboudeaux + +- Update to 5.1.2. Changes since 5.1.0: + * Fixed an incorrect indeiciesType in the glTF2 sparse accessor. + * Prevent out-of-range memory writes by sparse accessors + * Delete test/models/3DS/UVTransformTest directory + * Do not build ziplib when 3MF exporter is disabled. + * Collada: Read value, not attribute + * Redefine deprecated glTF-specific PBR material macros +- Fix assimp-devel dependencies. minizip is required. + +------------------------------------------------------------------- +Sat Nov 13 16:29:32 UTC 2021 - Christophe Giboudeaux + +- Update to 5.1.0 + * Check https://github.com/assimp/assimp/releases/tag/v5.1.0 + for the full list of changes +- Drop do-not-install-irrXML.patch. No longer needed. +- Drop obsolete patches: + * 0001-Fix-build-with-GCC-11.patch + * 0001-use-GNUInstallDirs-where-possible.patch + +------------------------------------------------------------------- +Mon Feb 8 10:45:37 UTC 2021 - Christophe Giboudeaux + +- Add patch to fix build with GCC11: + * 0001-Fix-build-with-GCC-11.patch (boo#1181859) + +------------------------------------------------------------------- +Mon Sep 21 17:23:21 UTC 2020 - Christophe Giboudeaux + +- Add a _constraints file for ppc64/ppc64le builds. + +------------------------------------------------------------------- +Thu Sep 17 21:04:34 UTC 2020 - Christophe Giboudeaux + +- Remove unneeded build dependencies. + assimp doesn't need Qt5, boost, devIL and glu. + +------------------------------------------------------------------- +Thu Jul 9 20:42:17 UTC 2020 - Christophe Giboudeaux + +- Restore the _service file. + +Assimp still ships files which are not allowed in openSUSE. + +------------------------------------------------------------------- +Wed Jun 10 09:38:02 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch to fix the broken CMake config files: + * 0001-use-GNUInstallDirs-where-possible.patch + (adapted for the 5.0.1 release) + +------------------------------------------------------------------- +Wed May 20 13:15:44 UTC 2020 - Ferdinand Thiessen + +- Update to 5.0.1 + * Added texture types: BASE_COLOR, NORMAL_CAMERA, EMISSION_COLOR, + METALNESS, DIFFUSE_ROUGHNESS + * Fixed various issues and memory leaks + * 3DS: Explicitly pass "UNNAMED" as 3DS root node name and fix + more thread-safety issue in 3DS loader. + * 3MF: Introduce first prototype for basematerial support + * AssJSon: Add json export. + * Various other file support improvements +- Dropped viewer subpackage, as it now requires DirectX +- Removed not needed disable-gitrevision-test.patch +- Rebased do-not-install-irrXML.patch +- Removed not needed install-viewer.patch +- Removed _service + +------------------------------------------------------------------- +Wed Jan 23 20:08:14 UTC 2019 - Jan Engelhardt + +- sanitize_source.sh was removed in the 4.1.0 update; restore its + logic with a new _service file and recreate the tarball. + +------------------------------------------------------------------- +Thu Jan 17 15:03:13 UTC 2019 - Jan Engelhardt + +- Fix incorrect summary for libassimp*. + +------------------------------------------------------------------- +Sat Aug 11 16:16:03 UTC 2018 - rpm@fthiessen.de + +- Update to 4.1.0 + * Added support for Export 3MF (experimental) + * Added supprt for Import / Export glTF 2 + * Prevent failing stringstream to crash the export process + * Fix invalid access to mesh array when the array is + empty in Blender, also fixed short overflow. + * Fixed memory leak in AMFImporter + * Fixed IOStream leak in UnrealLoader: + * Fixed out-of-bounds read in MaterialSystem unit test + * Added support for SIB models from Silo 2.5 +- Changes from 4.0.1 + * StreamReader: fix out-of-range exception +- Changes From 4.0.0 + * New QT-Widget based assimp-viewer + * Open3DGC codec supported by glFT-importer + * glTF: Read and write transparency values + * Support for X3D, AMF and Lugdunum3D + * MDLLoader: fix resource leak. + * Fix memory leak in Collada importer + * Fixed many FBX bugs +- Added %check section, run unit tests +- Added disable-gitrevision-test.patch to fix testsuite as we do + not build from git, git rev will test will fail. +- Added do-not-install-irrXML.patch to prevent cmake from + installing the irrXML (static) library. +- install-viewer.patch: Install viewer component + +------------------------------------------------------------------- +Thu Apr 20 11:05:53 UTC 2017 - jengelh@inai.de + +- Rename %soname to %sover to better reflects its use. +- Repackage original tarball with the test/models-nonbsd/ + directory removed. + +------------------------------------------------------------------- +Mon Sep 5 10:38:19 UTC 2016 - rpm@fthiessen.de + +- Update to new upstream release 3.3.1 +* Fix BlenderTesselator: offsetof operator +* C++11 support +* OpenGEX: add support for cameras and lights +* Enable export by pyAssimp +* Add functionality to perform a singlepost-processing step +* Fix of many resource leaks in unittests and main lib + +------------------------------------------------------------------- +Thu Jun 16 22:16:07 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 3.2 +* Support for FBX 2013 and newer, binary and ASCII +* Support for OGRE binary mesh and skeleton format +* Updated BLEND support for newer Blender versions +* Support for arbitrary meta data, used to hold FBX and DAE metadata +* OBJ Export now produces smaller files +* Meshes can now have names, this is supported by the major importers +* Improved IFC geometry generation +* M3 support has been removed +* Experimental OpenGEX support + +------------------------------------------------------------------- +Tue Sep 3 09:38:16 UTC 2013 - joop.boonen@opensuse.org + +- Fixed the build problem with docdir + moved samples/ to doc + +------------------------------------------------------------------- +Fri Feb 1 21:12:07 UTC 2013 - joop.boonen@opensuse.org + +- Improved the spec file, changed the names and cleaned the spec file + +------------------------------------------------------------------- +Mon Jul 30 00:00:00 CEST 2012 - sergey.shambir.auto@gmail.c + +- some improvements form *.spec at home:hcostelha repository + +------------------------------------------------------------------- +Sun Jul 29 00:00:00 CEST 2012 - sergey.shambir.auto@gmail.c + +- initial package of version 3.0 + diff --git a/assimp.spec b/assimp.spec new file mode 100644 index 0000000..036c0a9 --- /dev/null +++ b/assimp.spec @@ -0,0 +1,112 @@ +# +# spec file for package assimp +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define sover 5 +Name: assimp +Version: 5.3.1 +Release: 0 +Summary: Library to load and process 3D scenes from various data formats +License: BSD-3-Clause AND MIT +Group: Development/Libraries/C and C++ +URL: https://www.assimp.org/ +Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch0: 0001-Don-t-build-the-collada-importer-exporter-tests.patch +BuildRequires: cmake +BuildRequires: dos2unix +BuildRequires: gcc-c++ +BuildRequires: irrlicht-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(minizip) +BuildRequires: pkgconfig(zlib) + +%description +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. + +%package -n libassimp%{sover} +Summary: Library to load and process 3D scenes from various data formats +Group: System/Libraries + +%description -n libassimp%{sover} +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. + +%package devel +Summary: Headers, docs and command-line utility for assimp +Group: Development/Libraries/C and C++ +Requires: glibc-devel +Requires: libassimp%{sover} = %{version} +Requires: libstdc++-devel +Requires: pkgconfig(minizip) + +%description devel +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. + +%prep +%autosetup -p1 + +%build +%cmake \ + -DASSIMP_IGNORE_GIT_HASH=ON \ + -DASSIMP_BUILD_ZLIB=OFF \ + -DASSIMP_WARNINGS_AS_ERRORS=OFF \ + -DASSIMP_BUILD_ASSIMP_TOOLS=ON \ + -DASSIMP_BUILD_COLLADA_IMPORTER=OFF \ + -DASSIMP_BUILD_COLLADA_EXPORTER=OFF + +%cmake_build + +%install +%cmake_install + +find %{buildroot} -type f -name "*.la" -delete -print + +%check +pushd build +# utIssues.OpacityBugWhenExporting_727 test fails +# utVersion.aiGetVersionRevisionTest passes with git builds only +# the models-nonbsd are not in the tarball, tests depending on it are also excluded +./bin/unit --gtest_filter="-utIssues.OpacityBugWhenExporting_727:utVersion.aiGetVersionRevisionTest:ut3DImportExport*:ut3DSImportExport*:utMD2Importer*:utMD5Importer*:utBlenderImporter*:utQ3BSPImportExport*:utXImporter.importDwarf:utDXFImporterExporter.importRifle:utPMXImporter.importTest" +popd + +%ldconfig_scriptlets -n lib%{name}%{sover} + +%files -n lib%{name}%{sover} +%license LICENSE +%{_libdir}/libassimp.so.%{sover}* + +%files devel +%doc CHANGES CREDITS +%{_bindir}/assimp +%{_includedir}/assimp/ +%{_libdir}/libassimp.so +%{_libdir}/cmake/* +%{_libdir}/pkgconfig/assimp.pc + +%changelog