commit: 8951197d550208913f5837bca60239da9e4f75fd Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sat Aug 12 12:25:24 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Aug 12 12:42:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8951197d
dev-libs/libnest2d: treeclean Closes: https://bugs.gentoo.org/864867 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-libs/libnest2d/Manifest | 1 - .../files/libnest2d-0.4-add-disallowed-areas.patch | 122 --------------------- ...est2d-0.4-add-soversion-to-shared-library.patch | 21 ---- .../files/libnest2d-0.4-fix-cpp-version.patch | 11 -- .../files/libnest2d-0.4-gnu-install-dirs.patch | 25 ----- dev-libs/libnest2d/libnest2d-0.4-r2.ebuild | 45 -------- dev-libs/libnest2d/metadata.xml | 27 ----- profiles/package.mask | 1 - 8 files changed, 253 deletions(-) diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest deleted file mode 100644 index c11b486d54e2..000000000000 --- a/dev-libs/libnest2d/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-add-disallowed-areas.patch b/dev-libs/libnest2d/files/libnest2d-0.4-add-disallowed-areas.patch deleted file mode 100644 index ed48cd3eeff8..000000000000 --- a/dev-libs/libnest2d/files/libnest2d-0.4-add-disallowed-areas.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 2e91be2679b5efa0773292d9d0a2ae72255bb271 Mon Sep 17 00:00:00 2001 -From: Ghostkeeper <[email protected]> -Date: Tue, 6 Oct 2020 16:13:15 +0200 -Subject: [PATCH 1/3] Allow for an item to be a disallowed area - -Disallowed areas have slightly different behaviour from fixed items: Other items won't get packed closely around them. Implementation of that pending. - -Contributes to issue CURA-7754. ---- - include/libnest2d/nester.hpp | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/libnest2d/nester.hpp b/include/libnest2d/nester.hpp -index 2f207d5..932a060 100644 ---- a/include/libnest2d/nester.hpp -+++ b/include/libnest2d/nester.hpp -@@ -71,6 +71,15 @@ class _Item { - int binid_{BIN_ID_UNSET}, priority_{0}; - bool fixed_{false}; - -+ /** -+ * \brief If this is a fixed area, indicates whether it is a disallowed area -+ * or a previously placed item. -+ * -+ * If this is a disallowed area, other objects will not get packed close -+ * together with this item. It only blocks other items in its area. -+ */ -+ bool disallowed_{false}; -+ - public: - - /// The type of the shape which was handed over as the template argument. -@@ -129,11 +138,18 @@ class _Item { - sh_(sl::create<RawShape>(std::move(contour), std::move(holes))) {} - - inline bool isFixed() const noexcept { return fixed_; } -+ inline bool isDisallowedArea() const noexcept { return disallowed_; } - inline void markAsFixedInBin(int binid) - { - fixed_ = binid >= 0; - binid_ = binid; - } -+ inline void markAsDisallowedAreaInBin(int binid) -+ { -+ fixed_ = binid >= 0; -+ binid_ = binid; -+ disallowed_ = true; -+ } - - inline void binId(int idx) { binid_ = idx; } - inline int binId() const noexcept { return binid_; } - -From ff61049e59d3151462bca7ff2e2268c2b32731e7 Mon Sep 17 00:00:00 2001 -From: Ghostkeeper <[email protected]> -Date: Tue, 6 Oct 2020 16:14:36 +0200 -Subject: [PATCH 2/3] Allow unsetting of being a disallowed area - -If you set the bin to -1 or set the item to be a simple fixed item afterwards, it'll no longer be a disallowed area. - -Contributes to issue CURA-7754. ---- - include/libnest2d/nester.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/libnest2d/nester.hpp b/include/libnest2d/nester.hpp -index 932a060..54761a6 100644 ---- a/include/libnest2d/nester.hpp -+++ b/include/libnest2d/nester.hpp -@@ -143,12 +143,13 @@ class _Item { - { - fixed_ = binid >= 0; - binid_ = binid; -+ disallowed_ = false; - } - inline void markAsDisallowedAreaInBin(int binid) - { - fixed_ = binid >= 0; - binid_ = binid; -- disallowed_ = true; -+ disallowed_ = fixed_; - } - - inline void binId(int idx) { binid_ = idx; } - -From 31391fd173249ad9b906390058e13b09238fadc8 Mon Sep 17 00:00:00 2001 -From: Ghostkeeper <[email protected]> -Date: Thu, 8 Oct 2020 11:06:58 +0200 -Subject: [PATCH 3/3] Align items to their starting position if all placed - items are disallowed - -We shouldn't align items to disallowed areas. So place them in the starting position according to the alignment property. - -Lot of work to investigate. But very little code changes! - -Contributes to issue CURA-7754. ---- - include/libnest2d/placers/nfpplacer.hpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/include/libnest2d/placers/nfpplacer.hpp b/include/libnest2d/placers/nfpplacer.hpp -index 96a8cff..b0ebb15 100644 ---- a/include/libnest2d/placers/nfpplacer.hpp -+++ b/include/libnest2d/placers/nfpplacer.hpp -@@ -101,7 +101,7 @@ struct NfpPConfig { - * alignment with the candidate item or do anything else. - * - * \param remaining A container with the remaining items waiting to be -- * placed. You can use some features about the remaining items to alter to -+ * placed. You can use some features about the remaining items to alter the - * score of the current placement. If you know that you have to leave place - * for other items as well, that might influence your decision about where - * the current candidate should be placed. E.g. imagine three big circles -@@ -735,7 +735,8 @@ class _NofitPolyPlacer: public PlacerBoilerplate<_NofitPolyPlacer<RawShape, TBin - remlist.insert(remlist.end(), remaining.from, remaining.to); - } - -- if(items_.empty()) { -+ if(std::all_of(items_.begin(), items_.end(), -+ [](const Item& item) { return item.isDisallowedArea(); })) { - setInitialPosition(item); - best_overfit = overfit(item.transformedShape(), bin_); - can_pack = best_overfit <= 0; diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch b/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch deleted file mode 100644 index 456f543207a9..000000000000 --- a/dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 12b64796aee24d5af41df3a10c4313dc713c3e74 Mon Sep 17 00:00:00 2001 -From: Karl Nilsson <[email protected]> -Date: Wed, 13 Jan 2021 21:51:34 -0500 -Subject: [PATCH] CMake: add SOVERSION to shared library - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 374e90f..c2f2bec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -95,6 +95,7 @@ if(NOT LIBNEST2D_HEADER_ONLY) - add_library(${LIBNAME} ${PROJECT_SOURCE_DIR}/src/libnest2d.cpp) - set_target_properties(${LIBNAME} PROPERTIES PREFIX "") - set_target_properties(${LIBNAME} PROPERTIES DEBUG_POSTFIX "d") -+ set_target_properties(${LIBNAME} PROPERTIES SOVERSION "1.0") - target_link_libraries(${LIBNAME} PUBLIC libnest2d_headeronly) - target_compile_definitions(${LIBNAME} PUBLIC LIBNEST2D_STATIC) - target_sources(${LIBNAME} PRIVATE ${LIBNEST2D_SRCFILES}) diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch b/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch deleted file mode 100644 index 4032618fb538..000000000000 --- a/dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - - project(Libnest2D) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED) - - # Add our own cmake module path. diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch deleted file mode 100644 index 34484426f302..000000000000 --- a/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -114,6 +114,7 @@ - endif() - - include(CMakePackageConfigHelpers) -+include(GNUInstallDirs) - - write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}ConfigVersion.cmake" -@@ -123,10 +124,10 @@ - - install(TARGETS libnest2d libnest2d_headeronly ${LIBNAME} - EXPORT ${PROJECT_NAME}Targets -- RUNTIME DESTINATION bin -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -- INCLUDES DESTINATION include) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - export(EXPORT ${PROJECT_NAME}Targets - FILE "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}Targets.cmake" diff --git a/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild deleted file mode 100644 index a70f129172c3..000000000000 --- a/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Library and framework for the 2D bin packaging problem" -HOMEPAGE="https://github.com/tamasmeszaros/libnest2d"; -SRC_URI="https://github.com/tamasmeszaros/libnest2d/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/1" -KEYWORDS="amd64 ~arm64 ~x86" - -IUSE="examples static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/clipper - sci-libs/nlopt - " -DEPEND="${RDEPEND} - test? ( >=dev-cpp/catch-2.9.1 ) - " - -PATCHES=( - "${FILESDIR}"/${P}-add-disallowed-areas.patch - "${FILESDIR}"/${P}-add-soversion-to-shared-library.patch - "${FILESDIR}"/${P}-fix-cpp-version.patch - "${FILESDIR}"/${P}-gnu-install-dirs.patch - ) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DLIBNEST2D_BUILD_EXAMPLES=$(usex examples) - -DLIBNEST2D_HEADER_ONLY=$(usex static-libs OFF ON) - -DLIBNEST2D_BUILD_UNITTESTS=$(usex test) - -DCMAKE_INSTALL_LIBDIR=$(get_libdir) - ) - cmake_src_configure -} diff --git a/dev-libs/libnest2d/metadata.xml b/dev-libs/libnest2d/metadata.xml deleted file mode 100644 index 7d6dba84de93..000000000000 --- a/dev-libs/libnest2d/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo 3D Printer Project</name> - </maintainer> - <slots> - <subslots>soname major version number</subslots> - </slots> - <longdescription> - Libnest2D is a library and framework for the 2D bin packaging problem. Inspired from the SVGNest Javascript - library the project is built from scratch in C++11. The library is written with a policy that it should be - usable out of the box with a very simple interface but has to be customizable to the very core as well. The - algorithms are defined in a header only fashion with templated geometry types. These geometries can have custom - or already existing implementation to avoid copying or having unnecessary dependencies. - - A default backend is provided if the user of the library just wants to use it out of the box without additional - integration. This backend is reasonably fast and robust, being built on top of boost geometry and the - polyclipping library. Usage of this default backend implies the dependency on these packages but its header only - as well. - </longdescription> - <upstream> - <bugs-to>https://github.com/tamasmeszaros/libnest2d/issues</bugs-to> - <remote-id type="github">tamasmeszaros/libnest2d</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 9387e03e2428..5d689be1b767 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -488,7 +488,6 @@ acct-user/ultimaker dev-libs/libarcus dev-libs/clipper dev-libs/libcharon -dev-libs/libnest2d # Sam James <[email protected]> (2023-05-03) # Broken pkgconfig file, please upgrade to -r1.
