summaryrefslogtreecommitdiff
path: root/dev-libs/libnest2d
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-08-12 18:08:24 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-08-12 18:08:24 +0100
commit8a60ccc0bb618fc402bc140a5cee6cf89addec51 (patch)
tree65afd2233c6a32062b2b52a4a901abf4f801c12d /dev-libs/libnest2d
parent78f20b3ec2b822f4add309f60998356f403cf879 (diff)
gentoo auto-resync : 12:08:2023 - 18:08:23
Diffstat (limited to 'dev-libs/libnest2d')
-rw-r--r--dev-libs/libnest2d/Manifest7
-rw-r--r--dev-libs/libnest2d/files/libnest2d-0.4-add-disallowed-areas.patch122
-rw-r--r--dev-libs/libnest2d/files/libnest2d-0.4-add-soversion-to-shared-library.patch21
-rw-r--r--dev-libs/libnest2d/files/libnest2d-0.4-fix-cpp-version.patch11
-rw-r--r--dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch25
-rw-r--r--dev-libs/libnest2d/libnest2d-0.4-r2.ebuild45
-rw-r--r--dev-libs/libnest2d/metadata.xml27
7 files changed, 0 insertions, 258 deletions
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
deleted file mode 100644
index fdf2b625022e..000000000000
--- a/dev-libs/libnest2d/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508
-AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c07059f4b2b9d58715a799395943560ebd7a738f585f43907bd21115e3f297fe6df7f0b3b1801c5b04d7e2e16eb09aff642a26edb5b35339dc2440eb9 SHA512 1d367a09a9f0ac51347c3a3dc440eb772b877abf00acd92a9ce166ecc4a9b537dbdbbab254c3b742c20b48fc5bee58b79811504921ec15a19700d8bcacee0d4b
-AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855
-AUX libnest2d-0.4-gnu-install-dirs.patch 812 BLAKE2B 98072c6fd6547ed138a23a8aa0d48df17d588b773d7ef16ac382da18fa1328c975c843d897829db4a1d043b4845a453ab86cd5d2d9686444422e651c996bee35 SHA512 4f0785271dd62d241ff38954daa77603121ae0f434fdd1644823caecdcc794202f11608527ed27f4d63815dc5ff435aefb98cbbbba79cdce6ed0ce2f2805fbb8
-DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
-EBUILD libnest2d-0.4-r2.ebuild 1071 BLAKE2B 0b2678368bd021ab5f0d7ebcff8e605b1c2f0d913c6f3e26962898e64d3763c6eab2d6821722270b0fc5516c13c447467ad1a67b5a84a6c9de9e96c132c9829d SHA512 f755562616e955699e38023a9f653bc0e4853b21f4b552722bc7126c6d70a01e37ddbe7a556d986d324373ad24e3a2b511a8300a6e98afe03e30bf859b7ed066
-MISC metadata.xml 1407 BLAKE2B d22e24bac0a2033517e4f4cf6709d9692e64d490c83b55bc600aae433d2c0f59b208cefe4e7400e4a2f7b328968c3fe5a0e0f3a1d0a9149cd3c868d97d31c94e SHA512 74046f0c81b509ce5b091b66c975afd87ec5c3982ca15febc4b0501170d820ea01d393bdd800b79b2ab6faf3d2d278f72dff079fefd26b1d7747514f0ca6adad
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 <rubend@tutanota.com>
-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 <rubend@tutanota.com>
-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 <rubend@tutanota.com>
-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 <karl.robert.nilsson@gmail.com>
-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>3dprint@gentoo.org</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>