Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
Date: Fri, 24 Jun 2022 06:39:51
Message-Id: 1656052743.765d034f0f642cdce37aa38be60defa5095ee065.juippis@gentoo
1 commit: 765d034f0f642cdce37aa38be60defa5095ee065
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Thu Jun 23 15:44:14 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 24 06:39:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765d034f
7
8 media-libs/assimp: drop 5.0.1, 5.2.2, 5.2.3
9
10 Closes: https://bugs.gentoo.org/835089
11 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
12 Closes: https://github.com/gentoo/gentoo/pull/26058
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 media-libs/assimp/Manifest | 4 -
16 media-libs/assimp/assimp-5.0.1.ebuild | 66 ------
17 media-libs/assimp/assimp-5.2.2.ebuild | 59 -----
18 media-libs/assimp/assimp-5.2.3.ebuild | 70 ------
19 .../assimp/files/assimp-5.0.0-disabletest.patch | 13 --
20 .../assimp/files/assimp-5.0.0-findassimp.patch | 28 ---
21 .../assimp/files/assimp-5.0.0-unzip-of.patch | 11 -
22 .../assimp/files/assimp-5.0.1-GNUInstallDirs.patch | 239 ---------------------
23 .../assimp-5.0.1-fix-aiGetLegalStringTest.patch | 76 -------
24 .../assimp/files/assimp-5.0.1-fix-unittests.patch | 37 ----
25 .../assimp/files/assimp-5.0.1-projectversion.patch | 22 --
26 .../assimp/files/assimp-5.0.1-versiontest.patch | 23 --
27 .../assimp-5.2.3-drop-Werror-gcc-option.patch | 25 ---
28 ...p-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 134 ------------
29 14 files changed, 807 deletions(-)
30
31 diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
32 index b5c0f828ac95..34eb32db608e 100644
33 --- a/media-libs/assimp/Manifest
34 +++ b/media-libs/assimp/Manifest
35 @@ -1,5 +1 @@
36 -DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
37 -DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
38 -DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
39 DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
40 -DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
41
42 diff --git a/media-libs/assimp/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild
43 deleted file mode 100644
44 index f7cbcb00f305..000000000000
45 --- a/media-libs/assimp/assimp-5.0.1.ebuild
46 +++ /dev/null
47 @@ -1,66 +0,0 @@
48 -# Copyright 1999-2021 Gentoo Authors
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -EAPI=7
52 -
53 -inherit cmake
54 -
55 -DESCRIPTION="Importer library to import assets from 3D files"
56 -HOMEPAGE="https://github.com/assimp/assimp"
57 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
58 -doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )"
59 -
60 -LICENSE="BSD"
61 -SLOT="0"
62 -KEYWORDS="amd64 ~arm arm64 ~riscv x86"
63 -IUSE="doc samples test"
64 -
65 -RESTRICT="!test? ( test )"
66 -
67 -RDEPEND="
68 - dev-libs/boost:=
69 - sys-libs/zlib[minizip]
70 - samples? (
71 - media-libs/freeglut
72 - virtual/opengl
73 - x11-libs/libX11
74 - )
75 -"
76 -DEPEND="${RDEPEND}
77 - test? ( dev-cpp/gtest )
78 -"
79 -
80 -PATCHES=(
81 - "${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122
82 - "${FILESDIR}/${PN}-5.0.0-unzip-of.patch"
83 - "${FILESDIR}/${PN}-5.0.0-findassimp.patch"
84 - "${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912
85 - "${FILESDIR}/${P}-projectversion.patch"
86 - "${FILESDIR}/${P}-fix-unittests.patch"
87 - "${FILESDIR}/${P}-fix-aiGetLegalStringTest.patch"
88 - "${FILESDIR}/${P}-versiontest.patch"
89 -)
90 -
91 -src_configure() {
92 - local mycmakeargs=(
93 - -DASSIMP_BUILD_STATIC_LIB=OFF
94 - -DCMAKE_DEBUG_POSTFIX=""
95 - -DASSIMP_BUILD_SAMPLES=$(usex samples)
96 - -DASSIMP_BUILD_TESTS=$(usex test)
97 - )
98 -
99 - cmake_src_configure
100 -}
101 -
102 -src_install() {
103 - cmake_src_install
104 -
105 - use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf
106 -
107 - insinto /usr/share/cmake/Modules
108 - doins cmake-modules/Findassimp.cmake
109 -}
110 -
111 -src_test() {
112 - "${BUILD_DIR}/test/unit" || die
113 -}
114
115 diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
116 deleted file mode 100644
117 index b6c80ce8206b..000000000000
118 --- a/media-libs/assimp/assimp-5.2.2.ebuild
119 +++ /dev/null
120 @@ -1,59 +0,0 @@
121 -# Copyright 1999-2022 Gentoo Authors
122 -# Distributed under the terms of the GNU General Public License v2
123 -
124 -EAPI=8
125 -
126 -inherit cmake
127 -
128 -DESCRIPTION="Importer library to import assets from 3D files"
129 -HOMEPAGE="https://github.com/assimp/assimp"
130 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
131 -
132 -LICENSE="BSD"
133 -SLOT="0"
134 -KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
135 -IUSE="samples test"
136 -
137 -RESTRICT="!test? ( test )"
138 -
139 -RDEPEND="
140 - dev-libs/boost:=
141 - sys-libs/zlib[minizip]
142 - samples? (
143 - media-libs/freeglut
144 - virtual/opengl
145 - x11-libs/libX11
146 - )
147 -"
148 -DEPEND="${RDEPEND}"
149 -BDEPEND="
150 - test? ( dev-cpp/gtest )
151 -"
152 -
153 -PATCHES=(
154 - "${FILESDIR}"/${P}-fix-usage-of-incompatible-minizip-data-structure.patch
155 - "${FILESDIR}"/${P}-disable-failing-tests.patch
156 -)
157 -
158 -src_configure() {
159 - local mycmakeargs=(
160 - -DASSIMP_ASAN=OFF
161 - -DASSIMP_BUILD_DOCS=OFF
162 - -DASSIMP_BUILD_SAMPLES=$(usex samples)
163 - -DASSIMP_BUILD_TESTS=$(usex test)
164 - -DASSIMP_ERROR_MAX=ON
165 - -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
166 - -DASSIMP_IGNORE_GIT_HASH=ON
167 - -DASSIMP_UBSAN=OFF
168 - )
169 -
170 - if use samples; then
171 - mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
172 - fi
173 -
174 - cmake_src_configure
175 -}
176 -
177 -src_test() {
178 - "${BUILD_DIR}/bin/unit" || die
179 -}
180
181 diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
182 deleted file mode 100644
183 index d74e3f10d1f0..000000000000
184 --- a/media-libs/assimp/assimp-5.2.3.ebuild
185 +++ /dev/null
186 @@ -1,70 +0,0 @@
187 -# Copyright 1999-2022 Gentoo Authors
188 -# Distributed under the terms of the GNU General Public License v2
189 -
190 -EAPI=8
191 -
192 -inherit cmake
193 -
194 -DESCRIPTION="Importer library to import assets from 3D files"
195 -HOMEPAGE="https://github.com/assimp/assimp"
196 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
197 -
198 -LICENSE="BSD"
199 -SLOT="0"
200 -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
201 -IUSE="samples test"
202 -
203 -RESTRICT="!test? ( test )"
204 -
205 -RDEPEND="
206 - dev-libs/boost:=
207 - sys-libs/zlib[minizip]
208 - samples? (
209 - media-libs/freeglut
210 - virtual/opengl
211 - x11-libs/libX11
212 - )
213 -"
214 -DEPEND="${RDEPEND}"
215 -BDEPEND="
216 - test? ( dev-cpp/gtest )
217 -"
218 -
219 -PATCHES=(
220 - "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
221 - "${FILESDIR}"/${P}-drop-Werror-gcc-option.patch
222 - "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
223 -)
224 -
225 -DOCS=( CodeConventions.md Readme.md )
226 -
227 -src_prepare() {
228 - if use x86 ; then
229 - eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
230 - fi
231 -
232 - cmake_src_prepare
233 -}
234 -
235 -src_configure() {
236 - local mycmakeargs=(
237 - -DASSIMP_ASAN=OFF
238 - -DASSIMP_BUILD_DOCS=OFF
239 - -DASSIMP_BUILD_SAMPLES=$(usex samples)
240 - -DASSIMP_BUILD_TESTS=$(usex test)
241 - -DASSIMP_ERROR_MAX=ON
242 - -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
243 - -DASSIMP_IGNORE_GIT_HASH=ON
244 - -DASSIMP_UBSAN=OFF
245 - )
246 -
247 - if use samples; then
248 - mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
249 - fi
250 -
251 - cmake_src_configure
252 -}
253 -
254 -src_test() {
255 - "${BUILD_DIR}/bin/unit" || die
256 -}
257
258 diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
259 deleted file mode 100644
260 index d5343c113668..000000000000
261 --- a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
262 +++ /dev/null
263 @@ -1,13 +0,0 @@
264 ---- a/test/unit/utVersion.cpp 2019-11-18 11:39:09.655298634 +0100
265 -+++ b/test/unit/utVersion.cpp 2019-11-18 11:39:25.823299035 +0100
266 -@@ -66,10 +66,6 @@
267 - EXPECT_NE( aiGetCompileFlags(), 0U );
268 - }
269 -
270 --TEST_F( utVersion, aiGetVersionRevisionTest ) {
271 -- EXPECT_NE( aiGetVersionRevision(), 0U );
272 --}
273 --
274 - TEST_F( utVersion, aiGetBranchNameTest ) {
275 - EXPECT_NE( nullptr, aiGetBranchName() );
276 - }
277
278 diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
279 deleted file mode 100644
280 index 6056f4973c55..000000000000
281 --- a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
282 +++ /dev/null
283 @@ -1,28 +0,0 @@
284 ---- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200
285 -+++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200
286 -@@ -54,14 +54,17 @@
287 -
288 - find_path(
289 - assimp_INCLUDE_DIRS
290 -- NAMES postprocess.h scene.h version.h config.h cimport.h
291 -+ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
292 - PATHS /usr/local/include/
293 -+ PATHS /usr/include/
294 - )
295 -
296 - find_library(
297 - assimp_LIBRARIES
298 - NAMES assimp
299 - PATHS /usr/local/lib/
300 -+ PATHS /usr/lib/
301 -+ PATHS /usr/lib64/
302 - )
303 -
304 - if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
305 -@@ -78,4 +81,4 @@
306 - endif (assimp_FIND_REQUIRED)
307 - endif (assimp_FOUND)
308 -
309 --endif(WIN32)
310 -\ Brak znaku nowej linii na końcu pliku
311 -+endif(WIN32)
312
313 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
314 deleted file mode 100644
315 index e75b47a1af4b..000000000000
316 --- a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
317 +++ /dev/null
318 @@ -1,11 +0,0 @@
319 ---- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200
320 -+++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200
321 -@@ -45,6 +45,8 @@
322 - #ifndef _unz_H
323 - #define _unz_H
324 -
325 -+#define OF _Z_OF
326 -+
327 - #ifdef __cplusplus
328 - extern "C" {
329 - #endif
330
331 diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
332 deleted file mode 100644
333 index 134edc7d7da1..000000000000
334 --- a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
335 +++ /dev/null
336 @@ -1,239 +0,0 @@
337 -From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
338 -From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@×××××××××.de>
339 -Date: Tue, 31 Mar 2020 21:30:07 +0200
340 -Subject: [PATCH] use GNUInstallDirs where possible
341 -
342 -Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
343 -disable redefining FHS-mandated install locations via user-editable
344 -ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
345 -Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
346 ----
347 - CMakeLists.txt | 36 ++++++++++++++++++++++------------
348 - assimp.pc.in | 6 ++----
349 - assimpTargets-debug.cmake.in | 20 +++++++++----------
350 - assimpTargets-release.cmake.in | 18 ++++++++---------
351 - assimpTargets.cmake.in | 15 +-------------
352 - 5 files changed, 45 insertions(+), 50 deletions(-)
353 -
354 -diff --git a/CMakeLists.txt b/CMakeLists.txt
355 -index dcafb649f5..c23c0df33e 100644
356 ---- a/CMakeLists.txt
357 -+++ b/CMakeLists.txt
358 -@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
359 - SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
360 - SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
361 -
362 --IF( UNIX )
363 -- # Use GNUInstallDirs for Unix predefined directories
364 -- INCLUDE(GNUInstallDirs)
365 --ENDIF( UNIX )
366 --
367 - # Grouped compiler settings
368 - IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
369 - IF(NOT HUNTER_ENABLED)
370 -@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
371 - SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
372 - ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
373 -
374 --# Cache these to allow the user to override them manually.
375 --SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
376 -- "Path the built library files are installed to." )
377 --SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
378 -- "Path the header files are installed to." )
379 --SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
380 -- "Path the tool executables are installed to." )
381 --
382 - get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
383 -
384 - IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug"))
385 -@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED)
386 - )
387 - ELSE(HUNTER_ENABLED)
388 - # cmake configuration files
389 -+
390 -+ IF( UNIX )
391 -+ # Use GNUInstallDirs for Unix predefined directories
392 -+ INCLUDE(GNUInstallDirs)
393 -+
394 -+ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
395 -+ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
396 -+ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
397 -+ ELSE( UNIX )
398 -+ # Cache these to allow the user to override them on non-Unix platforms
399 -+ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
400 -+ "Path the built library files are installed to." )
401 -+ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
402 -+ "Path the header files are installed to." )
403 -+ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
404 -+ "Path the tool executables are installed to." )
405 -+
406 -+ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
407 -+ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
408 -+ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
409 -+ ENDIF( UNIX )
410 -+
411 -+
412 - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
413 - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
414 - IF (is_multi_config)
415 -diff --git a/assimp.pc.in b/assimp.pc.in
416 -index c659e19f2c..555a3a1d3b 100644
417 ---- a/assimp.pc.in
418 -+++ b/assimp.pc.in
419 -@@ -1,7 +1,5 @@
420 --prefix=@CMAKE_INSTALL_PREFIX@
421 --exec_prefix=@CMAKE_INSTALL_PREFIX@/
422 --libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
423 --includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
424 -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
425 -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
426 -
427 - Name: @CMAKE_PROJECT_NAME@
428 - Description: Import various well-known 3D model formats in an uniform manner.
429 -diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
430 -index 1ebe2a6081..f5034c9349 100644
431 ---- a/assimpTargets-debug.cmake.in
432 -+++ b/assimpTargets-debug.cmake.in
433 -@@ -42,22 +42,22 @@ if(MSVC)
434 - # Import target "assimp::assimp" for configuration "Debug"
435 - set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
436 - set_target_properties(assimp::assimp PROPERTIES
437 -- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
438 -- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
439 -+ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
440 -+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
441 - )
442 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
443 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
444 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
445 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
446 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
447 - else()
448 - set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
449 -
450 - # Import target "assimp::assimp" for configuration "Debug"
451 - set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
452 - set_target_properties(assimp::assimp PROPERTIES
453 -- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
454 -+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
455 - )
456 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
457 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
458 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
459 - endif()
460 -
461 - else()
462 -@@ -66,17 +66,17 @@ else()
463 - set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
464 - set_target_properties(assimp::assimp PROPERTIES
465 - IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
466 -- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
467 -+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
468 - )
469 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
470 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
471 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
472 - else()
473 - set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
474 - set_target_properties(assimp::assimp PROPERTIES
475 -- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
476 -+ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
477 - )
478 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
479 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
480 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
481 - endif()
482 - endif()
483 -
484 -diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
485 -index f3db8f12cd..a416e8899b 100644
486 ---- a/assimpTargets-release.cmake.in
487 -+++ b/assimpTargets-release.cmake.in
488 -@@ -42,12 +42,12 @@ if(MSVC)
489 - # Import target "assimp::assimp" for configuration "Release"
490 - set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
491 - set_target_properties(assimp::assimp PROPERTIES
492 -- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
493 -- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
494 -+ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
495 -+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
496 - )
497 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
498 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
499 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
500 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
501 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
502 - else()
503 - set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
504 -
505 -@@ -57,7 +57,7 @@ if(MSVC)
506 - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
507 - )
508 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
509 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
510 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
511 - endif()
512 -
513 - else()
514 -@@ -70,17 +70,17 @@ else()
515 - endif()
516 - set_target_properties(assimp::assimp PROPERTIES
517 - IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
518 -- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
519 -+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
520 - )
521 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
522 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
523 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
524 - else()
525 - set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
526 - set_target_properties(assimp::assimp PROPERTIES
527 -- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
528 -+ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
529 - )
530 - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
531 -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
532 -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
533 - endif()
534 - endif()
535 -
536 -diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
537 -index ab1a8d2c7b..ef90c834a6 100644
538 ---- a/assimpTargets.cmake.in
539 -+++ b/assimpTargets.cmake.in
540 -@@ -40,16 +40,6 @@ unset(_targetsDefined)
541 - unset(_targetsNotDefined)
542 - unset(_expectedTargets)
543 -
544 --
545 --# Compute the installation prefix relative to this file.
546 --get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
547 --get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
548 --get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
549 --get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
550 --if(_IMPORT_PREFIX STREQUAL "/")
551 -- set(_IMPORT_PREFIX "")
552 --endif()
553 --
554 - # Create imported target assimp::assimp
555 - if(@BUILD_SHARED_LIBS@)
556 - add_library(assimp::assimp SHARED IMPORTED)
557 -@@ -60,7 +50,7 @@ endif()
558 - set_target_properties(assimp::assimp PROPERTIES
559 - COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
560 - INTERFACE_assimp_MAJOR_VERSION "1"
561 -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
562 -+ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
563 - #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
564 - )
565 -
566 -@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES})
567 - include(${f})
568 - endforeach()
569 -
570 --# Cleanup temporary variables.
571 --set(_IMPORT_PREFIX)
572 --
573 - # Loop over all imported files and verify that they actually exist
574 - foreach(target ${_IMPORT_CHECK_TARGETS} )
575 - foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
576
577 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
578 deleted file mode 100644
579 index b0db38a0e8a1..000000000000
580 --- a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
581 +++ /dev/null
582 @@ -1,76 +0,0 @@
583 -From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001
584 -From: RichardTea <31507749+RichardTea@××××××××××××××××××××.com>
585 -Date: Fri, 11 Oct 2019 16:28:14 +0100
586 -Subject: [PATCH] Update assimp legal and version
587 -
588 -Will now report the major and minor versions specified in cmakelists
589 ----
590 - code/Common/Version.cpp | 14 +++++---------
591 - test/unit/utVersion.cpp | 2 +-
592 - 2 files changed, 6 insertions(+), 10 deletions(-)
593 -
594 -diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
595 -index 868cfb06af..cf1da7d5ba 100644
596 ---- a/code/Common/Version.cpp
597 -+++ b/code/Common/Version.cpp
598 -@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
599 - #include <assimp/scene.h>
600 - #include "ScenePrivate.h"
601 -
602 --static const unsigned int MajorVersion = 5;
603 --static const unsigned int MinorVersion = 0;
604 -+#include "revision.h"
605 -
606 - // --------------------------------------------------------------------------------
607 - // Legal information string - don't remove this.
608 -@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION =
609 - "Open Asset Import Library (Assimp).\n"
610 - "A free C/C++ library to import various 3D file formats into applications\n\n"
611 -
612 --"(c) 2008-2020, assimp team\n"
613 -+"(c) 2006-2020, assimp team\n"
614 - "License under the terms and conditions of the 3-clause BSD license\n"
615 --"https://github.com/assimp/assimp\n"
616 -+"http://assimp.org\n"
617 - ;
618 -
619 - // ------------------------------------------------------------------------------------------------
620 -@@ -70,13 +69,13 @@ ASSIMP_API const char* aiGetLegalString () {
621 - // ------------------------------------------------------------------------------------------------
622 - // Get Assimp minor version
623 - ASSIMP_API unsigned int aiGetVersionMinor () {
624 -- return MinorVersion;
625 -+ return VER_MINOR;
626 - }
627 -
628 - // ------------------------------------------------------------------------------------------------
629 - // Get Assimp major version
630 - ASSIMP_API unsigned int aiGetVersionMajor () {
631 -- return MajorVersion;
632 -+ return VER_MAJOR;
633 - }
634 -
635 - // ------------------------------------------------------------------------------------------------
636 -@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags () {
637 - return flags;
638 - }
639 -
640 --// include current build revision, which is even updated from time to time -- :-)
641 --#include "revision.h"
642 --
643 - // ------------------------------------------------------------------------------------------------
644 - ASSIMP_API unsigned int aiGetVersionRevision() {
645 - return GitVersion;
646 -diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
647 -index 233b2fb0b2..66e832baae 100644
648 ---- a/test/unit/utVersion.cpp
649 -+++ b/test/unit/utVersion.cpp
650 -@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
651 - EXPECT_NE( lv, nullptr );
652 - std::string text( lv );
653 -
654 -- size_t pos( text.find( std::string( "2017" ) ) );
655 -+ size_t pos( text.find( std::string( "2019" ) ) );
656 - EXPECT_NE( pos, std::string::npos );
657 - }
658 -
659
660 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
661 deleted file mode 100644
662 index 1b1efa027427..000000000000
663 --- a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
664 +++ /dev/null
665 @@ -1,37 +0,0 @@
666 -From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001
667 -From: Kim Kulling <kimkulling@××××××××××××××××××××.com>
668 -Date: Sun, 6 Oct 2019 20:19:59 +0200
669 -Subject: [PATCH] Update utVersion.cpp
670 -
671 -Fix the unittests as well.
672 ----
673 - test/unit/utVersion.cpp | 6 ++----
674 - 1 file changed, 2 insertions(+), 4 deletions(-)
675 -
676 -diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
677 -index 5cfc91ccdd..233b2fb0b2 100644
678 ---- a/test/unit/utVersion.cpp
679 -+++ b/test/unit/utVersion.cpp
680 -@@ -4,8 +4,6 @@ Open Asset Import Library (assimp)
681 -
682 - Copyright (c) 2006-2019, assimp team
683 -
684 --
685 --
686 - All rights reserved.
687 -
688 - Redistribution and use of this software in source and binary forms,
689 -@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
690 - }
691 -
692 - TEST_F( utVersion, aiGetVersionMinorTest ) {
693 -- EXPECT_EQ( aiGetVersionMinor(), 1U );
694 -+ EXPECT_EQ( aiGetVersionMinor(), 0U );
695 - }
696 -
697 - TEST_F( utVersion, aiGetVersionMajorTest ) {
698 -- EXPECT_EQ( aiGetVersionMajor(), 4U );
699 -+ EXPECT_EQ( aiGetVersionMajor(), 5U );
700 - }
701 -
702 - TEST_F( utVersion, aiGetCompileFlagsTest ) {
703
704 diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
705 deleted file mode 100644
706 index ed82e1b0b4b0..000000000000
707 --- a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
708 +++ /dev/null
709 @@ -1,22 +0,0 @@
710 -From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001
711 -From: =?UTF-8?q?Lo=C3=AFc?= <loic.fricoteaux@××××××.com>
712 -Date: Tue, 14 Jan 2020 16:26:24 +0100
713 -Subject: [PATCH] Fix Assimp patch version to match the last bug fix release
714 -
715 ----
716 - CMakeLists.txt | 2 +-
717 - 1 file changed, 1 insertion(+), 1 deletion(-)
718 -
719 -diff --git a/CMakeLists.txt b/CMakeLists.txt
720 -index 23b6f6d618..e14c4aa21f 100644
721 ---- a/CMakeLists.txt
722 -+++ b/CMakeLists.txt
723 -@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED)
724 - add_definitions(-DASSIMP_USE_HUNTER)
725 - ENDIF(HUNTER_ENABLED)
726 -
727 --PROJECT( Assimp VERSION 5.0.0 )
728 -+PROJECT( Assimp VERSION 5.0.1 )
729 -
730 - # All supported options ###############################################
731 -
732
733 diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
734 deleted file mode 100644
735 index 8267fc004d61..000000000000
736 --- a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
737 +++ /dev/null
738 @@ -1,23 +0,0 @@
739 -From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001
740 -From: Marc-Antoine Lortie <marc-antoine.lortie@×××××××.com>
741 -Date: Mon, 20 Jan 2020 09:14:04 -0500
742 -Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate
743 - year.
744 -
745 ----
746 - test/unit/utVersion.cpp | 2 +-
747 - 1 file changed, 1 insertion(+), 1 deletion(-)
748 -
749 -diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
750 -index ca54620533..aa75a26d85 100644
751 ---- a/test/unit/utVersion.cpp
752 -+++ b/test/unit/utVersion.cpp
753 -@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
754 - EXPECT_NE( lv, nullptr );
755 - std::string text( lv );
756 -
757 -- size_t pos( text.find( std::string( "2019" ) ) );
758 -+ size_t pos( text.find( std::string( "2020" ) ) );
759 - EXPECT_NE( pos, std::string::npos );
760 - }
761 -
762
763 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
764 deleted file mode 100644
765 index 736757693774..000000000000
766 --- a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
767 +++ /dev/null
768 @@ -1,25 +0,0 @@
769 -https://bugs.gentoo.org/840616
770 -https://github.com/assimp/assimp/issues/4433
771 -
772 -From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
773 -From: Bernd Waibel <waebbl-gentoo@××××××.net>
774 -Date: Mon, 25 Apr 2022 17:39:33 +0200
775 -Subject: [PATCH] drop -Werror gcc option
776 -
777 -Temporary hack to allow building with gcc-12
778 -
779 -Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
780 ---- a/code/CMakeLists.txt
781 -+++ b/code/CMakeLists.txt
782 -@@ -1179,8 +1179,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
783 - # enable warnings as errors ########################################
784 - IF (MSVC)
785 - TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
786 --ELSE()
787 -- TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)
788 - ENDIF()
789 -
790 - # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler
791 ---
792 -2.35.1
793 -
794
795 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
796 deleted file mode 100644
797 index 1de4f661fa55..000000000000
798 --- a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
799 +++ /dev/null
800 @@ -1,134 +0,0 @@
801 -https://bugs.gentoo.org/840767
802 -https://github.com/assimp/assimp/issues/4438
803 -
804 -From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
805 -From: Bernd Waibel <waebbl-gentoo@××××××.net>
806 -Date: Thu, 28 Apr 2022 07:59:26 +0200
807 -Subject: [PATCH] drop failing tests for abi_x86_32
808 -
809 -Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
810 ---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
811 -+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
812 -@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
813 - EXPECT_EQ(result_cpp, result_c);
814 - }
815 -
816 --TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
817 -- const auto q = random_quat();
818 -- result_cpp = q.GetMatrix();
819 -- aiMatrix3FromQuaternion(&result_c, &q);
820 -- EXPECT_EQ(result_cpp, result_c);
821 --}
822 --
823 - TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
824 - result_c = result_cpp = random_mat3();
825 - EXPECT_EQ(result_cpp == result_c,
826 ---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
827 -+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
828 -@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
829 - EXPECT_EQ(result_cpp, result_c);
830 - }
831 -
832 --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
833 -- const aiVector3D s = random_vec3();
834 -- const aiQuaternion q = random_quat();
835 -- const aiVector3D t = random_vec3();
836 -- result_cpp = aiMatrix4x4(s, q, t);
837 -- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
838 -- EXPECT_EQ(result_cpp, result_c);
839 --}
840 --
841 - TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
842 - const aiMatrix4x4 temp = random_mat4();
843 - result_c = result_cpp = random_mat4();
844 -@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
845 - EXPECT_EQ(result_cpp, result_c);
846 - }
847 -
848 --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
849 -- result_c = result_cpp = random_mat4();
850 -- EXPECT_EQ(result_cpp.Determinant(),
851 -- aiMatrix4Determinant(&result_c));
852 --}
853 --
854 - TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
855 - EXPECT_EQ(result_cpp.IsIdentity(),
856 - (bool)aiMatrix4IsIdentity(&result_c));
857 ---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
858 -+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
859 -@@ -54,19 +54,6 @@ protected:
860 - aiQuaternion result_c, result_cpp;
861 - };
862 -
863 --TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
864 -- // Use a predetermined transformation matrix
865 -- // to prevent running into division by zero.
866 -- aiMatrix3x3 m, r;
867 -- aiMatrix3x3::Translation(aiVector2D(14,-25), m);
868 -- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
869 -- m = m * r;
870 --
871 -- result_cpp = aiQuaternion(m);
872 -- aiCreateQuaternionFromMatrix(&result_c, &m);
873 -- EXPECT_EQ(result_cpp, result_c);
874 --}
875 --
876 - TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
877 - const float x(RandPI.next()),
878 - y(RandPI.next()),
879 ---- a/test/unit/AssimpAPITest_aiVector2D.cpp
880 -+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
881 -@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
882 - (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
883 - }
884 -
885 --TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
886 -- result_c = result_cpp = random_vec2();
887 -- result_cpp += temp;
888 -- aiVector2Add(&result_c, &temp);
889 -- EXPECT_EQ(result_cpp, result_c);
890 --}
891 --
892 --TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
893 -- result_c = result_cpp = random_vec2();
894 -- result_cpp -= temp;
895 -- aiVector2Subtract(&result_c, &temp);
896 -- EXPECT_EQ(result_cpp, result_c);
897 --}
898 --
899 --TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
900 -- const float FACTOR = RandNonZero.next();
901 -- result_c = result_cpp = random_vec2();
902 -- result_cpp *= FACTOR;
903 -- aiVector2Scale(&result_c, FACTOR);
904 -- EXPECT_EQ(result_cpp, result_c);
905 --}
906 --
907 - TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
908 - result_c = result_cpp = random_vec2();
909 - result_cpp = result_cpp.SymMul(temp);
910 -@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
911 - EXPECT_EQ(result_cpp, result_c);
912 - }
913 -
914 --TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
915 -- const float DIVISOR = RandNonZero.next();
916 -- result_c = result_cpp = random_vec2();
917 -- result_cpp /= DIVISOR;
918 -- aiVector2DivideByScalar(&result_c, DIVISOR);
919 -- EXPECT_EQ(result_cpp, result_c);
920 --}
921 --
922 --TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
923 -- result_c = result_cpp = random_vec2();
924 -- result_cpp = result_cpp / temp;
925 -- aiVector2DivideByVector(&result_c, &temp);
926 -- EXPECT_EQ(result_cpp, result_c);
927 --}
928 --
929 - TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
930 - result_c = result_cpp = random_vec2();
931 - EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
932 ---
933 -2.35.1
934 -