From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/
Date: Mon, 15 Jun 2020 08:20:00 +0000 (UTC) [thread overview]
Message-ID: <1592209183.b280e6df520753f9947f3937b2d23f275b34ca7f.asturm@gentoo> (raw)
commit: b280e6df520753f9947f3937b2d23f275b34ca7f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 23:06:00 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 08:19:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b280e6df
media-libs/assimp: Drop 4.0.1, 4.0.1-r1 and 4.1.0
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/assimp/Manifest | 2 -
media-libs/assimp/assimp-4.0.1-r1.ebuild | 68 ----------------------
media-libs/assimp/assimp-4.0.1.ebuild | 67 ---------------------
media-libs/assimp/assimp-4.1.0.ebuild | 67 ---------------------
.../assimp/files/assimp-4.0.1-disabletest.patch | 10 ----
.../assimp/files/assimp-4.0.1-qt-5.11.0.patch | 59 -------------------
.../assimp/files/assimp-4.1.0-disabletest.patch | 10 ----
.../assimp/files/assimp-4.1.0-findassimp.patch | 28 ---------
.../assimp/files/assimp-4.1.0-unzip-of.patch | 11 ----
media-libs/assimp/files/findassimp-3.3.1.patch | 25 --------
media-libs/assimp/metadata.xml | 1 -
11 files changed, 348 deletions(-)
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 4d35ba70884..a4842c4c29f 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,4 +1,2 @@
-DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
-DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
deleted file mode 100644
index 2454b233cb6..00000000000
--- a/media-libs/assimp/assimp-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/findassimp-3.3.1.patch"
- "${FILESDIR}/${P}-qt-5.11.0.patch"
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
- append-flags -fno-strict-aliasing
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
deleted file mode 100644
index 5ad3d5d6837..00000000000
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/findassimp-3.3.1.patch"
- "${FILESDIR}/${P}-qt-5.11.0.patch"
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
deleted file mode 100644
index f52e8180a88..00000000000
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=[minizip]
- samples? (
- media-libs/freeglut
- virtual/opengl
- x11-libs/libX11
- )
- tools? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/devil
- virtual/opengl
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-disabletest.patch" # bug 659122
- "${FILESDIR}/${P}-unzip-of.patch"
- "${FILESDIR}/${P}-findassimp.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DASSIMP_BUILD_SAMPLES=$(usex samples)
- -DASSIMP_BUILD_STATIC_LIB=$(usex static)
- -DASSIMP_BUILD_TESTS=$(usex test)
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
- -DCMAKE_DEBUG_POSTFIX=""
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /usr/share/cmake/Modules
- doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
- "${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
deleted file mode 100644
index 4afe5bbd26b..00000000000
--- a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
deleted file mode 100644
index ef5a5024939..00000000000
--- a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:45:25 +0200
-Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 42ef0fb3..9f1b68ca 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(assimp_qt_viewer)
-
- cmake_minimum_required(VERSION 2.6)
-
--find_package(Qt5Widgets REQUIRED)
-+find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED)
- find_package(DevIL REQUIRED)
- find_package(OpenGL REQUIRED)
-
-@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui)
- qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp)
-
- add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs})
--target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
-+target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
-
--qt5_use_modules(${PROJECT_NAME} Widgets OpenGL)
- if(WIN32) # Check if we are on Windows
- if(MSVC) # Check if we are using the Visual Studio compiler
- #set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
---
-2.17.0
-
-
-From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 May 2018 13:58:30 +0200
-Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target
-
----
- tools/assimp_qt_viewer/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
-index 9f1b68ca..b41291e3 100644
---- a/tools/assimp_qt_viewer/CMakeLists.txt
-+++ b/tools/assimp_qt_viewer/CMakeLists.txt
-@@ -42,3 +42,5 @@ else()
- endif()
-
- set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-+
-+install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}")
---
-2.17.0
-
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
deleted file mode 100644
index 4afe5bbd26b..00000000000
--- a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
-+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
-@@ -65,7 +65,3 @@
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
deleted file mode 100644
index 6056f4973c5..00000000000
--- a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200
-+++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200
-@@ -54,14 +54,17 @@
-
- find_path(
- assimp_INCLUDE_DIRS
-- NAMES postprocess.h scene.h version.h config.h cimport.h
-+ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
- PATHS /usr/local/include/
-+ PATHS /usr/include/
- )
-
- find_library(
- assimp_LIBRARIES
- NAMES assimp
- PATHS /usr/local/lib/
-+ PATHS /usr/lib/
-+ PATHS /usr/lib64/
- )
-
- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +81,4 @@
- endif (assimp_FIND_REQUIRED)
- endif (assimp_FOUND)
-
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
deleted file mode 100644
index e75b47a1af4..00000000000
--- a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200
-+++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200
-@@ -45,6 +45,8 @@
- #ifndef _unz_H
- #define _unz_H
-
-+#define OF _Z_OF
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/media-libs/assimp/files/findassimp-3.3.1.patch b/media-libs/assimp/files/findassimp-3.3.1.patch
deleted file mode 100644
index 0f36fafb015..00000000000
--- a/media-libs/assimp/files/findassimp-3.3.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmake-modules/Findassimp.cmake 2016-09-26 07:52:09.719727490 +0200
-+++ b/cmake-modules/Findassimp.cmake 2016-09-26 07:52:28.509727838 +0200
-@@ -55,13 +55,13 @@
- find_path(
- assimp_INCLUDE_DIRS
- NAMES postprocess.h scene.h version.h config.h cimport.h
-- PATHS /usr/local/include/
-+ PATHS /usr/include/
- )
-
- find_library(
- assimp_LIBRARIES
- NAMES assimp
-- PATHS /usr/local/lib/
-+ PATHS /usr/lib/
- )
-
- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +78,4 @@
- endif (assimp_FIND_REQUIRED)
- endif (assimp_FOUND)
-
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index a9d38618add..6eafc14b8fb 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -4,7 +4,6 @@
<!-- maintainer-needed -->
<use>
<flag name="samples">Build viewer library</flag>
- <flag name="tools">Build assimp tool binary</flag>
</use>
<upstream>
<remote-id type="sourceforge">assimp</remote-id>
next reply other threads:[~2020-06-15 8:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 8:20 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-07 19:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/ Andreas Sturmlechner
2022-10-12 16:23 Joonas Niilola
2022-06-24 6:39 Joonas Niilola
2022-06-03 12:34 Joonas Niilola
2022-03-12 17:37 Matthew Smith
2020-06-05 16:06 Andreas Sturmlechner
2019-08-22 3:36 Slawek Lis
2018-05-16 12:09 Andreas Sturmlechner
2017-07-24 6:30 Slawek Lis
2016-09-26 6:14 Slawek Lis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592209183.b280e6df520753f9947f3937b2d23f275b34ca7f.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox