commit: 5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8 Author: Slawomir Lis <slis <AT> gentoo <DOT> org> AuthorDate: Mon Nov 18 10:49:05 2019 +0000 Commit: Slawek Lis <slis <AT> gentoo <DOT> org> CommitDate: Mon Nov 18 10:49:35 2019 +0000 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 <slis <AT> 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 00000000000..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 00000000000..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 00000000000..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 +- NAMES postprocess.h scene.h version.h config.h cimport.h ++ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h + PATHS /usr/local/include/ ++ PATHS /usr/include/ + ) + + find_library( + assimp_LIBRARIES + NAMES assimp + PATHS /usr/local/lib/ ++ PATHS /usr/lib/ ++ PATHS /usr/lib64/ + ) + + if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) +@@ -78,4 +81,4 @@ + endif (assimp_FIND_REQUIRED) + endif (assimp_FOUND) + +-endif(WIN32) +\ Brak znaku nowej linii na końcu pliku ++endif(WIN32) diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch new file mode 100644 index 00000000000..e75b47a1af4 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch @@ -0,0 +1,11 @@ +--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200 ++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200 +@@ -45,6 +45,8 @@ + #ifndef _unz_H + #define _unz_H + ++#define OF _Z_OF ++ + #ifdef __cplusplus + extern "C" { + #endif
