From 7e662ec84fc13cef513542e4030f47017d030187 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 12 Oct 2022 19:40:50 +0100
Subject: gentoo auto-resync : 12:10:2022 - 19:40:50

---
 media-libs/assimp/Manifest                         |  3 +
 media-libs/assimp/assimp-5.2.5.ebuild              | 69 ++++++++++++++++++++++
 .../assimp/files/assimp-5.2.5-fix-version.patch    | 33 +++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 media-libs/assimp/assimp-5.2.5.ebuild
 create mode 100644 media-libs/assimp/files/assimp-5.2.5-fix-version.patch

(limited to 'media-libs/assimp')

diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 59dc4e953049..cc168e13eba2 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,6 +2,9 @@ AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493
 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
 AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
 AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a
+AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
 DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
+DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
 EBUILD assimp-5.2.4-r1.ebuild 1372 BLAKE2B d8b3b36c33040a4db2bf2e1496a4fc1fec68be1cb8bf6e39db36753da297c88d5d1ac6d638697bfe8ad0a526c4bf8aa275eec28b8b03d16499dd952e766f3780 SHA512 8a6880e26604ed4c74818ad15140b44346dfc5b0983a7c410d33fd78ab1380448ae36292266f7c54e5bf635aaf4fa284f63fb9b677571d74c9d76e9efabee727
+EBUILD assimp-5.2.5.ebuild 1381 BLAKE2B 70658fea19baf22d33cd90994a39e41c9b71a6d513a1ff42707aef440fc32439a96eb5c46f7cb90e09b9a0e01035f33d3d213190de9f52fee7152debcd15fe2f SHA512 31c3ca0330a1f7404e1ca3d5abb8b198a379ed9a21fda7b3d2d17faa0c049274f4582ea948bd73bbc2687f68f43f913e9ab9975ac4d1844ccac94e37f386769d
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
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
+
-- 
cgit v1.2.3