[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: ca93c96c1a7de5cbc9cc059d847353b77285a937
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Apr 9 15:54:48 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Apr 9 15:54:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca93c96c
media-libs/assimp: Stabilize 5.3.1 x86, #928998
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.3.1.ebuild
b/media-libs/assimp/assimp-5.3.1.ebuild
index d2202f7cb9a6..ec60049bf3cc 100644
--- a/media-libs/assimp/assimp-5.3.1.ebuild
+++ b/media-libs/assimp/assimp-5.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: f36362f169ba0761916c5447a7a6d73f15768348
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Apr 9 15:54:49 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Apr 9 15:54:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36362f1
media-libs/assimp: Stabilize 5.3.1 arm64, #928998
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.3.1.ebuild
b/media-libs/assimp/assimp-5.3.1.ebuild
index ec60049bf3cc..8ec98ee568d2 100644
--- a/media-libs/assimp/assimp-5.3.1.ebuild
+++ b/media-libs/assimp/assimp-5.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 1a64c50cbc2398e511639f8223ab8036ac123906
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Apr 9 15:54:48 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Apr 9 15:54:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a64c50c
media-libs/assimp: Stabilize 5.3.1 amd64, #928998
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.3.1.ebuild
b/media-libs/assimp/assimp-5.3.1.ebuild
index a8ca3c576436..d2202f7cb9a6 100644
--- a/media-libs/assimp/assimp-5.3.1.ebuild
+++ b/media-libs/assimp/assimp-5.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 942c902c235251a5b5cd36e6b3cfd3ac537b
Author: Sam James gentoo org>
AuthorDate: Sat Jan 20 12:24:45 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 20 12:26:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942c902c
media-libs/assimp: forward ~loong
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.5-r2.ebuild | 4 ++--
media-libs/assimp/assimp-5.3.1.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r2.ebuild
b/media-libs/assimp/assimp-5.2.5-r2.ebuild
index d8f7abc1a02b..fc010b398f41 100644
--- a/media-libs/assimp/assimp-5.2.5-r2.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/assimp/assimp-5.3.1.ebuild
b/media-libs/assimp/assimp-5.3.1.ebuild
index 1fd76e9b1701..d651e223b3ee 100644
--- a/media-libs/assimp/assimp-5.3.1.ebuild
+++ b/media-libs/assimp/assimp-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 054f5ce87ab5e96a7224e2e396f897472d0d8f62
Author: Paul Zander gmail com>
AuthorDate: Fri Dec 15 16:50:01 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 20 12:26:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054f5ce8
media-libs/assimp: add 5.2.5-r2, add 5.3.1
Rework tests to make use of gtest via ctest.
Some tests generate random input data which might fail on fma-enabled CPUs due
to smaller rounding errors on fused operations, so we repeat those
tests until they succeed.
Closes: https://bugs.gentoo.org/908403
Closes: https://bugs.gentoo.org/910362
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34346
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-5.2.5-r2.ebuild | 94
media-libs/assimp/assimp-5.3.1.ebuild | 125 +
.../files/assimp-5.2.5-float-comparison.patch | 84 ++
media-libs/assimp/files/assimp-5.2.5-gtest.patch | 30 +
5 files changed, 334 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 34611184f6fc..cef7c0a6b33c 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1 +1,2 @@
DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B
77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8
SHA512
ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
+DIST assimp-5.3.1.tar.gz 52826870 BLAKE2B
1f3eac17deb6d19777f2a7cdf74e5be9d6df12a70e9b0449a90f3cc6f85b6d4170de2b870c028e2ad9c7f6ac7269daa0cbb3971dd1feb83a5b12a683ff8bb72f
SHA512
49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb
diff --git a/media-libs/assimp/assimp-5.2.5-r2.ebuild
b/media-libs/assimp/assimp-5.2.5-r2.ebuild
new file mode 100644
index ..d8f7abc1a02b
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.5-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 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/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="samples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sys-libs/zlib[minizip]
+ samples? (
+ media-libs/freeglut
+ media-libs/libglvnd
+ )
+ test? (
+ dev-cpp/gtest
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.2.5-gtest.patch"
+ "${FILESDIR}/${PN}-5.2.5-float-comparison.patch"
+)
+
+DOCS=( CodeConventions.md Readme.md )
+
+src_prepare() {
+ sed -r \
+ -e "s#PROJECT\(Assimp VERSION
[0-9]+\.[0-9]+\.[0-9]+\)#PROJECT(Assimp VERSION ${PV})#g" \
+ -i CMakeLists.txt || die
+ sed -r \
+ -e "s#EXPECT_EQ\(aiGetVersionPatch\(\), [0-9]+U
\);#EXPECT_EQ(aiGetVersionPatch(), $(ver_cut 3)U );#g" \
+ -e "s#EXPECT_NE\( aiGetVersionRevision#EXPECT_EQ\(
aiGetVersionRevision#g" \
+ -i test/unit/utVersion.cpp || die
+ sed \
+ -e "s# -O0 -g # #g" \
+ -i \
+ cmake-modules/Coveralls.cmake \
+ contrib/android-cmake/android.toolchain.cmake \
+ contrib/openddlparser/CMakeLists.txt \
+ CMakeLists.txt \
+ || die
+
+ 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
+ # bug #891787 (CVE-2022-45748), intentionally not in alphabetic
ordering
+ -DASSIMP_BUILD_COLLADA_IMPORTER=OFF
+ -DASSIMP_BUILD_COLLADA_EXPORTER=OFF
+ )
+
+ if use samples; then
+ mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # ( Failed )
+ "^utCollada.*"
+ "^utIssues.OpacityBugWhenExporting_727$"
+ )
+ myctestargs+=(
+ --repeat until-pass:100
+ )
+
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 1fd53016cde218913c2230b956901e18fab9 Author: Sam James gentoo org> AuthorDate: Sat Jan 20 12:25:05 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jan 20 12:26:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd53016 media-libs/assimp: fix DependencyMoved (doxygen) Signed-off-by: Sam James gentoo.org> media-libs/assimp/assimp-5.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/assimp/assimp-5.3.1.ebuild b/media-libs/assimp/assimp-5.3.1.ebuild index d651e223b3ee..a8ca3c576436 100644 --- a/media-libs/assimp/assimp-5.3.1.ebuild +++ b/media-libs/assimp/assimp-5.3.1.ebuild @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib[minizip] - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) samples? ( media-libs/freeglut media-libs/libglvnd
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 0eac0940380b728f55fc4f1689740cb300cbc28a
Author: WANG Xuerui gentoo org>
AuthorDate: Tue Jan 2 15:53:08 2024 +
Commit: WANG Xuerui gentoo org>
CommitDate: Tue Jan 2 15:53:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eac0940
media-libs/assimp: keyword 5.2.5-r1 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index cc7d65809df9..a40338c56f48 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ 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 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: c1f88d2ce853bfc1299b8fd951ed31323947f6e1
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 2 10:57:14 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 2 10:57:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f88d2c
media-libs/assimp: Keyword 5.2.5-r1 ppc64, #918896
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index 4ac599c7b89b..cc7d65809df9 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: ade3405e3707ee708f07d599d5e1a9a97eea8db9
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 2 10:57:07 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 2 10:57:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3405e
media-libs/assimp: Keyword 5.2.5-r1 ppc, #918896
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index ebedcd02928c..4ac599c7b89b 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: ce431172cf05980f2631ee625acb8597ed392876
Author: Bernd Waibel posteo net>
AuthorDate: Tue Feb 7 18:51:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 7 19:14:03 2023 +
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 posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29469
Signed-off-by: Andreas Sturmlechner 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..
--- 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..
--- 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
-Date: Fri, 11 Mar 2022 11:24:13 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel
a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
- aiMatrix4Scaling(_c, );
- 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(_c, , );
--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,
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: f7c49795a378342d782040af37a8b52171bbe499
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Feb 7 06:46:33 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Feb 7 06:46:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c49795
media-libs/assimp: Stabilize 5.2.5-r1 x86, #893354
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index 7758cda1ad30..ebedcd02928c 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 890b003caf094d928b13219208b1c5ef56f88e06
Author: Sam James gentoo org>
AuthorDate: Mon Feb 6 18:00:02 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 6 18:00:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890b003c
media-libs/assimp: Stabilize 5.2.5-r1 amd64, #893354
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index 83391bc9adf2..75895a7a8033 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 2014a6be01349b2639f40a349d3f33ec28b237d8
Author: Sam James gentoo org>
AuthorDate: Mon Feb 6 18:00:04 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 6 18:00:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2014a6be
media-libs/assimp: Stabilize 5.2.5-r1 arm64, #893354
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index 75895a7a8033..7758cda1ad30 100644
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: abea5e37fe1b382f5809945fef52c18306cea76c
Author: Bernd Waibel posteo net>
AuthorDate: Mon Jan 23 18:15:48 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Feb 5 09:12:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abea5e37
media-libs/assimp: don't build COLLADA module
Avoid a security issue when processing COLLADA files.
Don't build the module until fixed upstream.
Need to drop additional collada related tests as well.
Bug: https://github.com/assimp/assimp/issues/4286
Bug: https://bugs.gentoo.org/891787
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29231
Signed-off-by: Joonas Niilola gentoo.org>
...{assimp-5.2.5.ebuild => assimp-5.2.5-r1.ebuild} | 4
.../files/assimp-5.2.5-disable-collada-tests.patch | 28 ++
2 files changed, 32 insertions(+)
diff --git a/media-libs/assimp/assimp-5.2.5.ebuild
b/media-libs/assimp/assimp-5.2.5-r1.ebuild
similarity index 88%
rename from media-libs/assimp/assimp-5.2.5.ebuild
rename to media-libs/assimp/assimp-5.2.5-r1.ebuild
index d002d8d91eaf..83391bc9adf2 100644
--- a/media-libs/assimp/assimp-5.2.5.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-5.2.5-fix-version.patch
"${FILESDIR}"/${PN}-5.2.5-disable-failing-tests.patch
+ "${FILESDIR}"/${PN}-5.2.5-disable-collada-tests.patch
)
DOCS=( CodeConventions.md Readme.md )
@@ -55,6 +56,9 @@ src_configure() {
-DASSIMP_IGNORE_GIT_HASH=ON
-DASSIMP_UBSAN=OFF
-DASSIMP_WARNINGS_AS_ERRORS=OFF
+ # bug #891787, intentionally not in alphabetic ordering
+ -DASSIMP_BUILD_COLLADA_IMPORTER=OFF
+ -DASSIMP_BUILD_COLLADA_EXPORTER=OFF
)
if use samples; then
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
new file mode 100644
index ..971578f0016f
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
@@ -0,0 +1,28 @@
+From 3bd65679f7db2ec95abb22fef7a30a15dcc1c297 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Mon, 23 Jan 2023 19:54:23 +0100
+Subject: [PATCH] disable collada tests
+
+Signed-off-by: Bernd Waibel
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -63,7 +63,6 @@ SET( COMMON
+ unit/utSimd.cpp
+ unit/utIOSystem.cpp
+ unit/utIOStreamBuffer.cpp
+- unit/utIssues.cpp
+ unit/utAnim.cpp
+ unit/AssimpAPITest.cpp
+ unit/AssimpAPITest_aiMatrix3x3.cpp
+@@ -137,8 +136,6 @@ SET( IMPORTERS
+ unit/utBlendImportMaterials.cpp
+ unit/utBlenderWork.cpp
+ unit/utBVHImportExport.cpp
+- unit/utColladaExport.cpp
+- unit/utColladaImportExport.cpp
+ unit/utCSMImportExport.cpp
+ unit/utB3DImportExport.cpp
+ #unit/utM3DImportExport.cpp
+--
+2.39.1
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: eac45bbb9fdd3b54c4ddd3f9427feb9c672118e5
Author: Bernd Waibel posteo net>
AuthorDate: Sun Dec 25 08:56:48 2022 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Jan 9 07:01:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac45bbb
media-libs/assimp: disable failing tests
Closes: https://bugs.gentoo.org/879147
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28796
Signed-off-by: Viorel Munteanu gentoo.org>
media-libs/assimp/assimp-5.2.5.ebuild | 8 +-
.../files/assimp-5.2.5-disable-failing-tests.patch | 95 ++
...p-5.2.5-drop-failing-tests-for-abi_x86_32.patch | 143 +
3 files changed, 242 insertions(+), 4 deletions(-)
diff --git a/media-libs/assimp/assimp-5.2.5.ebuild
b/media-libs/assimp/assimp-5.2.5.ebuild
index 05540699b679..d002d8d91eaf 100644
--- a/media-libs/assimp/assimp-5.2.5.ebuild
+++ b/media-libs/assimp/assimp-5.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,15 +28,15 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
- "${FILESDIR}"/${P}-fix-version.patch
+ "${FILESDIR}"/${PN}-5.2.5-fix-version.patch
+ "${FILESDIR}"/${PN}-5.2.5-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
+ eapply
"${FILESDIR}"/${PN}-5.2.5-drop-failing-tests-for-abi_x86_32.patch
fi
cmake_src_prepare
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
b/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
new file mode 100644
index ..92936e6442eb
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
@@ -0,0 +1,95 @@
+From aaace4ca2e2d4f46b7dce0940af6e332563c5a21 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Sat, 24 Dec 2022 11:19:17 +0100
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel
+--- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
+@@ -127,25 +127,9 @@ 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(_c, , angle);
+-EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
+ const auto axis = random_vec2();
+ aiMatrix3x3::Translation(axis, result_cpp);
+ aiMatrix3Translation(_c, );
+ EXPECT_EQ(result_cpp, result_c);
+ }
+-
+-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromToTest) {
+-// Use predetermined vectors to prevent running into division by zero.
+-const auto from = aiVector3D(1,2,1).Normalize(), to =
aiVector3D(-1,1,1).Normalize();
+-aiMatrix3x3::FromToMatrix(from, to, result_cpp);
+-aiMatrix3FromTo(_c, , );
+-EXPECT_EQ(result_cpp, result_c);
+-}
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -228,14 +228,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(_c, , angle);
+-EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
+ const auto axis = random_vec3();
+ aiMatrix4x4::Translation(axis, result_cpp);
+@@ -249,11 +241,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
+ aiMatrix4Scaling(_c, );
+ 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(_c, , );
+-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);
+-
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: b9fe2da71ced3a4ec4bbe46b06d371981db99607
Author: Bernd Waibel posteo net>
AuthorDate: Sat Sep 17 14:12:15 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Oct 12 16:23:30 2022 +
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 posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27307
Signed-off-by: Joonas Niilola 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 ..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 ..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
+Date: Sat, 17 Sep 2022 15:15:58 +0200
+Subject: [PATCH] fix version
+
+Signed-off-by: Bernd Waibel
+--- 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
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 0f6ad3bf4896b47705f5b6af48e7a4234e0c59a1
Author: Bernd Waibel posteo net>
AuthorDate: Sun Sep 25 07:47:00 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Oct 10 13:04:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6ad3bf
media-libs/assimp: drop 5.2.4
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27439
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.4.ebuild | 66 ---
1 file changed, 66 deletions(-)
diff --git a/media-libs/assimp/assimp-5.2.4.ebuild
b/media-libs/assimp/assimp-5.2.4.ebuild
deleted file mode 100644
index 36b4ff88a3fd..
--- a/media-libs/assimp/assimp-5.2.4.ebuild
+++ /dev/null
@@ -1,66 +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
-)
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: deba0888441d2c8fc86d8f974141bf14a81be36c
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Sep 25 12:20:23 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Sep 25 12:20:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deba0888
media-libs/assimp: Stabilize 5.2.4-r1 arm64, #872635
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/assimp/assimp-5.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild
b/media-libs/assimp/assimp-5.2.4-r1.ebuild
index ab429167f11f..135d40e3ca95 100644
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.4-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: e84c784dd326e33d43ba7eb7f3cdfcbb2fb57da4
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Sep 25 06:21:44 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Sep 25 06:22:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e84c784d
media-libs/assimp: Stabilize 5.2.4-r1 x86, #872635
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild
b/media-libs/assimp/assimp-5.2.4-r1.ebuild
index a182f36e7b86..ab429167f11f 100644
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.4-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 9a2bdf9694f00d82099bb63d791f53dce792a1bd
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Sep 25 06:20:56 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Sep 25 06:22:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a2bdf96
media-libs/assimp: Stabilize 5.2.4-r1 amd64, #872635
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild
b/media-libs/assimp/assimp-5.2.4-r1.ebuild
index a6b0a428bfd5..a182f36e7b86 100644
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.4-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 586bd49181ad3b91291ac4d9bdd05f70b7dc2dce
Author: Bernd Waibel posteo net>
AuthorDate: Sun Jul 24 14:33:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 23 05:10:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586bd491
media-libs/assimp: fix version mismatch in pkg-config and cmake files
Closes: https://bugs.gentoo.org/859862
Bug: https://github.com/assimp/assimp/issues/4655
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26566
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.4-r1.ebuild | 67 ++
.../assimp/files/assimp-5.2.4-update-version.patch | 34 +++
2 files changed, 101 insertions(+)
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild
b/media-libs/assimp/assimp-5.2.4-r1.ebuild
new file mode 100644
index ..a6b0a428bfd5
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.4-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.4-update-version.patch
b/media-libs/assimp/files/assimp-5.2.4-update-version.patch
new file mode 100644
index ..cc70165bc2e0
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.4-update-version.patch
@@ -0,0 +1,34 @@
+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
+Date: Sat, 30 Jul 2022 09:39:12 +0200
+Subject: [PATCH] update version
+
+Signed-off-by: Bernd Waibel
+--- 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
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 765d034f0f642cdce37aa38be60defa5095ee065
Author: Bernd Waibel posteo net>
AuthorDate: Thu Jun 23 15:44:14 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Jun 24 06:39:03 2022 +
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 posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26058
Signed-off-by: Joonas Niilola 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
d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84ed2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863
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..
--- 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: f2a720a53a8112e0a88909948330efb1b9ffb22c
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Jun 22 16:13:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Jun 22 16:13:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a720a5
media-libs/assimp: Stabilize 5.2.4 arm64, #853673
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/assimp/assimp-5.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4.ebuild
b/media-libs/assimp/assimp-5.2.4.ebuild
index 8e0637124e05..36b4ff88a3fd 100644
--- a/media-libs/assimp/assimp-5.2.4.ebuild
+++ b/media-libs/assimp/assimp-5.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 831deaa15f9328e69ea12c246b63d801b583b9a3
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Jun 22 07:10:22 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jun 22 07:10:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831deaa1
media-libs/assimp: Stabilize 5.2.4 x86, #853673
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4.ebuild
b/media-libs/assimp/assimp-5.2.4.ebuild
index 6907f450b6e5..8e0637124e05 100644
--- a/media-libs/assimp/assimp-5.2.4.ebuild
+++ b/media-libs/assimp/assimp-5.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: bee0e01845972172992d3f13eb3c08e9e6a27f79
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Jun 22 06:52:09 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jun 22 07:01:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee0e018
media-libs/assimp: Stabilize 5.2.4 amd64, #853673
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/assimp-5.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.4.ebuild
b/media-libs/assimp/assimp-5.2.4.ebuild
index c89ba2b0796b..6907f450b6e5 100644
--- a/media-libs/assimp/assimp-5.2.4.ebuild
+++ b/media-libs/assimp/assimp-5.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 6a97131300269627ef811261f8c822130e433506
Author: Bernd Waibel posteo net>
AuthorDate: Sat May 21 14:44:52 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Jun 3 12:34:50 2022 +
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 posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25589
Signed-off-by: Joonas Niilola 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
d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84ed2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863
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 ..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 ..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
+Date: Sat, 21 May 2022 17:37:04 +0200
+Subject: [PATCH] drop failing tests for abi_x86_32
+
+Drop two
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 53b18c716a084458aef385357c686706370d2c7f
Author: Sam James gentoo org>
AuthorDate: Fri Apr 29 07:49:22 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 29 07:50:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b18c71
media-libs/assimp: fix patch
Package isn't multilib, so check 'use x86' instead of abi_x86_32
which is only provided w/ multilib eclasses.
Closes: https://bugs.gentoo.org/841554
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild
b/media-libs/assimp/assimp-5.2.3.ebuild
index 451858172fc2..d74e3f10d1f0 100644
--- a/media-libs/assimp/assimp-5.2.3.ebuild
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
DOCS=( CodeConventions.md Readme.md )
src_prepare() {
- if use abi_x86_32; then
+ if use x86 ; then
eapply
"${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
commit: 648c0c82276f7136d1cc466cc94610859eb9626e Author: Sam James gentoo org> AuthorDate: Fri Apr 29 02:22:18 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 29 02:22:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648c0c82 media-libs/assimp: add references to patchez Signed-off-by: Sam James gentoo.org> media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch | 3 +++ .../assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 3 +++ 2 files changed, 6 insertions(+) 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 index 708f45ee3503..736757693774 100644 --- 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 @@ -1,3 +1,6 @@ +https://bugs.gentoo.org/840616 +https://github.com/assimp/assimp/issues/4433 + From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001 From: Bernd Waibel Date: Mon, 25 Apr 2022 17:39:33 +0200 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 index 4c4ea0486a2f..1de4f661fa55 100644 --- 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 @@ -1,3 +1,6 @@ +https://bugs.gentoo.org/840767 +https://github.com/assimp/assimp/issues/4438 + From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001 From: Bernd Waibel Date: Thu, 28 Apr 2022 07:59:26 +0200
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 3c7abed13a49d96d90fdeda81bba828271cace87
Author: Bernd Waibel posteo net>
AuthorDate: Thu Apr 28 06:06:12 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 29 02:22:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7abed1
media-libs/assimp: build with gcc-12
Fix an -Werror=array-bounds issue with gcc-12, by patching out the
global -Werror flag used by upstream.
Drop failing tests for x86_32.
Closes: https://bugs.gentoo.org/840616
Closes: https://bugs.gentoo.org/840767
Bug: https://github.com/assimp/assimp/issues/4438
Bug: https://github.com/assimp/assimp/issues/4433
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25234
Signed-off-by: Sam James gentoo.org>
media-libs/assimp/assimp-5.2.3.ebuild | 9 ++
.../assimp-5.2.3-drop-Werror-gcc-option.patch | 22
...p-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 131 +
3 files changed, 162 insertions(+)
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild
b/media-libs/assimp/assimp-5.2.3.ebuild
index ba654ddd393f..451858172fc2 100644
--- a/media-libs/assimp/assimp-5.2.3.ebuild
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -32,11 +32,20 @@ BDEPEND="
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 abi_x86_32; then
+ eapply
"${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
+ fi
+
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DASSIMP_ASAN=OFF
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
new file mode 100644
index ..708f45ee3503
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
@@ -0,0 +1,22 @@
+From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+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
+--- 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
new file mode 100644
index ..4c4ea0486a2f
--- /dev/null
+++
b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
@@ -0,0 +1,131 @@
+From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Thu, 28 Apr 2022 07:59:26 +0200
+Subject: [PATCH] drop failing tests for abi_x86_32
+
+Signed-off-by: Bernd Waibel
+--- 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(_c, );
+-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(_c, , , );
+-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(_c));
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4,
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 019e110b41f1ceb4c416d21fce8841e4cde422aa
Author: Bernd Waibel posteo net>
AuthorDate: Sat Mar 26 08:38:00 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Mar 31 11:59:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019e110b
media-libs/assimp: bump to 5.2.3
Closes: https://bugs.gentoo.org/835990
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24756
Signed-off-by: Joonas Niilola gentoo.org>
media-libs/assimp/Manifest| 1 +
media-libs/assimp/assimp-5.2.3.ebuild | 61 +++
2 files changed, 62 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 9f05fa49dd0f..c8a058fd549a 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,3 +1,4 @@
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
d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84ed2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863
SHA512
accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B
06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84
SHA512
f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild
b/media-libs/assimp/assimp-5.2.3.ebuild
new file mode 100644
index ..ba654ddd393f
--- /dev/null
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -0,0 +1,61 @@
+# 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}"/${PN}-5.2.2-disable-failing-tests.patch
+)
+
+DOCS=( CodeConventions.md Readme.md )
+
+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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: dfc1407a8cd49a9fb131126b7c8a9c8b17642b30
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Mar 21 09:17:34 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Mar 21 09:17:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc1407a
media-libs/assimp: Stabilize 5.2.2 arm64, #835089
Signed-off-by: Jakov Smolić gentoo.org>
media-libs/assimp/assimp-5.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild
b/media-libs/assimp/assimp-5.2.2.ebuild
index c3332c860a4d..b6c80ce8206b 100644
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 63a9e8506301c995f59e7effc1626ddee20431e3
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 21 07:46:35 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 21 07:47:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a9e850
media-libs/assimp: amd64 stable wrt bug #835089
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/assimp/assimp-5.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild
b/media-libs/assimp/assimp-5.2.2.ebuild
index d2628095f7fb..c3332c860a4d 100644
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ b/media-libs/assimp/assimp-5.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
IUSE="samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 2e40531368c0cf5ae2d8326fdab7e5a5e67db438
Author: Bernd Waibel posteo net>
AuthorDate: Fri Mar 11 11:55:51 2022 +
Commit: Matthew Smith gentoo org>
CommitDate: Sat Mar 12 17:30:30 2022 +
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 posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24485
Signed-off-by: Matthew Smith 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 ..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 ..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
+Date: Fri, 11 Mar 2022 11:24:13 +0100
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
+ aiMatrix4Scaling(_c, );
+ EXPECT_EQ(result_cpp, result_c);
+ }
+-
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
+-// Use predetermined vectors to prevent running into division by zero.
+-const auto
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 62145341bf37a46cab8df7617f1b9e72858a60a3
Author: Alex Fan yahoo com>
AuthorDate: Thu Jul 22 12:56:24 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Sat Jul 24 23:41:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62145341
media-libs/assimp: keyword 5.0.1 for ~riscv
Signed-off-by: Alex Fan yahoo.com>
Signed-off-by: Yixun Lan gentoo.org>
media-libs/assimp/assimp-5.0.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild
b/media-libs/assimp/assimp-5.0.1.ebuild
index 95aa293ace4..f7cbcb00f30 100644
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ doc? (
https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: b280e6df520753f9947f3937b2d23f275b34ca7f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 14 23:06:00 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 08:19:43 2020 +
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 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..000
--- 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..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: dea6e3476a6b6cb2e34d2fed168c9a964e0b1dd1
Author: Sam James (sam_c) cmpct info>
AuthorDate: Mon Jun 8 14:18:39 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Tue Jun 9 04:22:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea6e347
media-libs/assimp: arm64 stable (bug #727234)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) cmpct.info>
Signed-off-by: Mart Raudsepp gentoo.org>
media-libs/assimp/assimp-5.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild
b/media-libs/assimp/assimp-5.0.1.ebuild
index 2fc3fe6944d..95aa293ace4 100644
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -12,7 +12,7 @@ doc? (
https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 972e89365f2d1c31ed766710535e3893ea6ff2e7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Jun 6 17:38:35 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Jun 6 17:38:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972e8936
media-libs/assimp: x86 stable wrt bug #727234
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/assimp/assimp-5.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild
b/media-libs/assimp/assimp-5.0.1.ebuild
index 99e0b4a304a..2fc3fe6944d 100644
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -12,7 +12,7 @@ doc? (
https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 37e5900a30685f9a23d443d294b7a9b0908e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Jun 6 17:27:15 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Jun 6 17:27:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e5900a
media-libs/assimp: amd64 stable wrt bug #727234
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/assimp/assimp-5.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild
b/media-libs/assimp/assimp-5.0.1.ebuild
index cb827e7ac42..99e0b4a304a 100644
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -12,7 +12,7 @@ doc? (
https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="doc samples test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 5cc674352064a5cada27f14b2c98ba9b5f7a1261
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jun 5 16:05:57 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jun 5 16:06:13 2020 +
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 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 000..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+richard...@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
+ #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 000..1b1efa02742
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: d1f8e9478afbf1691f686c29912ea2a22def1794
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jun 5 12:48:04 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jun 5 12:48:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f8e947
media-libs/assimp: Drop 5.0.0
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/assimp/Manifest| 1 -
media-libs/assimp/assimp-5.0.0.ebuild | 67 ---
2 files changed, 68 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 90527fbe192..4d35ba70884 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,5 +1,4 @@
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.0.tar.gz 46604597 BLAKE2B
850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1
SHA512
0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
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-5.0.0.ebuild
b/media-libs/assimp/assimp-5.0.0.ebuild
deleted file mode 100644
index f52e8180a88..000
--- a/media-libs/assimp/assimp-5.0.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
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 6110fc259680b841e7c2a7d6a168b7666d6d90bf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jun 5 12:21:45 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jun 5 12:48:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6110fc25
media-libs/assimp: 5.0.1 version bump, switch to cmake.eclass, EAPI-7
- Add IUSE="doc"
- Drop IUSE="tools" as Qt5 based viewer was removed upstream
commit 13586eb0739146dc609fa83bcd71fee1bb66f4b7
- GNUInstallDirs++
patch from commit cbf94fd62ff831879d10f99aa7766d391ae8a9b7
Thanks-to: Victor Mataré fh-aachen.de>
Closes: https://bugs.gentoo.org/701912
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/assimp/Manifest | 2 +
media-libs/assimp/assimp-5.0.1.ebuild | 62 ++
.../assimp/files/assimp-5.0.1-GNUInstallDirs.patch | 239 +
3 files changed, 303 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 31741ac4ef0..90527fbe192 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,3 +1,5 @@
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.0.tar.gz 46604597 BLAKE2B
850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1
SHA512
0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
+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-5.0.1.ebuild
b/media-libs/assimp/assimp-5.0.1.ebuild
new file mode 100644
index 000..96281b1fd32
--- /dev/null
+++ b/media-libs/assimp/assimp-5.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 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 ~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
+)
+
+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/files/assimp-5.0.1-GNUInstallDirs.patch
b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
new file mode 100644
index 000..134edc7d7da
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
@@ -0,0 +1,239 @@
+From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Victor=20Matar=C3=A9?=
+Date: Tue, 31 Mar 2020 21:30:07 +0200
+Subject: [PATCH] use
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: c810ec81e9914983315a9df0a296a4955e4811c8 Author: Aaron Bauman gentoo org> AuthorDate: Sun Nov 24 16:13:43 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Nov 24 16:13:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c810ec81 media-libs/assimp: fix QA warnings about tests Signed-off-by: Aaron Bauman gentoo.org> media-libs/assimp/assimp-4.0.1-r1.ebuild | 1 + media-libs/assimp/assimp-4.0.1.ebuild| 1 + media-libs/assimp/assimp-4.1.0.ebuild| 1 + media-libs/assimp/assimp-5.0.0.ebuild| 1 + 4 files changed, 4 insertions(+) diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild index 0e4e53c3572..2454b233cb6 100644 --- a/media-libs/assimp/assimp-4.0.1-r1.ebuild +++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild index 954e9f5f3a0..5ad3d5d6837 100644 --- a/media-libs/assimp/assimp-4.0.1.ebuild +++ b/media-libs/assimp/assimp-4.0.1.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="amd64 ~arm arm64 x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild index 00b042528bb..f52e8180a88 100644 --- a/media-libs/assimp/assimp-4.1.0.ebuild +++ b/media-libs/assimp/assimp-4.1.0.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.0.ebuild index 00b042528bb..f52e8180a88 100644 --- a/media-libs/assimp/assimp-5.0.0.ebuild +++ b/media-libs/assimp/assimp-5.0.0.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:=
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8
Author: Slawomir Lis gentoo org>
AuthorDate: Mon Nov 18 10:49:05 2019 +
Commit: Slawek Lis gentoo org>
CommitDate: Mon Nov 18 10:49:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3c7dcb
media-libs/assimp: version bump to 5.0.0
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Slawek Lis gentoo.org>
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-5.0.0.ebuild | 66 ++
.../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
5 files changed, 119 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 76d568f91e9..31741ac4ef0 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,2 +1,3 @@
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.0.tar.gz 46604597 BLAKE2B
850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1
SHA512
0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
diff --git a/media-libs/assimp/assimp-5.0.0.ebuild
b/media-libs/assimp/assimp-5.0.0.ebuild
new file mode 100644
index 000..00b042528bb
--- /dev/null
+++ b/media-libs/assimp/assimp-5.0.0.ebuild
@@ -0,0 +1,66 @@
+# 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"
+ "${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-5.0.0-disabletest.patch
b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
new file mode 100644
index 000..d5343c11366
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000..6056f4973c5
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
@@ -0,0 +1,28 @@
+--- 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
commit: 9584c3e2852c1210d01dea97854b1f335ce579df Author: Slawomir Lis gentoo org> AuthorDate: Thu Oct 10 19:11:06 2019 + Commit: Slawek Lis gentoo org> CommitDate: Thu Oct 10 19:13:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9584c3e2 media-libs/assimp: cmake findassimp patch corrected NAMES As reported in bug: https://bugs.gentoo.org/696914 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Slawek Lis gentoo.org> media-libs/assimp/files/assimp-4.1.0-findassimp.patch | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch index c2a32307746..6056f4973c5 100644 --- a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch +++ b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch @@ -1,8 +1,11 @@ --- 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 -@@ -56,12 +56,15 @@ +@@ -54,14 +54,17 @@ + + find_path( assimp_INCLUDE_DIRS - NAMES postprocess.h scene.h version.h config.h cimport.h +-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/ )
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: db332b8ddc3792f8177601f1c6c9040876862f37
Author: Slawomir Lis gentoo org>
AuthorDate: Tue Oct 8 06:23:39 2019 +
Commit: Slawek Lis gentoo org>
CommitDate: Wed Oct 9 05:43:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db332b8d
media-libs/assimp: Patched findassimp cmake script
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Slawek Lis gentoo.org>
media-libs/assimp/assimp-4.1.0.ebuild | 1 +
.../assimp/files/assimp-4.1.0-findassimp.patch | 25 ++
2 files changed, 26 insertions(+)
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild
b/media-libs/assimp/assimp-4.1.0.ebuild
index 05020030504..00b042528bb 100644
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-disabletest.patch" # bug 659122
"${FILESDIR}/${P}-unzip-of.patch"
+ "${FILESDIR}/${P}-findassimp.patch"
)
src_configure() {
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
new file mode 100644
index 000..c2a32307746
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
@@ -0,0 +1,25 @@
+--- 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
+@@ -56,12 +56,15 @@
+ 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/
++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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: ffb6a46687b3a16ca1f9ebdb0fcd9e04bf910c4e
Author: Slawomir Lis gentoo org>
AuthorDate: Thu Aug 22 03:36:22 2019 +
Commit: Slawek Lis gentoo org>
CommitDate: Thu Aug 22 03:36:42 2019 +
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 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 000..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 000..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.0 +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 000..e75b47a1af4
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
@@ -0,0 +1,11 @@
+--- a/contrib/unzip/unzip.h2019-08-21 21:38:10.991542891 +0200
b/contrib/unzip/unzip.h2019-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
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: ebd7fc118c9f57434fb1fe19bf6e70db3f86f13e
Author: Slawomir Lis gentoo org>
AuthorDate: Wed Aug 21 19:03:14 2019 +
Commit: Slawek Lis gentoo org>
CommitDate: Wed Aug 21 19:03:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd7fc11
media-libs/assimp: Strict aliasing error fix
Closes: https://bugs.gentoo.org/677392
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Slawek Lis gentoo.org>
media-libs/assimp/assimp-4.0.1-r1.ebuild | 67
1 file changed, 67 insertions(+)
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild
b/media-libs/assimp/assimp-4.0.1-r1.ebuild
new file mode 100644
index 000..0e4e53c3572
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# 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"
+
+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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 7bf97178eba827b7b8257a6e47d4236d9a2f32e2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 12 21:02:26 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 15 02:30:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf97178
media-libs/assimp: Drop old
Closes: https://bugs.gentoo.org/571896
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/assimp/Manifest| 4 --
media-libs/assimp/assimp-3.0.1270.ebuild | 35 -
media-libs/assimp/assimp-3.1.1.ebuild | 38 ---
media-libs/assimp/assimp-3.2-r2.ebuild| 44 --
media-libs/assimp/assimp-3.2-r3.ebuild| 54 ---
media-libs/assimp/assimp-3.3.1.ebuild | 50 -
media-libs/assimp/files/findassimp.patch | 18 -
media-libs/assimp/files/test-cmakelists.patch | 35 -
media-libs/assimp/metadata.xml| 1 -
9 files changed, 279 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 1b8f5764121..6e8afcaf3dc 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,5 +1 @@
-DIST assimp--3.0.1270-source-only.zip 4042147 BLAKE2B
1a96a958304d8cdb635f00bb20629aa959d6b158e6d86a465c913cb86e8bf9bbb29d7619c0de685b67483dd1ec12561f1bce63e3cbd6594d99617c3697287145
SHA512
0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820
-DIST assimp-3.1.1.zip 32869052 BLAKE2B
877b1a00a8e35eafb85c0f1b1c364c025a98c629da1797961f71df92ee0508b66606aca2b3f69d4da25ec6edef105776d8c4ef83335f3aa3cff1af5232be6745
SHA512
c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527
-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.1.tar.gz 44625148 BLAKE2B
50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e
SHA512
260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild
b/media-libs/assimp/assimp-3.0.1270.ebuild
deleted file mode 100644
index 37368a1bb93..000
--- a/media-libs/assimp/assimp-3.0.1270.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="http://assimp.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${PN}--${PV}-source-only.zip"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost samples static tools"
-SLOT="0"
-
-DEPEND="
- boost? ( dev-libs/boost )
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}--${PV}-source-only
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build samples ASSIMP_SAMPLES) \
- $(cmake-utils_use_build tools ASSIMP_TOOLS) \
- $(cmake-utils_use_build static STATIC_LIB) \
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND)
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/assimp/assimp-3.1.1.ebuild
b/media-libs/assimp/assimp-3.1.1.ebuild
deleted file mode 100644
index b3850b085c7..000
--- a/media-libs/assimp/assimp-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="http://assimp.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+boost samples static tools"
-SLOT="0"
-
-DEPEND="
- boost? ( dev-libs/boost )
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's/ASSIMP_LIB_INSTALL_DIR "lib"/ASSIMP_LIB_INSTALL_DIR
${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 0ddcaf2d74bc1fb270237d52f49561761f9c56cf
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Sep 12 20:33:31 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Sep 12 20:33:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddcaf2d
media-libs/assimp: x86 stable (bug #652334)
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/assimp/assimp-4.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild
b/media-libs/assimp/assimp-4.0.1.ebuild
index 8bd32676885..4bdb7525726 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
IUSE="samples static test tools"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 07ba3535d053f2fbc1ca367a03457e8943089231
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 25 23:59:37 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 26 00:00:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ba3535
media-libs/assimp: Disable pointless test
Closes: https://bugs.gentoo.org/659122
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-libs/assimp/assimp-4.0.1.ebuild | 1 +
media-libs/assimp/files/assimp-4.0.1-disabletest.patch | 10 ++
2 files changed, 11 insertions(+)
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild
b/media-libs/assimp/assimp-4.0.1.ebuild
index c3bb59596e5..8bd32676885 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findassimp-3.3.1.patch"
"${FILESDIR}/${P}-qt-5.11.0.patch"
+ "${FILESDIR}/${P}-disabletest.patch" # bug 659122
)
src_configure() {
diff --git a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
new file mode 100644
index 000..4afe5bbd26b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
@@ -0,0 +1,10 @@
+--- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.0 +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 );
+-}
+-
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: fd8b8f9282143fe365f80d95c2b1b7ba866e2a61
Author: Jason Zaman gentoo org>
AuthorDate: Sun Jun 24 14:42:45 2018 +
Commit: Jason Zaman gentoo org>
CommitDate: Sun Jun 24 14:45:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8b8f92
media-libs/assimp: amd64 stable
Gentoo-bug: 652334
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/assimp/assimp-4.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild
b/media-libs/assimp/assimp-4.0.1.ebuild
index 89da03baf09..c3bb59596e5 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="samples static test tools"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 052be5a30b67d819681461903aa0d992f65777e4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 16 12:07:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 16 12:09:22 2018 +
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
ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6ad767450b01e0b8b7f0f36ba62
+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 000..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 000..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
+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)
+
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
commit: 02d2520b61e0c7d054020e6cbe63264bc8d2f5f9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 16 11:11:21 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 16 12:09:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d2520b
media-libs/assimp: QA: Drop duplicate patch
media-libs/assimp/assimp-4.0.0.ebuild | 2 +-
media-libs/assimp/files/findassimp-4.0.0.patch | 25 -
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild
b/media-libs/assimp/assimp-4.0.0.ebuild
index e051dd165ea..2518909a9b2 100644
--- a/media-libs/assimp/assimp-4.0.0.ebuild
+++ b/media-libs/assimp/assimp-4.0.0.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
-PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" )
+PATCHES=( "${FILESDIR}/findassimp-3.3.1.patch" )
src_configure() {
local mycmakeargs=(
diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch
b/media-libs/assimp/files/findassimp-4.0.0.patch
deleted file mode 100644
index 2fbaa73a850..000
--- a/media-libs/assimp/files/findassimp-4.0.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 968596aa38ac282d6f40a6c4b713c7b64dadc9f4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 16 12:08:58 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 16 12:09:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968596aa
media-libs/assimp: Drop 4.0.0
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-libs/assimp/Manifest| 1 -
media-libs/assimp/assimp-4.0.0.ebuild | 50 ---
2 files changed, 51 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index d324fb5ca93..1b8f5764121 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,5 +2,4 @@ DIST assimp--3.0.1270-source-only.zip 4042147 BLAKE2B
1a96a958304d8cdb635f00bb20
DIST assimp-3.1.1.zip 32869052 BLAKE2B
877b1a00a8e35eafb85c0f1b1c364c025a98c629da1797961f71df92ee0508b66606aca2b3f69d4da25ec6edef105776d8c4ef83335f3aa3cff1af5232be6745
SHA512
c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527
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
ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6ad767450b01e0b8b7f0f36ba62
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B
50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e
SHA512
260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild
b/media-libs/assimp/assimp-4.0.0.ebuild
deleted file mode 100644
index 2518909a9b2..000
--- a/media-libs/assimp/assimp-4.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 )
-"
-
-PATCHES=( "${FILESDIR}/findassimp-3.3.1.patch" )
-
-src_configure() {
- local 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
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: bf499ff6e315e46b3557d460a8f656525e8cfc85
Author: Slawomir Lis gentoo org>
AuthorDate: Mon Jul 24 06:31:56 2017 +
Commit: Slawek Lis gentoo org>
CommitDate: Mon Jul 24 06:30:44 2017 +
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
1a1cb97356a63f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
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
ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6ad767450b01e0b8b7f0f36ba62
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 000..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 000..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
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
commit: 4053dbec8127eec2d8062731f08a020ffd0c5661
Author: Slawomir Lis gentoo org>
AuthorDate: Mon Sep 26 06:06:28 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Mon Sep 26 06:06:28 2016 +
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 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 ..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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 4c2d33ae9fbac8fae78be754ea329981051b395d
Author: Slawomir Lis gentoo org>
AuthorDate: Mon Sep 19 05:45:53 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Mon Sep 19 05:46:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2d33ae
media-libs/assimp: version bump to 3.3.1
Reported in bug 594124. Removes boost use flag, drops findassimp.patch
Reported-by: Robin Kauffman creosotehill.org>
Package-Manager: portage-2.3.0
media-libs/assimp/Manifest| 1 +
media-libs/assimp/assimp-3.3.1.ebuild | 49 +++
2 files changed, 50 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 1d283e7..32ab005 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,3 +1,4 @@
DIST assimp--3.0.1270-source-only.zip 4042147 SHA256
ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423 SHA512
0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820
WHIRLPOOL
9f32ea8b3c54ca7efd4a1c57300571bedb7f527bf630aa7203636c297acc53e6fbebf482069e76e833a1eb6317fa313c3d78ad4e6a68db4dd82a466b136f8d38
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
1a1cb97356a63f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
+DIST assimp-3.3.1.tar.gz 36428380 SHA256
d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf SHA512
660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a
WHIRLPOOL
9aba3cc73641ae130c0d3522b32c1bd5afd16eb9b599c1dff8cc1bcb71952b109420eeb7bc3474fc21bbedf79ed58e14743983d6bee01c4e3e5305d447bb9316
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild
b/media-libs/assimp/assimp-3.3.1.ebuild
new file mode 100644
index ..02d5f95
--- /dev/null
+++ b/media-libs/assimp/assimp-3.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
commit: 9d10ad93c12eb3aff648c7eefd3363a15b9bc622 Author: Slawomir Lis gentoo org> AuthorDate: Tue Sep 6 07:04:18 2016 + Commit: Slawek Lis gentoo org> CommitDate: Tue Sep 6 07:04:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d10ad93 media-libs/assimp: included forgotten patch file Package-Manager: portage-2.3.0 media-libs/assimp/files/findassimp.patch | 18 ++ 1 file changed, 18 insertions(+) diff --git a/media-libs/assimp/files/findassimp.patch b/media-libs/assimp/files/findassimp.patch new file mode 100644 index ..1b62e73 --- /dev/null +++ b/media-libs/assimp/files/findassimp.patch @@ -0,0 +1,18 @@ +--- cmake-modules/Findassimp.cmake.old 2016-09-06 08:26:35.107697600 +0200 cmake-modules/Findassimp.cmake 2016-09-06 08:29:25.337696582 +0200 +@@ -1,13 +1,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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: f8601c9036718d6d4722694c8d36b97bd417d8d0
Author: Slawomir Lis gentoo org>
AuthorDate: Tue Sep 6 07:02:34 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Tue Sep 6 07:02:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8601c90
media-libs/assimp: install Findassimp cmake module
As reported in bug 592892 there is need to install Findassimp.cmake
file in target system
Reported-by: Grygoriy I. Fuchedzhy gmail.com>
Package-Manager: portage-2.3.0
media-libs/assimp/assimp-3.2-r3.ebuild | 55 ++
1 file changed, 55 insertions(+)
diff --git a/media-libs/assimp/assimp-3.2-r3.ebuild
b/media-libs/assimp/assimp-3.2-r3.ebuild
new file mode 100644
index ..69d5b6a
--- /dev/null
+++ b/media-libs/assimp/assimp-3.2-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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="+boost samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ boost? ( dev-libs/boost )
+ samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/test-cmakelists.patch"
+ epatch "${FILESDIR}/findassimp.patch"
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_build samples ASSIMP_SAMPLES) \
+ $(cmake-utils_use_build tools ASSIMP_TOOLS) \
+ $(cmake-utils_use_build static STATIC_LIB) \
+ $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \
+ $(cmake-utils_use_build test TESTS)
+ -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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
commit: 55c795d64b852717182f07668a5c5e8f370c0352
Author: Slawomir Lis gentoo org>
AuthorDate: Thu Jan 21 19:50:37 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Thu Jan 21 19:50:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c795d6
added assimp test patch
Package-Manager: portage-2.2.26
media-libs/assimp/files/test-cmakelists.patch | 35 +++
1 file changed, 35 insertions(+)
diff --git a/media-libs/assimp/files/test-cmakelists.patch
b/media-libs/assimp/files/test-cmakelists.patch
new file mode 100644
index 000..9a3471b
--- /dev/null
+++ b/media-libs/assimp/files/test-cmakelists.patch
@@ -0,0 +1,35 @@
+--- test/CMakeLists.txt.old2016-01-21 06:46:12.053363212 +0100
test/CMakeLists.txt2016-01-21 06:46:51.126697143 +0100
+@@ -1,7 +1,5 @@
+ cmake_minimum_required( VERSION 2.6 )
+
+-INCLUDE( AddGTest )
+-
+ INCLUDE_DIRECTORIES(
+ ${Assimp_SOURCE_DIR}/include
+ ${Assimp_SOURCE_DIR}/code
+@@ -47,7 +45,7 @@
+
+ SOURCE_GROUP( tests FILES ${TEST_SRCS} )
+
+-if(AddGTest_FOUND)
++if(BUILD_TESTS)
+ add_executable( unit
+ unit/CCompilerTest.c
+ unit/Main.cpp
+@@ -56,13 +54,12 @@
+ )
+
+ add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models")
++target_link_libraries( unit gtest )
+
+ SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
+
+ add_dependencies( unit gtest )
+ target_link_libraries( unit assimp
+- debug ${GTEST_DEBUG_LIBRARIES}
+- optimized ${GTEST_RELEASE_LIBRARIES}
+ )
+-endif(AddGTest_FOUND)
++endif(BUILD_TESTS)
+ add_subdirectory(headercheck)
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 53efe0f5116074b19f63a1a4fabe405a95e56b7d
Author: Slawomir Lis gentoo org>
AuthorDate: Thu Jan 21 07:01:49 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Thu Jan 21 07:02:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53efe0f5
Fixed tests (#571896)
Package-Manager: portage-2.2.26
.../{assimp-3.2-r1.ebuild => assimp-3.2-r2.ebuild}| 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/media-libs/assimp/assimp-3.2-r1.ebuild
b/media-libs/assimp/assimp-3.2-r2.ebuild
similarity index 72%
rename from media-libs/assimp/assimp-3.2-r1.ebuild
rename to media-libs/assimp/assimp-3.2-r2.ebuild
index 74d7856..22f1038 100644
--- a/media-libs/assimp/assimp-3.2-r1.ebuild
+++ b/media-libs/assimp/assimp-3.2-r2.ebuild
@@ -12,25 +12,36 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+boost samples static tools"
+IUSE="+boost samples static test tools"
SLOT="0"
-DEPEND="
+RDEPEND="
boost? ( dev-libs/boost )
samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
sys-libs/zlib
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/test-cmakelists.patch"
+}
src_configure() {
mycmakeargs=(
$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
$(cmake-utils_use_build tools ASSIMP_TOOLS) \
$(cmake-utils_use_build static STATIC_LIB) \
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND)
+ $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \
+ $(cmake-utils_use_build test TESTS)
-DCMAKE_DEBUG_POSTFIX=""
-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
)
cmake-utils_src_configure
}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: ed191afb8247d48cd4e6ad655ec0d759cbc775ba
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 19 13:47:17 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 19 13:48:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed191afb
media-libs/assimp: set proper ASSIMP_LIB_INSTALL_DIR to fix multilib-strict
failures.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
media-libs/assimp/assimp-3.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-3.2.ebuild
b/media-libs/assimp/assimp-3.2.ebuild
index 246188b..74d7856 100644
--- a/media-libs/assimp/assimp-3.2.ebuild
+++ b/media-libs/assimp/assimp-3.2.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils versionator
+inherit cmake-utils versionator multilib
DESCRIPTION="Importer library to import assets from 3D files"
HOMEPAGE="https://github.com/assimp/assimp;
@@ -29,6 +29,7 @@ src_configure() {
$(cmake-utils_use_build static STATIC_LIB) \
$(cmake-utils_use_enable !boost BOOST_WORKAROUND)
-DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
)
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: f11f48048a90f7fdb752f5a4e03d5b5b4764d752
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 19 13:23:52 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 19 13:48:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11f4804
media-libs/assimp: set CMAKE_DEBUG_POSTFIX to "" so that assimp-config.cmake
does not tell us to link against non existant libassimpd. Bug #571904.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
media-libs/assimp/assimp-3.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-3.2.ebuild
b/media-libs/assimp/assimp-3.2.ebuild
index b0b5989..246188b 100644
--- a/media-libs/assimp/assimp-3.2.ebuild
+++ b/media-libs/assimp/assimp-3.2.ebuild
@@ -28,7 +28,8 @@ src_configure() {
$(cmake-utils_use_build tools ASSIMP_TOOLS) \
$(cmake-utils_use_build static STATIC_LIB) \
$(cmake-utils_use_enable !boost BOOST_WORKAROUND)
+ -DCMAKE_DEBUG_POSTFIX=""
)
cmake-utils_src_configure
-}
\ No newline at end of file
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 0b8cf1fc334b404bee50bb2905891007ad6d4e69
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 19 13:48:08 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 19 13:48:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8cf1fc
media-libs/assimp: rev bump to propagate previous fixes
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier gentoo.org>
media-libs/assimp/{assimp-3.2.ebuild => assimp-3.2-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/assimp/assimp-3.2.ebuild
b/media-libs/assimp/assimp-3.2-r1.ebuild
similarity index 100%
rename from media-libs/assimp/assimp-3.2.ebuild
rename to media-libs/assimp/assimp-3.2-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 6e499cb2b51f1fb70481075abdba5bbe438d50f6
Author: Slawomir Lis gentoo org>
AuthorDate: Wed Jan 13 06:38:44 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Wed Jan 13 06:40:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e499cb2
version bump (#571352)
Package-Manager: portage-2.2.26
media-libs/assimp/Manifest | 1 +
media-libs/assimp/assimp-3.2.ebuild | 34 ++
2 files changed, 35 insertions(+)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 521b94e..1d283e7 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,2 +1,3 @@
DIST assimp--3.0.1270-source-only.zip 4042147 SHA256
ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423 SHA512
0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820
WHIRLPOOL
9f32ea8b3c54ca7efd4a1c57300571bedb7f527bf630aa7203636c297acc53e6fbebf482069e76e833a1eb6317fa313c3d78ad4e6a68db4dd82a466b136f8d38
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
1a1cb97356a63f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
diff --git a/media-libs/assimp/assimp-3.2.ebuild
b/media-libs/assimp/assimp-3.2.ebuild
new file mode 100644
index 000..b0b5989
--- /dev/null
+++ b/media-libs/assimp/assimp-3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils versionator
+
+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="+boost samples static tools"
+SLOT="0"
+
+DEPEND="
+ boost? ( dev-libs/boost )
+ samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_build samples ASSIMP_SAMPLES) \
+ $(cmake-utils_use_build tools ASSIMP_TOOLS) \
+ $(cmake-utils_use_build static STATIC_LIB) \
+ $(cmake-utils_use_enable !boost BOOST_WORKAROUND)
+ )
+
+ cmake-utils_src_configure
+}
\ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/
commit: 98c27f1a4120c6b4e2218bef305adef2b920ac0f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Sep 19 14:51:50 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Sep 19 14:51:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c27f1a
media-libs/assimp: amd64 stable wrt bug #559888
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
media-libs/assimp/assimp-3.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/assimp/assimp-3.1.1.ebuild
b/media-libs/assimp/assimp-3.1.1.ebuild
index f1b0c87..005324f 100644
--- a/media-libs/assimp/assimp-3.1.1.ebuild
+++ b/media-libs/assimp/assimp-3.1.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://assimp.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="+boost samples static tools"
SLOT="0"
