* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2016-09-26 6:14 Slawek Lis
0 siblings, 0 replies; 11+ messages in thread
From: Slawek Lis @ 2016-09-26 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 4053dbec8127eec2d8062731f08a020ffd0c5661
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 06:06:28 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 06:06:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4053dbec
media-libs/assimp: patch that fixes Findassimp cmake module path
In default assimp installation there are hardcoded paths for /usr/local/lib
Reported in bug 595066
Reported-By: Patrick Nicolas <patricknicolas <AT> laposte.net>
Package-Manager: portage-2.3.1
media-libs/assimp/assimp-3.3.1.ebuild | 5 +++++
media-libs/assimp/files/findassimp-3.3.1.patch | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild
index 02d5f95..823efd8 100644
--- a/media-libs/assimp/assimp-3.3.1.ebuild
+++ b/media-libs/assimp/assimp-3.3.1.ebuild
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
+src_prepare() {
+ eapply "${FILESDIR}/findassimp-${PV}.patch"
+ eapply_user
+}
+
src_configure() {
mycmakeargs=(
-DASSIMP_BUILD_SAMPLES=$(usex samples) \
diff --git a/media-libs/assimp/files/findassimp-3.3.1.patch b/media-libs/assimp/files/findassimp-3.3.1.patch
new file mode 100644
index 00000000..0f36faf
--- /dev/null
+++ b/media-libs/assimp/files/findassimp-3.3.1.patch
@@ -0,0 +1,25 @@
+--- a/cmake-modules/Findassimp.cmake 2016-09-26 07:52:09.719727490 +0200
++++ b/cmake-modules/Findassimp.cmake 2016-09-26 07:52:28.509727838 +0200
+@@ -55,13 +55,13 @@
+ find_path(
+ assimp_INCLUDE_DIRS
+ NAMES postprocess.h scene.h version.h config.h cimport.h
+- PATHS /usr/local/include/
++ PATHS /usr/include/
+ )
+
+ find_library(
+ assimp_LIBRARIES
+ NAMES assimp
+- PATHS /usr/local/lib/
++ PATHS /usr/lib/
+ )
+
+ if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +78,4 @@
+ endif (assimp_FIND_REQUIRED)
+ endif (assimp_FOUND)
+
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2017-07-24 6:30 Slawek Lis
0 siblings, 0 replies; 11+ messages in thread
From: Slawek Lis @ 2017-07-24 6:30 UTC (permalink / raw
To: gentoo-commits
commit: bf499ff6e315e46b3557d460a8f656525e8cfc85
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 06:31:56 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 06:30:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf499ff6
media-libs/assimp: version bump to 4.0.0
Reported in #625948
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-4.0.0.ebuild | 53 ++++++++++++++++++++++++++
media-libs/assimp/files/findassimp-4.0.0.patch | 25 ++++++++++++
3 files changed, 79 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 32ab0053144..aa539541f86 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,3 +2,4 @@ DIST assimp--3.0.1270-source-only.zip 4042147 SHA256 ac29beb596db97df57451a5503a
DIST assimp-3.1.1.zip 32869052 SHA256 3b8d16eaf6c4b26479295f4f7436388bee1e42e8c0b11f6f695b7194985eb00e SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 WHIRLPOOL 238a79a7e2c7ce799dc89394043962456af06eb8b6ed105893512cb751919287c70c88030b03832ba2f3e6ea54d82db4e8d6009629bb7ed3f3e5e6df78bbd6c6
DIST assimp-3.2.tar.gz 33756081 SHA256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a WHIRLPOOL 1a1cb97356a888863f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
DIST assimp-3.3.1.tar.gz 36428380 SHA256 d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a WHIRLPOOL 9aba3cc73641ae130c0d3522b32c1bd5afd16eb9b599c1dff8cc1bcb71952b109420eeb7bc3474fc21bbedf79ed58e14743983d6bee01c4e3e5305d447bb9316
+DIST assimp-4.0.0.tar.gz 44618473 SHA256 9025d7fdd2a1d1d23261cbbcb1155b267f2a277f7e86103e5e16f1cdea407fb9 SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62 WHIRLPOOL 4082275dce5244433f501be420ba59a62ba562269daafd985d0bf0e9be013da57ae9390ba2df210b8765612b873078703b6d6bd1884066c2375004fd13c7cbcf
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild
new file mode 100644
index 00000000000..c96cc0c1651
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator multilib
+
+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"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost
+ samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+ eapply "${FILESDIR}/findassimp-${PV}.patch"
+ eapply_user
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DASSIMP_BUILD_SAMPLES=$(usex samples) \
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static) \
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch
new file mode 100644
index 00000000000..2fbaa73a850
--- /dev/null
+++ b/media-libs/assimp/files/findassimp-4.0.0.patch
@@ -0,0 +1,25 @@
+--- a/cmake-modules/Findassimp.cmake 2017-07-24 08:21:12.436647541 +0200
++++ b/cmake-modules/Findassimp.cmake 2017-07-24 08:21:30.139980768 +0200
+@@ -55,13 +55,13 @@
+ find_path(
+ assimp_INCLUDE_DIRS
+ NAMES postprocess.h scene.h version.h config.h cimport.h
+- PATHS /usr/local/include/
++ PATHS /usr/include/
+ )
+
+ find_library(
+ assimp_LIBRARIES
+ NAMES assimp
+- PATHS /usr/local/lib/
++ PATHS /usr/lib/
+ )
+
+ if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +78,4 @@
+ endif (assimp_FIND_REQUIRED)
+ endif (assimp_FOUND)
+
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2018-05-16 12:09 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2018-05-16 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 052be5a30b67d819681461903aa0d992f65777e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 12:07:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 16 12:09:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052be5a3
media-libs/assimp: 4.0.1 version bump
Bug: https://bugs.gentoo.org/631744
Closes: https://bugs.gentoo.org/645862
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-4.0.1.ebuild | 65 ++++++++++++++++++++++
.../assimp/files/assimp-4.0.1-qt-5.11.0.patch | 59 ++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index f274bb9d294..d324fb5ca93 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -3,3 +3,4 @@ DIST assimp-3.1.1.zip 32869052 BLAKE2B 877b1a00a8e35eafb85c0f1b1c364c025a98c629d
DIST assimp-3.2.tar.gz 33756081 BLAKE2B 76de8f74b7b2eae04ebd3d71b69709d601d249a4ed7e6102fffce376f67dfb2d433536556e7683bc79d092465940cd5d7750f7fecb54edd33b9e8bfa974f8de0 SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a
DIST assimp-3.3.1.tar.gz 36428380 BLAKE2B 5239648ea99e23a1f5f568fb22e6f9607b3f2e642fcdb480737c8813456fee699a4a07937c248ded01c27edd503f1a30ae8bde30ff49d8bac61e6363f12d1cc5 SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a
DIST assimp-4.0.0.tar.gz 44618473 BLAKE2B 12bf7e09bc80de33ec250e19ca4a5dd34fd1b1a25ca05b85fa3c3253b3b9fba103389f34b874652b393d014bb7da863a3487b1a9cb5e806028c2d060286edaca SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62
+DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
new file mode 100644
index 00000000000..89da03baf09
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+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"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib:=[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+ tools? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-libs/devil
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/findassimp-3.3.1.patch"
+ "${FILESDIR}/${P}-qt-5.11.0.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+ -DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
new file mode 100644
index 00000000000..ef5a5024939
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
@@ -0,0 +1,59 @@
+From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 May 2018 13:45:25 +0200
+Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
+
+---
+ tools/assimp_qt_viewer/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
+index 42ef0fb3..9f1b68ca 100644
+--- a/tools/assimp_qt_viewer/CMakeLists.txt
++++ b/tools/assimp_qt_viewer/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(assimp_qt_viewer)
+
+ cmake_minimum_required(VERSION 2.6)
+
+-find_package(Qt5Widgets REQUIRED)
++find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED)
+ find_package(DevIL REQUIRED)
+ find_package(OpenGL REQUIRED)
+
+@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui)
+ qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp)
+
+ add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs})
+-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
++target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
+
+-qt5_use_modules(${PROJECT_NAME} Widgets OpenGL)
+ if(WIN32) # Check if we are on Windows
+ if(MSVC) # Check if we are using the Visual Studio compiler
+ #set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+--
+2.17.0
+
+
+From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 May 2018 13:58:30 +0200
+Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target
+
+---
+ tools/assimp_qt_viewer/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
+index 9f1b68ca..b41291e3 100644
+--- a/tools/assimp_qt_viewer/CMakeLists.txt
++++ b/tools/assimp_qt_viewer/CMakeLists.txt
+@@ -42,3 +42,5 @@ else()
+ endif()
+
+ set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
++
++install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}")
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2019-08-22 3:36 Slawek Lis
0 siblings, 0 replies; 11+ messages in thread
From: Slawek Lis @ 2019-08-22 3:36 UTC (permalink / raw
To: gentoo-commits
commit: ffb6a46687b3a16ca1f9ebdb0fcd9e04bf910c4e
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 03:36:22 2019 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 03:36:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb6a466
media-libs/assimp: version bump to 4.1.0
Closes: https://bugs.gentoo.org/653992
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-4.1.0.ebuild | 65 ++++++++++++++++++++++
.../assimp/files/assimp-4.1.0-disabletest.patch | 10 ++++
.../assimp/files/assimp-4.1.0-unzip-of.patch | 11 ++++
4 files changed, 87 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 6e8afcaf3dc..76d568f91e9 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1 +1,2 @@
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
+DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
new file mode 100644
index 00000000000..05020030504
--- /dev/null
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib:=[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+ tools? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-libs/devil
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disabletest.patch" # bug 659122
+ "${FILESDIR}/${P}-unzip-of.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+ -DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
new file mode 100644
index 00000000000..4afe5bbd26b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
@@ -0,0 +1,10 @@
+--- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
++++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
+@@ -65,7 +65,3 @@
+ EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+- EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
new file mode 100644
index 00000000000..e75b47a1af4
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
@@ -0,0 +1,11 @@
+--- 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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2020-06-05 16:06 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5cc674352064a5cada27f14b2c98ba9b5f7a1261
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 16:05:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 16:06:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc67435
media-libs/assimp: Fix tests
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/assimp/assimp-5.0.1.ebuild | 4 ++
.../assimp-5.0.1-fix-aiGetLegalStringTest.patch | 76 ++++++++++++++++++++++
.../assimp/files/assimp-5.0.1-fix-unittests.patch | 37 +++++++++++
.../assimp/files/assimp-5.0.1-projectversion.patch | 22 +++++++
.../assimp/files/assimp-5.0.1-versiontest.patch | 23 +++++++
5 files changed, 162 insertions(+)
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild
index 96281b1fd32..cb827e7ac42 100644
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -35,6 +35,10 @@ PATCHES=(
"${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() {
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
new file mode 100644
index 00000000000..b0db38a0e8a
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
@@ -0,0 +1,76 @@
+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
new file mode 100644
index 00000000000..1b1efa02742
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000000..ed82e1b0b4b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 00000000000..8267fc004d6
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
@@ -0,0 +1,23 @@
+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 );
+ }
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2020-06-15 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2020-06-15 8:20 UTC (permalink / raw
To: gentoo-commits
commit: b280e6df520753f9947f3937b2d23f275b34ca7f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 23:06:00 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 08:19:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b280e6df
media-libs/assimp: Drop 4.0.1, 4.0.1-r1 and 4.1.0
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/assimp/Manifest | 2 -
media-libs/assimp/assimp-4.0.1-r1.ebuild | 68 ----------------------
media-libs/assimp/assimp-4.0.1.ebuild | 67 ---------------------
media-libs/assimp/assimp-4.1.0.ebuild | 67 ---------------------
.../assimp/files/assimp-4.0.1-disabletest.patch | 10 ----
.../assimp/files/assimp-4.0.1-qt-5.11.0.patch | 59 -------------------
.../assimp/files/assimp-4.1.0-disabletest.patch | 10 ----
.../assimp/files/assimp-4.1.0-findassimp.patch | 28 ---------
.../assimp/files/assimp-4.1.0-unzip-of.patch | 11 ----
media-libs/assimp/files/findassimp-3.3.1.patch | 25 --------
media-libs/assimp/metadata.xml | 1 -
11 files changed, 348 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 4d35ba70884..a4842c4c29f 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,4 +1,2 @@
-DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
-DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
deleted file mode 100644
index 2454b233cb6..00000000000
--- a/media-libs/assimp/assimp-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/findassimp-3.3.1.patch"
- "${FILESDIR}/${P}-qt-5.11.0.patch"
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
- append-flags -fno-strict-aliasing
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
deleted file mode 100644
index 5ad3d5d6837..00000000000
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/findassimp-3.3.1.patch"
- "${FILESDIR}/${P}-qt-5.11.0.patch"
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
deleted file mode 100644
index f52e8180a88..00000000000
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
- "${FILESDIR}/${P}-unzip-of.patch"
- "${FILESDIR}/${P}-findassimp.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
deleted file mode 100644
index 4afe5bbd26b..00000000000
--- a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
deleted file mode 100644
index ef5a5024939..00000000000
--- a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:45:25 +0200
-Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 42ef0fb3..9f1b68ca 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(assimp_qt_viewer)
-
- cmake_minimum_required(VERSION 2.6)
-
--find_package(Qt5Widgets REQUIRED)
-+find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED)
- find_package(DevIL REQUIRED)
- find_package(OpenGL REQUIRED)
-
-@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui)
- qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp)
-
- add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs})
--target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
-+target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
-
--qt5_use_modules(${PROJECT_NAME} Widgets OpenGL)
- if(WIN32) # Check if we are on Windows
- if(MSVC) # Check if we are using the Visual Studio compiler
- #set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
---
-2.17.0
-
-
-From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:58:30 +0200
-Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 9f1b68ca..b41291e3 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -42,3 +42,5 @@ else()
- endif()
-
- set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-+
-+install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}")
---
-2.17.0
-
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
deleted file mode 100644
index 4afe5bbd26b..00000000000
--- a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
deleted file mode 100644
index 6056f4973c5..00000000000
--- a/media-libs/assimp/files/assimp-4.1.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-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
deleted file mode 100644
index e75b47a1af4..00000000000
--- a/media-libs/assimp/files/assimp-4.1.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/findassimp-3.3.1.patch b/media-libs/assimp/files/findassimp-3.3.1.patch
deleted file mode 100644
index 0f36fafb015..00000000000
--- a/media-libs/assimp/files/findassimp-3.3.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmake-modules/Findassimp.cmake 2016-09-26 07:52:09.719727490 +0200
-+++ b/cmake-modules/Findassimp.cmake 2016-09-26 07:52:28.509727838 +0200
-@@ -55,13 +55,13 @@
- find_path(
- assimp_INCLUDE_DIRS
- NAMES postprocess.h scene.h version.h config.h cimport.h
-- PATHS /usr/local/include/
-+ PATHS /usr/include/
- )
-
- find_library(
- assimp_LIBRARIES
- NAMES assimp
-- PATHS /usr/local/lib/
-+ PATHS /usr/lib/
- )
-
- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +78,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/metadata.xml b/media-libs/assimp/metadata.xml
index a9d38618add..6eafc14b8fb 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -4,7 +4,6 @@
<!-- maintainer-needed -->
<use>
<flag name="samples">Build viewer library</flag>
- <flag name="tools">Build assimp tool binary</flag>
</use>
<upstream>
<remote-id type="sourceforge">assimp</remote-id>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2022-03-12 17:37 Matthew Smith
0 siblings, 0 replies; 11+ messages in thread
From: Matthew Smith @ 2022-03-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 2e40531368c0cf5ae2d8326fdab7e5a5e67db438
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 11 11:55:51 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 17:30:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e405313
media-libs/assimp: bump to 5.2.2
Removes the doc USE flag, because the documentation is no longer available
as a pdf on the release page and building it is currently broken.
Bug: https://github.com/assimp/assimp/issues/4439
Bug: https://github.com/assimp/assimp/issues/4438
Bug: https://github.com/assimp/assimp/issues/4334
Bug: https://bugs.gentoo.org/830374
Closes: https://bugs.gentoo.org/829957
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24485
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-5.2.2.ebuild | 59 ++++++++++++++++++++++
.../files/assimp-5.2.2-disable-failing-tests.patch | 52 +++++++++++++++++++
...ge-of-incompatible-minizip-data-structure.patch | 24 +++++++++
media-libs/assimp/metadata.xml | 9 +++-
5 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index a4842c4c29fe..9f05fa49dd0f 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,2 +1,3 @@
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-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
new file mode 100644
index 000000000000..d2628095f7fb
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -0,0 +1,59 @@
+# 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/files/assimp-5.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
new file mode 100644
index 000000000000..3c423ac5107a
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
@@ -0,0 +1,52 @@
+From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 11 Mar 2022 11:24:13 +0100
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
+ aiMatrix4Scaling(&result_c, &scaling);
+ EXPECT_EQ(result_cpp, result_c);
+ }
+-
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
+- // Use predetermined vectors to prevent running into division by zero.
+- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
+- aiMatrix4x4::FromToMatrix(from, to, result_cpp);
+- aiMatrix4FromTo(&result_c, &from, &to);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
+@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
+- const auto qvec3 = random_unit_vec3();
+- result_cpp = aiQuaternion(qvec3);
+- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
+ result_c = result_cpp = random_quat();
+ EXPECT_EQ(result_cpp == result_c,
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
+ EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+- EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+ EXPECT_NE( nullptr, aiGetBranchName() );
+ }
+--
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
new file mode 100644
index 000000000000..6d48161646ef
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
@@ -0,0 +1,24 @@
+From https://github.com/assimp/assimp/issues/4334#issue-1097591121
+From: Brecht Sanders (@brechtsanders)
+Date: Fri, 11 Mar 2022 10:01:15 +0100
+Subject: [PATCH] fix usage of incompatible minizip data structure
+
+Suggested-by: Brecht Sanders (@brechtsanders)
+Bug: https://github.com/assimp/assimp/issues/4334
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/code/Common/ZipArchiveIOSystem.cpp
++++ b/code/Common/ZipArchiveIOSystem.cpp
+@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
+ zlib_filefunc_def mapping;
+
+ mapping.zopen_file = (open_file_func)open;
++#ifdef ZOPENDISK64
+ mapping.zopendisk_file = (opendisk_file_func)opendisk;
++#endif
+ mapping.zread_file = (read_file_func)read;
+ mapping.zwrite_file = (write_file_func)write;
+ mapping.ztell_file = (tell_file_func)tell;
+--
+2.35.1
+
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 31a4d44a05c1..5525e184d20e 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>waebbl-gentoo@posteo.net</email>
+ <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="samples">Build viewer library</flag>
</use>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2022-06-03 12:34 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-06-03 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 6a97131300269627ef811261f8c822130e433506
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat May 21 14:44:52 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:34:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a971313
media-libs/assimp: add 5.2.4
Closes: https://bugs.gentoo.org/846698
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25589
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-5.2.4.ebuild | 66 +++++++++
...p-5.2.4-drop-failing-tests-for-abi_x86_32.patch | 165 +++++++++++++++++++++
3 files changed, 232 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index c8a058fd549a..b5c0f828ac95 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,4 +1,5 @@
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.2.4.ebuild b/media-libs/assimp/assimp-5.2.4.ebuild
new file mode 100644
index 000000000000..c89ba2b0796b
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.4.ebuild
@@ -0,0 +1,66 @@
+# 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/5.2.4"
+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}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.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_INJECT_DEBUG_POSTFIX=OFF
+ -DASSIMP_IGNORE_GIT_HASH=ON
+ -DASSIMP_UBSAN=OFF
+ -DASSIMP_WARNINGS_AS_ERRORS=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.2.4-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
new file mode 100644
index 000000000000..fba27be45315
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
@@ -0,0 +1,165 @@
+https://bugs.gentoo.org/840767
+https://github.com/assimp/assimp/issues/4438
+
+From 48cb5451383855755debfc17cb5e3428cba2d94e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 21 May 2022 17:37:04 +0200
+Subject: [PATCH] drop failing tests for abi_x86_32
+
+Drop two additional test wrt 5.2.3
+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,
+@@ -127,14 +120,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) {
+- const float angle(RandPI.next());
+- const auto axis = random_unit_vec3();
+- aiMatrix3x3::Rotation(angle, axis, result_cpp);
+- aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
+ const auto axis = random_vec2();
+ aiMatrix3x3::Translation(axis, result_cpp);
+--- 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));
+@@ -228,14 +213,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) {
+ EXPECT_EQ(result_cpp, result_c);
+ }
+
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) {
+- const float angle(RandPI.next());
+- const auto axis = random_unit_vec3();
+- aiMatrix4x4::Rotation(angle, axis, result_cpp);
+- aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle);
+- EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
+ const auto axis = random_vec3();
+ aiMatrix4x4::Translation(axis, result_cpp);
+--- 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
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2022-06-24 6:39 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-06-24 6:39 UTC (permalink / raw
To: gentoo-commits
commit: 765d034f0f642cdce37aa38be60defa5095ee065
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Jun 23 15:44:14 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 06:39:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765d034f
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 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26058
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/assimp/Manifest | 4 -
media-libs/assimp/assimp-5.0.1.ebuild | 66 ------
media-libs/assimp/assimp-5.2.2.ebuild | 59 -----
media-libs/assimp/assimp-5.2.3.ebuild | 70 ------
.../assimp/files/assimp-5.0.0-disabletest.patch | 13 --
.../assimp/files/assimp-5.0.0-findassimp.patch | 28 ---
.../assimp/files/assimp-5.0.0-unzip-of.patch | 11 -
.../assimp/files/assimp-5.0.1-GNUInstallDirs.patch | 239 ---------------------
.../assimp-5.0.1-fix-aiGetLegalStringTest.patch | 76 -------
.../assimp/files/assimp-5.0.1-fix-unittests.patch | 37 ----
.../assimp/files/assimp-5.0.1-projectversion.patch | 22 --
.../assimp/files/assimp-5.0.1-versiontest.patch | 23 --
.../assimp-5.2.3-drop-Werror-gcc-option.patch | 25 ---
...p-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 134 ------------
14 files changed, 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
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2022-10-12 16:23 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-10-12 16:23 UTC (permalink / raw
To: gentoo-commits
commit: b9fe2da71ced3a4ec4bbe46b06d371981db99607
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Sep 17 14:12:15 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 16:23:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fe2da7
media-libs/assimp: add 5.2.5
Bug: https://github.com/assimp/assimp/pull/4730
Closes: https://bugs.gentoo.org/869461
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27307
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-5.2.5.ebuild | 69 ++++++++++++++++++++++
.../assimp/files/assimp-5.2.5-fix-version.patch | 33 +++++++++++
3 files changed, 103 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 34eb32db608e..3810c5ca0704 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1 +1,2 @@
DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
+DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
diff --git a/media-libs/assimp/assimp-5.2.5.ebuild b/media-libs/assimp/assimp-5.2.5.ebuild
new file mode 100644
index 000000000000..05540699b679
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.5.ebuild
@@ -0,0 +1,69 @@
+# 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/5.2.5"
+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}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
+ "${FILESDIR}"/${P}-fix-version.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_ASSIMP_TOOLS=ON
+ -DASSIMP_BUILD_DOCS=OFF
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_BUILD_ZLIB=OFF
+ -DASSIMP_DOUBLE_PRECISION=OFF
+ -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
+ -DASSIMP_IGNORE_GIT_HASH=ON
+ -DASSIMP_UBSAN=OFF
+ -DASSIMP_WARNINGS_AS_ERRORS=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.2.5-fix-version.patch b/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
new file mode 100644
index 000000000000..71b58c4808d1
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
@@ -0,0 +1,33 @@
+https://github.com/assimp/assimp/pull/4730
+
+From b526d7a4b82be6d8c1481459975350b94384e805 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 17 Sep 2022 15:15:58 +0200
+Subject: [PATCH] fix version
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
+ add_definitions(-DASSIMP_USE_HUNTER)
+ ENDIF()
+
+-PROJECT(Assimp VERSION 5.2.4)
++PROJECT(Assimp VERSION 5.2.5)
+
+ # All supported options ###############################################
+
+--- a/test/unit/utVersion.cpp
++++ b/test/unit/utVersion.cpp
+@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
+ }
+
+ TEST_F( utVersion, aiGetVersionPatchTest ) {
+- EXPECT_EQ(aiGetVersionPatch(), 4U );
++ EXPECT_EQ(aiGetVersionPatch(), 5U );
+ }
+
+ TEST_F( utVersion, aiGetCompileFlagsTest ) {
+--
+2.37.3
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
@ 2023-02-07 19:14 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-02-07 19:14 UTC (permalink / raw
To: gentoo-commits
commit: ce431172cf05980f2631ee625acb8597ed392876
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Feb 7 18:51:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 19:14:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce431172
media-libs/assimp: drop 5.2.4-r1
Bug: https://bugs.gentoo.org/891787
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29469
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/assimp/Manifest | 1 -
media-libs/assimp/assimp-5.2.4-r1.ebuild | 67 ---------
.../files/assimp-5.2.2-disable-failing-tests.patch | 52 -------
...ge-of-incompatible-minizip-data-structure.patch | 24 ---
...p-5.2.4-drop-failing-tests-for-abi_x86_32.patch | 165 ---------------------
.../assimp/files/assimp-5.2.4-update-version.patch | 34 -----
6 files changed, 343 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 3810c5ca0704..34611184f6fc 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,2 +1 @@
-DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild b/media-libs/assimp/assimp-5.2.4-r1.ebuild
deleted file mode 100644
index 135d40e3ca95..000000000000
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,67 +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/5.2.4"
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
- "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
- "${FILESDIR}"/${P}-update-version.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_INJECT_DEBUG_POSTFIX=OFF
- -DASSIMP_IGNORE_GIT_HASH=ON
- -DASSIMP_UBSAN=OFF
- -DASSIMP_WARNINGS_AS_ERRORS=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.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
deleted file mode 100644
index 3c423ac5107a..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 11 Mar 2022 11:24:13 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
- aiMatrix4Scaling(&result_c, &scaling);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
-- // Use predetermined vectors to prevent running into division by zero.
-- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
-- aiMatrix4x4::FromToMatrix(from, to, result_cpp);
-- aiMatrix4FromTo(&result_c, &from, &to);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
-- const auto qvec3 = random_unit_vec3();
-- result_cpp = aiQuaternion(qvec3);
-- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
- result_c = result_cpp = random_quat();
- EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
- EXPECT_NE( nullptr, aiGetBranchName() );
- }
---
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
deleted file mode 100644
index 6d48161646ef..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://github.com/assimp/assimp/issues/4334#issue-1097591121
-From: Brecht Sanders (@brechtsanders)
-Date: Fri, 11 Mar 2022 10:01:15 +0100
-Subject: [PATCH] fix usage of incompatible minizip data structure
-
-Suggested-by: Brecht Sanders (@brechtsanders)
-Bug: https://github.com/assimp/assimp/issues/4334
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/code/Common/ZipArchiveIOSystem.cpp
-+++ b/code/Common/ZipArchiveIOSystem.cpp
-@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
- zlib_filefunc_def mapping;
-
- mapping.zopen_file = (open_file_func)open;
-+#ifdef ZOPENDISK64
- mapping.zopendisk_file = (opendisk_file_func)opendisk;
-+#endif
- mapping.zread_file = (read_file_func)read;
- mapping.zwrite_file = (write_file_func)write;
- mapping.ztell_file = (tell_file_func)tell;
---
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index fba27be45315..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://bugs.gentoo.org/840767
-https://github.com/assimp/assimp/issues/4438
-
-From 48cb5451383855755debfc17cb5e3428cba2d94e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 21 May 2022 17:37:04 +0200
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Drop two additional test wrt 5.2.3
-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,
-@@ -127,14 +120,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) {
-- const float angle(RandPI.next());
-- const auto axis = random_unit_vec3();
-- aiMatrix3x3::Rotation(angle, axis, result_cpp);
-- aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
- const auto axis = random_vec2();
- aiMatrix3x3::Translation(axis, result_cpp);
---- 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));
-@@ -228,14 +213,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) {
-- const float angle(RandPI.next());
-- const auto axis = random_unit_vec3();
-- aiMatrix4x4::Rotation(angle, axis, result_cpp);
-- aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
- const auto axis = random_vec3();
- aiMatrix4x4::Translation(axis, result_cpp);
---- 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
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-update-version.patch b/media-libs/assimp/files/assimp-5.2.4-update-version.patch
deleted file mode 100644
index cc70165bc2e0..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-update-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/assimp/assimp/issues/4655
-https://github.com/assimp/assimp/pull/4656
-
-From 304b0f61d7c9ef7e2e5ca2eed185b32a2951aa90 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 30 Jul 2022 09:39:12 +0200
-Subject: [PATCH] update version
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
- add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
-
--PROJECT(Assimp VERSION 5.2.0)
-+PROJECT(Assimp VERSION 5.2.4)
-
- # All supported options ###############################################
-
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
- }
-
- TEST_F( utVersion, aiGetVersionPatchTest ) {
-- EXPECT_EQ(aiGetVersionPatch(), 0U );
-+ EXPECT_EQ(aiGetVersionPatch(), 4U );
- }
-
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-02-07 19:14 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-15 8:20 [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-02-07 19:14 Andreas Sturmlechner
2022-10-12 16:23 Joonas Niilola
2022-06-24 6:39 Joonas Niilola
2022-06-03 12:34 Joonas Niilola
2022-03-12 17:37 Matthew Smith
2020-06-05 16:06 Andreas Sturmlechner
2019-08-22 3:36 Slawek Lis
2018-05-16 12:09 Andreas Sturmlechner
2017-07-24 6:30 Slawek Lis
2016-09-26 6:14 Slawek Lis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox