summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2022-06-23 17:44:14 +0200
committerJoonas Niilola <juippis@gentoo.org>2022-06-24 09:39:03 +0300
commit765d034f0f642cdce37aa38be60defa5095ee065 (patch)
treeb6ac3a78a2aaf1e68532fa7a818dacb345e37407
parentdev-lang/python: Stabilize 3.9.13 hppa, #852599 (diff)
downloadgentoo-765d034f0f642cdce37aa38be60defa5095ee065.tar.gz
gentoo-765d034f0f642cdce37aa38be60defa5095ee065.tar.bz2
gentoo-765d034f0f642cdce37aa38be60defa5095ee065.zip
media-libs/assimp: drop 5.0.1, 5.2.2, 5.2.3
Closes: https://bugs.gentoo.org/835089 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/26058 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
-rw-r--r--media-libs/assimp/Manifest4
-rw-r--r--media-libs/assimp/assimp-5.0.1.ebuild66
-rw-r--r--media-libs/assimp/assimp-5.2.2.ebuild59
-rw-r--r--media-libs/assimp/assimp-5.2.3.ebuild70
-rw-r--r--media-libs/assimp/files/assimp-5.0.0-disabletest.patch13
-rw-r--r--media-libs/assimp/files/assimp-5.0.0-findassimp.patch28
-rw-r--r--media-libs/assimp/files/assimp-5.0.0-unzip-of.patch11
-rw-r--r--media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch239
-rw-r--r--media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch76
-rw-r--r--media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch37
-rw-r--r--media-libs/assimp/files/assimp-5.0.1-projectversion.patch22
-rw-r--r--media-libs/assimp/files/assimp-5.0.1-versiontest.patch23
-rw-r--r--media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch25
-rw-r--r--media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch134
14 files changed, 0 insertions, 807 deletions
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index b5c0f828ac95..34eb32db608e 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,5 +1 @@
-DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
-DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
-DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
-DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild
deleted file mode 100644
index f7cbcb00f305..000000000000
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="doc samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122
- "${FILESDIR}/${PN}-5.0.0-unzip-of.patch"
- "${FILESDIR}/${PN}-5.0.0-findassimp.patch"
- "${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912
- "${FILESDIR}/${P}-projectversion.patch"
- "${FILESDIR}/${P}-fix-unittests.patch"
- "${FILESDIR}/${P}-fix-aiGetLegalStringTest.patch"
- "${FILESDIR}/${P}-versiontest.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_BUILD_STATIC_LIB=OFF
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
deleted file mode 100644
index b6c80ce8206b..000000000000
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-usage-of-incompatible-minizip-data-structure.patch
- "${FILESDIR}"/${P}-disable-failing-tests.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_ASAN=OFF
- -DASSIMP_BUILD_DOCS=OFF
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_ERROR_MAX=ON
- -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
- -DASSIMP_IGNORE_GIT_HASH=ON
- -DASSIMP_UBSAN=OFF
- )
-
- if use samples; then
- mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- "${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
deleted file mode 100644
index d74e3f10d1f0..000000000000
--- a/media-libs/assimp/assimp-5.2.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
- "${FILESDIR}"/${P}-drop-Werror-gcc-option.patch
- "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
- if use x86 ; then
- eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_ASAN=OFF
- -DASSIMP_BUILD_DOCS=OFF
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_ERROR_MAX=ON
- -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
- -DASSIMP_IGNORE_GIT_HASH=ON
- -DASSIMP_UBSAN=OFF
- )
-
- if use samples; then
- mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- "${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
deleted file mode 100644
index d5343c113668..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/test/unit/utVersion.cpp 2019-11-18 11:39:09.655298634 +0100
-+++ b/test/unit/utVersion.cpp 2019-11-18 11:39:25.823299035 +0100
-@@ -66,10 +66,6 @@
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
- EXPECT_NE( nullptr, aiGetBranchName() );
- }
diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
deleted file mode 100644
index 6056f4973c55..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200
-+++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200
-@@ -54,14 +54,17 @@
-
- find_path(
- assimp_INCLUDE_DIRS
-- NAMES postprocess.h scene.h version.h config.h cimport.h
-+ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
- PATHS /usr/local/include/
-+ PATHS /usr/include/
- )
-
- find_library(
- assimp_LIBRARIES
- NAMES assimp
- PATHS /usr/local/lib/
-+ PATHS /usr/lib/
-+ PATHS /usr/lib64/
- )
-
- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +81,4 @@
- endif (assimp_FIND_REQUIRED)
- endif (assimp_FOUND)
-
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
deleted file mode 100644
index e75b47a1af4b..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200
-+++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200
-@@ -45,6 +45,8 @@
- #ifndef _unz_H
- #define _unz_H
-
-+#define OF _Z_OF
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
deleted file mode 100644
index 134edc7d7da1..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@fh-aachen.de>
-Date: Tue, 31 Mar 2020 21:30:07 +0200
-Subject: [PATCH] use GNUInstallDirs where possible
-
-Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
-disable redefining FHS-mandated install locations via user-editable
-ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
-Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
----
- CMakeLists.txt | 36 ++++++++++++++++++++++------------
- assimp.pc.in | 6 ++----
- assimpTargets-debug.cmake.in | 20 +++++++++----------
- assimpTargets-release.cmake.in | 18 ++++++++---------
- assimpTargets.cmake.in | 15 +-------------
- 5 files changed, 45 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dcafb649f5..c23c0df33e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
- SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
- SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
-
--IF( UNIX )
-- # Use GNUInstallDirs for Unix predefined directories
-- INCLUDE(GNUInstallDirs)
--ENDIF( UNIX )
--
- # Grouped compiler settings
- IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
- IF(NOT HUNTER_ENABLED)
-@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
- SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
- ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
-
--# Cache these to allow the user to override them manually.
--SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
-- "Path the built library files are installed to." )
--SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
-- "Path the header files are installed to." )
--SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
-- "Path the tool executables are installed to." )
--
- get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
-
- IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug"))
-@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED)
- )
- ELSE(HUNTER_ENABLED)
- # cmake configuration files
-+
-+ IF( UNIX )
-+ # Use GNUInstallDirs for Unix predefined directories
-+ INCLUDE(GNUInstallDirs)
-+
-+ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-+ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-+ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
-+ ELSE( UNIX )
-+ # Cache these to allow the user to override them on non-Unix platforms
-+ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
-+ "Path the built library files are installed to." )
-+ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
-+ "Path the header files are installed to." )
-+ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
-+ "Path the tool executables are installed to." )
-+
-+ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
-+ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
-+ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
-+ ENDIF( UNIX )
-+
-+
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
- IF (is_multi_config)
-diff --git a/assimp.pc.in b/assimp.pc.in
-index c659e19f2c..555a3a1d3b 100644
---- a/assimp.pc.in
-+++ b/assimp.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_PREFIX@/
--libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
--includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: @CMAKE_PROJECT_NAME@
- Description: Import various well-known 3D model formats in an uniform manner.
-diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
-index 1ebe2a6081..f5034c9349 100644
---- a/assimpTargets-debug.cmake.in
-+++ b/assimpTargets-debug.cmake.in
-@@ -42,22 +42,22 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Debug"
- set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
-- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
-+ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
- else()
- set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
- # Import target "assimp::assimp" for configuration "Debug"
- set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
- endif()
-
- else()
-@@ -66,17 +66,17 @@ else()
- set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
- set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
-- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
-+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
- else()
- set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
- endif()
- endif()
-
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index f3db8f12cd..a416e8899b 100644
---- a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -42,12 +42,12 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Release"
- set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
-- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
-+ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
- else()
- set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
-@@ -57,7 +57,7 @@ if(MSVC)
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
- endif()
-
- else()
-@@ -70,17 +70,17 @@ else()
- endif()
- set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
-- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
-+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
- else()
- set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
-+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
- endif()
- endif()
-
-diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
-index ab1a8d2c7b..ef90c834a6 100644
---- a/assimpTargets.cmake.in
-+++ b/assimpTargets.cmake.in
-@@ -40,16 +40,6 @@ unset(_targetsDefined)
- unset(_targetsNotDefined)
- unset(_expectedTargets)
-
--
--# Compute the installation prefix relative to this file.
--get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--if(_IMPORT_PREFIX STREQUAL "/")
-- set(_IMPORT_PREFIX "")
--endif()
--
- # Create imported target assimp::assimp
- if(@BUILD_SHARED_LIBS@)
- add_library(assimp::assimp SHARED IMPORTED)
-@@ -60,7 +50,7 @@ endif()
- set_target_properties(assimp::assimp PROPERTIES
- COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
- INTERFACE_assimp_MAJOR_VERSION "1"
-- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-+ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
- #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
- )
-
-@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES})
- include(${f})
- endforeach()
-
--# Cleanup temporary variables.
--set(_IMPORT_PREFIX)
--
- # Loop over all imported files and verify that they actually exist
- foreach(target ${_IMPORT_CHECK_TARGETS} )
- foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
deleted file mode 100644
index b0db38a0e8a1..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001
-From: RichardTea <31507749+RichardTea@users.noreply.github.com>
-Date: Fri, 11 Oct 2019 16:28:14 +0100
-Subject: [PATCH] Update assimp legal and version
-
-Will now report the major and minor versions specified in cmakelists
----
- code/Common/Version.cpp | 14 +++++---------
- test/unit/utVersion.cpp | 2 +-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
-index 868cfb06af..cf1da7d5ba 100644
---- a/code/Common/Version.cpp
-+++ b/code/Common/Version.cpp
-@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <assimp/scene.h>
- #include "ScenePrivate.h"
-
--static const unsigned int MajorVersion = 5;
--static const unsigned int MinorVersion = 0;
-+#include "revision.h"
-
- // --------------------------------------------------------------------------------
- // Legal information string - don't remove this.
-@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION =
- "Open Asset Import Library (Assimp).\n"
- "A free C/C++ library to import various 3D file formats into applications\n\n"
-
--"(c) 2008-2020, assimp team\n"
-+"(c) 2006-2020, assimp team\n"
- "License under the terms and conditions of the 3-clause BSD license\n"
--"https://github.com/assimp/assimp\n"
-+"http://assimp.org\n"
- ;
-
- // ------------------------------------------------------------------------------------------------
-@@ -70,13 +69,13 @@ ASSIMP_API const char* aiGetLegalString () {
- // ------------------------------------------------------------------------------------------------
- // Get Assimp minor version
- ASSIMP_API unsigned int aiGetVersionMinor () {
-- return MinorVersion;
-+ return VER_MINOR;
- }
-
- // ------------------------------------------------------------------------------------------------
- // Get Assimp major version
- ASSIMP_API unsigned int aiGetVersionMajor () {
-- return MajorVersion;
-+ return VER_MAJOR;
- }
-
- // ------------------------------------------------------------------------------------------------
-@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags () {
- return flags;
- }
-
--// include current build revision, which is even updated from time to time -- :-)
--#include "revision.h"
--
- // ------------------------------------------------------------------------------------------------
- ASSIMP_API unsigned int aiGetVersionRevision() {
- return GitVersion;
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index 233b2fb0b2..66e832baae 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
- EXPECT_NE( lv, nullptr );
- std::string text( lv );
-
-- size_t pos( text.find( std::string( "2017" ) ) );
-+ size_t pos( text.find( std::string( "2019" ) ) );
- EXPECT_NE( pos, std::string::npos );
- }
-
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
deleted file mode 100644
index 1b1efa027427..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001
-From: Kim Kulling <kimkulling@users.noreply.github.com>
-Date: Sun, 6 Oct 2019 20:19:59 +0200
-Subject: [PATCH] Update utVersion.cpp
-
-Fix the unittests as well.
----
- test/unit/utVersion.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index 5cfc91ccdd..233b2fb0b2 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -4,8 +4,6 @@ Open Asset Import Library (assimp)
-
- Copyright (c) 2006-2019, assimp team
-
--
--
- All rights reserved.
-
- Redistribution and use of this software in source and binary forms,
-@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
- }
-
- TEST_F( utVersion, aiGetVersionMinorTest ) {
-- EXPECT_EQ( aiGetVersionMinor(), 1U );
-+ EXPECT_EQ( aiGetVersionMinor(), 0U );
- }
-
- TEST_F( utVersion, aiGetVersionMajorTest ) {
-- EXPECT_EQ( aiGetVersionMajor(), 4U );
-+ EXPECT_EQ( aiGetVersionMajor(), 5U );
- }
-
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
deleted file mode 100644
index ed82e1b0b4b0..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lo=C3=AFc?= <loic.fricoteaux@airbus.com>
-Date: Tue, 14 Jan 2020 16:26:24 +0100
-Subject: [PATCH] Fix Assimp patch version to match the last bug fix release
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23b6f6d618..e14c4aa21f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED)
- add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF(HUNTER_ENABLED)
-
--PROJECT( Assimp VERSION 5.0.0 )
-+PROJECT( Assimp VERSION 5.0.1 )
-
- # All supported options ###############################################
-
diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
deleted file mode 100644
index 8267fc004d61..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Lortie <marc-antoine.lortie@outlook.com>
-Date: Mon, 20 Jan 2020 09:14:04 -0500
-Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate
- year.
-
----
- test/unit/utVersion.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index ca54620533..aa75a26d85 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
- EXPECT_NE( lv, nullptr );
- std::string text( lv );
-
-- size_t pos( text.find( std::string( "2019" ) ) );
-+ size_t pos( text.find( std::string( "2020" ) ) );
- EXPECT_NE( pos, std::string::npos );
- }
-
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
deleted file mode 100644
index 736757693774..000000000000
--- a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/840616
-https://github.com/assimp/assimp/issues/4433
-
-From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 25 Apr 2022 17:39:33 +0200
-Subject: [PATCH] drop -Werror gcc option
-
-Temporary hack to allow building with gcc-12
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/code/CMakeLists.txt
-+++ b/code/CMakeLists.txt
-@@ -1179,8 +1179,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.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index 1de4f661fa55..000000000000
--- a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://bugs.gentoo.org/840767
-https://github.com/assimp/assimp/issues/4438
-
-From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 28 Apr 2022 07:59:26 +0200
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
-- const auto q = random_quat();
-- result_cpp = q.GetMatrix();
-- aiMatrix3FromQuaternion(&result_c, &q);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
- result_c = result_cpp = random_mat3();
- EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
-- const aiVector3D s = random_vec3();
-- const aiQuaternion q = random_quat();
-- const aiVector3D t = random_vec3();
-- result_cpp = aiMatrix4x4(s, q, t);
-- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
- const aiMatrix4x4 temp = random_mat4();
- result_c = result_cpp = random_mat4();
-@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
-- result_c = result_cpp = random_mat4();
-- EXPECT_EQ(result_cpp.Determinant(),
-- aiMatrix4Determinant(&result_c));
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
- EXPECT_EQ(result_cpp.IsIdentity(),
- (bool)aiMatrix4IsIdentity(&result_c));
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -54,19 +54,6 @@ protected:
- aiQuaternion result_c, result_cpp;
- };
-
--TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
-- // Use a predetermined transformation matrix
-- // to prevent running into division by zero.
-- aiMatrix3x3 m, r;
-- aiMatrix3x3::Translation(aiVector2D(14,-25), m);
-- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
-- m = m * r;
--
-- result_cpp = aiQuaternion(m);
-- aiCreateQuaternionFromMatrix(&result_c, &m);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
- const float x(RandPI.next()),
- y(RandPI.next()),
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
- (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
- }
-
--TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
-- result_c = result_cpp = random_vec2();
-- result_cpp += temp;
-- aiVector2Add(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
-- result_c = result_cpp = random_vec2();
-- result_cpp -= temp;
-- aiVector2Subtract(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
-- const float FACTOR = RandNonZero.next();
-- result_c = result_cpp = random_vec2();
-- result_cpp *= FACTOR;
-- aiVector2Scale(&result_c, FACTOR);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
- result_c = result_cpp = random_vec2();
- result_cpp = result_cpp.SymMul(temp);
-@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
-- const float DIVISOR = RandNonZero.next();
-- result_c = result_cpp = random_vec2();
-- result_cpp /= DIVISOR;
-- aiVector2DivideByScalar(&result_c, DIVISOR);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
-- result_c = result_cpp = random_vec2();
-- result_cpp = result_cpp / temp;
-- aiVector2DivideByVector(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
- result_c = result_cpp = random_vec2();
- EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
---
-2.35.1
-