diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-22 03:03:01 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-22 03:03:01 +0000 |
commit | c7a7ec40cf928d8fc6a8241aa208272c008c7b4d (patch) | |
tree | 72e31c496e32182b70cfe385fbf03517b43bdddb /media-gfx | |
parent | 9db1279f804d62da2c61cfb39fc2e62b9faf56dd (diff) |
gentoo auto-resync : 22:11:2024 - 03:03:01
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 38353 -> 38343 bytes | |||
-rw-r--r-- | media-gfx/mscgen/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/mscgen/mscgen-0.20.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/potrace/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/potrace/potrace-1.16.ebuild | 39 | ||||
-rw-r--r-- | media-gfx/prusaslicer/Manifest | 12 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch | 16 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch | 189 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch | 19 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch | 11 | ||||
-rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch | 25 | ||||
-rw-r--r-- | media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild | 108 | ||||
-rw-r--r-- | media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild (renamed from media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild) | 6 | ||||
-rw-r--r-- | media-gfx/prusaslicer/prusaslicer-9999.ebuild | 6 |
14 files changed, 25 insertions, 411 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 90ddd1008ff6..2994d50c1b65 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest index 89d658c6e18a..7f89ee647319 100644 --- a/media-gfx/mscgen/Manifest +++ b/media-gfx/mscgen/Manifest @@ -1,3 +1,3 @@ DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3 -EBUILD mscgen-0.20.ebuild 942 BLAKE2B 0e4f0395418820e8e6d14c6dc8918b7d1136a24f08ed7a72456b07ee069aa05befa854c61bd831118c44087b28274afd154a1b67f624d3949b8f544fbd239b45 SHA512 3c09ca19b8a91b73208c690b78480e70561372e613a954632278acee105fa52c8f39f93f35512cd48883f80c94e04b85ff5f9c4efbbbd700874191a66b56a8ca +EBUILD mscgen-0.20.ebuild 941 BLAKE2B 6e07ca66a0fa03033b66f6ef0c15a78fb9e020d7fdd0afe5c37536b0494ea5d7af60dbec523e2ffb53c15c3c437eade81a02f8f4400072a66c149bfa9edf28a2 SHA512 ebe0ad158f221eb5b59826fa7bfa7cb9c13a21ba4f380470ca7760dcdba1f576eb023801a06f9ed10b778e567d7b29c30946f435ecb78049475b528c9afd6bf7 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild index f39af35db010..270ea307937e 100644 --- a/media-gfx/mscgen/mscgen-0.20.ebuild +++ b/media-gfx/mscgen/mscgen-0.20.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Message sequence chart generator" HOMEPAGE="https://www.mcternan.me.uk/mscgen/" SRC_URI="https://www.mcternan.me.uk/${PN}/software/${PN}-src-${PV}.tar.gz" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~x64-solaris" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-solaris" LICENSE="GPL-2+" SLOT="0" diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest index 00ca5a15f417..40db85b81be4 100644 --- a/media-gfx/potrace/Manifest +++ b/media-gfx/potrace/Manifest @@ -1,5 +1,4 @@ AUX potrace-1.16-lto.patch 919 BLAKE2B e109311b319197deb0a5b6dc133c9a42f001823cfa3b387beae96289de107f54e34b2b6448bd144cba930bfe00569d4a66e9009ec5521a19c62cb5356664ef9d SHA512 3987506225bbb31badb36aa8b7cff399103e762583eb066709f5083dacfb1a48190115ba12aaec91775c4a3ab401e33ee7bf1285b4ce2d8ffb462f57910988a4 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9 EBUILD potrace-1.16-r1.ebuild 946 BLAKE2B b9b8b32f72061c20b7380f20d4f777386565fe2c85f805b84e53a29dcf1a43754b0c9c250cae03b48bee0d7ae02cf25e7a1f2601990315531742ccd15f84e730 SHA512 817004c30f6b1114a6bfef1ca1549e5b61fa886a26ba816d0a1a2097c95e18134bdf481d48065cbb9e78622c6fdc023cfb7846b711dc01ec1f1c1910a5c6aa37 -EBUILD potrace-1.16.ebuild 861 BLAKE2B 3f601f3c5fa60237df087a1598a33cec3e862993d930edacb77fe08e8eb72696f3912e8912968d65db9f357271e129963bc5d69fa47ab5eb2a9b43509bacb0d2 SHA512 7f20420344f6b96baad210cb28a7325ab8e6a472c21f509562c445320f81144dbcc465ff94ceb8e0b1f328077048d119384d0728e3b904d6e9e84611b4c4fefb MISC metadata.xml 410 BLAKE2B 600ab550a0c7fed79d5b6dff4cb1857e410f7e350ca6717cbccc826486dcba7040a9b84b04695af64b7cff426598a58c2935cacdf958b36c78224c23d0ac6ae1 SHA512 fcb52aa25ca9d56d93412db81d6826b71c35102d1643c3576e4938111292106cabfde73143b552c2799e6f337f94e84d3318d1240bfabcdbfbd4dd48e37eb476 diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild deleted file mode 100644 index 796436aa52f3..000000000000 --- a/media-gfx/potrace/potrace-1.16.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Transforming bitmaps into vector graphics" -HOMEPAGE="https://potrace.sourceforge.net/" -SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="metric" - -RDEPEND="sys-libs/zlib:=" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - tc-export CC # bug 610098 - local myeconfargs=( - --disable-static - --enable-zlib - --with-libpotrace - $(use_enable metric a4) - $(use_enable metric) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 48de8db0bd75..f1a7655ddf48 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,16 +1,12 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 -AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0 -AUX prusaslicer-2.8.0-cgal-6.0.patch 11085 BLAKE2B 459d6862ab6dceab56beaba58b15d91b398a16b7a8e2a25f0ed2e3f9a699f52d1408027501f4e29903ae50ef52a07555a63de370022de9bd4444e107c6c0df1f SHA512 b2339ab275600126a72a9eb60b805d72dc5101e140cfb31e713413ea2d3d96a5533ac058672d9c10df347ddd001597ec0af375b3eb429ad0f83e18386870497f -AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2 AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885 -AUX prusaslicer-2.8.1-fixed-linking.patch 1220 BLAKE2B ef23b03e3fef11d7d1080a140af1085be748b5c0009084acd77f3596c8dffddbad0c612b6a0a2c0da12b130f325cf2798c3e7f41d99b75fd22c093b3e0747912 SHA512 9bdbbb76163549612157976e3770aae7c3b4644b4f9c29c17ca1420a9f7269e30db6556c5c0b06cb7475d6202346b69d21908e0847a7953fa6687ae58d8b0c8b +AUX prusaslicer-2.8.1-fix-libsoup-double-linking.patch 482 BLAKE2B 0b4f0ba5808ac3292609bcc9a503dce4fedbd6c7979ee4c8bc08d300ba248bae0a917e15a032b6ebc1b6ddc3fb372e09a6896b6aef4816a420839ade9a6bdd06 SHA512 9c657eab393d5552c1f37b57b564a38f69758a29f166471360fa93207c6c6b3eeed50a6471019a371db8f3f04dc419d9e035fca952a96a73d699f034eca32799 +AUX prusaslicer-2.8.1-fixed-linking.patch 394 BLAKE2B bb4d6285ee9e199f4d8bed3ecf0a4e0ac814f311a5220958e8a6023a343954bc78454697704ce9ee8bc583a9a536cec249f42b8b3d28fff6515e2499c4de3442 SHA512 b84c966d22be5fda04c8a97421026855289038d69de11ac1a9b053381a35b2e5d3f3354ac51d37ad58f0ba4fec177894de67ef44360b050b9ca61cb06d5a178c AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22 AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49 -DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 -EBUILD prusaslicer-2.8.0-r1.ebuild 2448 BLAKE2B 500db712e5ea5911c11a50c757ac52cf1ac03675e97b365fd6089fe5ca483becd6ad1c8648ddd50ea1e2c29b6e47f06d7d907968a338f0b090128f5803bf6128 SHA512 95dd1d9d6e5cb6a97af18f1dd9b2bcbd2b23cbd69f402fe1893c2834c4388fb8655b0f711f5fada72b884feb8a85f616b8db151bc2340e3b8ee2818cb6e57520 -EBUILD prusaslicer-2.8.1.ebuild 2709 BLAKE2B 1cbd4b4b29f90d5e55896b822709be947ab7e35df6dd3f0b665f91bb019c77959ceec2f55c29a8fa6ead154c3cef34c0a7afe8ff241e19595949f8d8578cf2d7 SHA512 5865b247db012439ebabe09abaa9d62efbcf39f71ae55592f38b5440dd9f451861d79684d58ee809a796a966917fba51231a6885eb7e29ec83ed329c48db99af -EBUILD prusaslicer-9999.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4 +EBUILD prusaslicer-2.8.1-r1.ebuild 2708 BLAKE2B 895f155bc49426f137807be45a3f2942d6255090cecc15657896e21f6fdb4ebc1c144ef474f69ae9487306b36cb83860dcebb09cef73e825e658206933b5d0cc SHA512 cf473a7b8978acffae92d579272ee69717b59e849a052422f0aaf66b6b82357ef85536025d8e6e1c32fada8e907be1ecb81ed19a16e14ade1b6fab132c636b3c +EBUILD prusaslicer-9999.ebuild 2709 BLAKE2B 720b5d4954e1fa45cc5ca5feaa7f3b71f537cec1e6cb03002ae93676fc8989149fa7e47555fcc83b73f52fb6bd6cee406bdc8b77badfe686b5be7607c9c8789d SHA512 fe5979e54dac63f5ae449207444f3f55780793acbbc2ba3235142802fe5e051c8c94a03b44a0c92b590d29b5c471094fcfa3937aded6088a6f1301c27dd5af9f MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch deleted file mode 100644 index 296c0366e34a..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/occt_wrapper/CMakeLists.txt -+++ b/src/occt_wrapper/CMakeLists.txt -@@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper) - find_package(OpenCASCADE REQUIRED) - - set(OCCT_LIBS -- TKXDESTEP -- TKSTEP -- TKSTEP209 -- TKSTEPAttr -- TKSTEPBase -+ TKDESTEP -+ TKDESTL - TKXCAF - TKXSBase - TKVCAF diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch deleted file mode 100644 index 52013146b1c3..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch +++ /dev/null @@ -1,189 +0,0 @@ -From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau <laurent.rineau@cgal.org> -Date: Sat, 13 Jul 2024 01:19:21 +0200 -Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) - ---- a/src/libslic3r/CutSurface.cpp -+++ b/src/libslic3r/CutSurface.cpp -@@ -4,6 +4,14 @@ - ///|/ - #include "CutSurface.hpp" - -+template <typename T> -+auto access_pmap(std::optional<T> opt) -> T { -+ return opt.value(); -+} -+ -+template <typename Pair> -+auto access_pmap(Pair pair) { return pair.first; } -+ - /// models_input.obj - Check transormation of model to each others - /// projection_center.obj - circle representing center of projection with correct distance - /// {M} .. model index -@@ -33,6 +41,7 @@ using namespace Slic3r; - #include <CGAL/Exact_integer.h> - #include <CGAL/Surface_mesh.h> - #include <CGAL/Cartesian_converter.h> -+#include <CGAL/AABB_traits.h> - #include <tbb/parallel_for.h> - - // libslic3r -@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons &shapes, - if (shapes.empty()) return {}; - - CutMesh result; -- EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first; -- FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first; -+ EdgeShapeMap edge_shape_map = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name))); -+ FaceShapeMap face_shape_map = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name))); - - std::vector<VI> indices; - auto insert_contour = [&projection, &indices, &result, -@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, - const ExPolygonsIndices &s2i) - { - // pointer to edge or face shape_map -- VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first; -+ VertexShapeMap vert_shape_map = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr))); - - // detect anomalities in visitor. - bool is_valid = true; - // NOTE: map are created when convert shapes to cgal model -- const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first; -- const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first; -+ const EdgeShapeMap& edge_shape_map = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name))); -+ const FaceShapeMap& face_shape_map = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name))); - Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid}; - - // a property map containing the constrained-or-not status of each edge -- EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first; -+ EdgeBoolMap ecm = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false))); - const auto &p = CGAL::parameters::visitor(visitor) - .edge_is_constrained_map(ecm) - .throw_on_self_intersection(false); -@@ -1427,7 +1436,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, - - if (!is_valid) return {}; - -- FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first; -+ FaceTypeMap face_type_map = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained))); - - // Select inside and outside face in model - set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i); -@@ -1563,8 +1572,8 @@ void priv::collect_surface_data(std::queue<FI> &process, - - void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh) - { -- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; -- const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first; -+ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); -+ const EdgeBoolMap &ecm = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name))); - - // check if vertex was made by edge_2 which is diagonal of quad - auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool { -@@ -1749,10 +1758,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches, - for (const SurfacePatch &patch : patches) { - // map is created during intersection by corefine visitor - const VertexShapeMap &vert_shape_map = -- models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; -+ access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name))); - uint32_t patch_index = &patch - &patches.front(); - // map is created during patch creation / dividing -- const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first; -+ const CvtVI2VI& cvt = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); - // for each point on outline - for (const Loop &loop : patch.loops) - for (const VI &vi_patch : loop) { -@@ -2640,7 +2649,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, - /* const */ CutMesh &mesh, - const ReductionMap *rmap) - { -- auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first; -+ auto is_counted = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted"))); - uint32_t count_vertices = 0; - if (rmap == nullptr) { - for (FI fi : fis) -@@ -2670,7 +2679,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, - cm.reserve(count_vertices, count_edges, count_faces); - - // vertex conversion function from mesh VI to result VI -- CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first; -+ CvtVI2VI mesh2result = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result"))); - - if (rmap == nullptr) { - for (FI fi : fis) { -@@ -2722,7 +2731,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, - assert(count_edges >= cm.edges().size()); - - // convert VI from this patch to source VI, when exist -- CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first; -+ CvtVI2VI cvt = access_pmap((cm.add_property_map<VI, VI>(patch_source_name))); - // vi_s .. VertexIndex into mesh (source) - // vi_d .. new VertexIndex in cm (destination) - for (VI vi_s : mesh.vertices()) { -@@ -2913,7 +2922,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch, - uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model) - { - // map is created during intersection by corefine visitor -- const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; -+ const VertexShapeMap &vert_shape_map = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name))); - // for each half edge of outline - for (HI hi : cut.second) { - VI vi = model.source(hi); -@@ -2938,7 +2947,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis, - patch_new.model_id = patch.model_id; - patch_new.shape_id = patch.shape_id; - // fix cvt -- CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first; -+ CvtVI2VI cvt = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name))); - for (VI &vi : cvt) { - if (!vi.is_valid()) continue; - vi = cvt_from[vi]; -@@ -2956,9 +2965,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches) - CutMesh& cm = patch.mesh; - assert(!cm.faces().empty()); - std::string patch_number_name = "f:patch_number"; -- CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first; -+ CutMesh::Property_map<FI,bool> is_processed = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false))); - -- const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first; -+ const CvtVI2VI& cvt_from = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); - - std::vector<FI> fis; - fis.reserve(cm.faces().size()); -@@ -3059,7 +3068,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, - CutAOIs &model_cuts = cuts[model_index]; - CutMesh &cut_model_ = cut_models[model_index]; - const CutMesh &cut_model = cut_model_; -- ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first; -+ ReductionMap vertex_reduction_map = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name))); - create_reduce_map(vertex_reduction_map, cut_model); - - for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) { -@@ -3145,7 +3154,7 @@ bool priv::is_over_whole_expoly(const CutAOI &cutAOI, - const CutMesh &mesh) - { - // NonInterupted contour is without other point and contain all from shape -- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; -+ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); - for (HI hi : cutAOI.second) { - const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)]; - const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)]; -@@ -3682,7 +3691,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st - } - - CutMesh &mesh_ = const_cast<CutMesh &>(mesh); -- auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first; -+ auto face_colors = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color"))); - for (FI fi : mesh.faces()) { - auto &color = face_colors[fi]; - switch (face_type_map[fi]) { -@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s - std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off"; - - CutMesh &mesh_ = const_cast<CutMesh &>(mesh); -- auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first; -+ auto vertex_colors = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color"))); - // initialize to gray color - for (VI vi: mesh.vertices()) - vertex_colors[vi] = CGAL::Color{127, 127, 127}; diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch deleted file mode 100644 index 33ab6256d6b0..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES - ) - - find_package(NanoSVG REQUIRED) -+find_package(OpenSSL REQUIRED) - - if (APPLE) - list(APPEND SLIC3R_GUI_SOURCES -@@ -404,7 +405,7 @@ endforeach() - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch new file mode 100644 index 000000000000..dbb0aa36727a --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch @@ -0,0 +1,11 @@ +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -465,7 +465,7 @@ if (UNIX AND NOT APPLE) + find_package(GTK${SLIC3R_GTK} REQUIRED) + find_package(PkgConfig REQUIRED) + +- pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.0 webkit2gtk-4.1) ++ pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.1) + target_link_libraries(libslic3r_gui PUBLIC ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig PkgConfig::WEBKIT2GTK) + endif () + diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch index b7fc95554591..9d387a07993d 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch @@ -1,28 +1,3 @@ ---- a/bundled_deps/admesh/CMakeLists.txt -+++ b/bundled_deps/admesh/CMakeLists.txt -@@ -13,4 +13,3 @@ add_library(admesh STATIC - - target_include_directories(admesh PUBLIC .) - target_link_libraries(admesh PRIVATE boost_headeronly localesutils) --target_link_libraries(admesh PUBLIC Eigen3::Eigen) ---- a/src/clipper/CMakeLists.txt -+++ b/src/clipper/CMakeLists.txt -@@ -10,5 +10,4 @@ add_library(clipper STATIC - ) - - target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128) --target_link_libraries(clipper PUBLIC Eigen3::Eigen) - target_include_directories(clipper PUBLIC .) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE - int128 - ) - target_link_libraries(libslic3r PUBLIC -- Eigen3::Eigen - semver - admesh - localesutils --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild deleted file mode 100644 index 92c404bba643..000000000000 --- a/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" -MY_PN="PrusaSlicer" -MY_PV="$(ver_rs 3 -)" - -inherit cmake wxwidgets xdg - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git" -else - SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~x86" - S="${WORKDIR}/${MY_PN}-version_${MY_PV}" -fi - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://www.prusa3d.com/prusaslicer/" - -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" -SLOT="0" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb:= - dev-libs/boost:=[nls] - dev-libs/cereal - dev-libs/expat - dev-libs/glib:2 - dev-libs/gmp:= - dev-libs/mpfr:= - media-gfx/openvdb:= - media-gfx/libbgcode - net-misc/curl[adns] - media-libs/glew:0= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/qhull:= - sci-libs/libigl - sci-libs/nlopt - sci-libs/opencascade:= - sci-mathematics/cgal:= - sys-apps/dbus - sys-libs/zlib:= - virtual/opengl - x11-libs/gtk+:3 - >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit] - media-libs/nanosvg:= -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] - test? ( =dev-cpp/catch-2* ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" - "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" - "${FILESDIR}/${PN}-2.8.0-fixed-linking.patch" - "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" - "${FILESDIR}/${PN}-2.8.0-cgal-6.0.patch" -) - -src_prepare() { - if has_version ">=sci-libs/opencascade-7.8.0"; then - eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" - fi - - sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die - - sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ - src/occt_wrapper/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - - setup-wxwidgets - - local mycmakeargs=( - -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" - - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=ON - -DSLIC3R_GTK=3 - -DSLIC3R_GUI=ON - -DSLIC3R_PCH=OFF - -DSLIC3R_STATIC=OFF - -DSLIC3R_WX_STABLE=ON - -Wno-dev - ) - - cmake_src_configure -} - -src_test() { - CMAKE_SKIP_TESTS=( - "^libslic3r_tests$" - ) - cmake_src_test -} diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild index ee32a6be8059..6b3be9ea12e5 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild @@ -43,6 +43,7 @@ RDEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/qhull:= + net-libs/webkit-gtk:4.1 sci-libs/libigl sci-libs/nlopt sci-libs/opencascade:= @@ -66,6 +67,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch" "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fstream.patch" + "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" ) src_prepare() { @@ -78,8 +80,8 @@ src_prepare() { sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ src/occt_wrapper/CMakeLists.txt || die - find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ - sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die + # remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608 + rm cmake/modules/FindEigen3.cmake || die cmake_src_prepare } diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index fbf13e9d7d66..66c1089c97e8 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -43,6 +43,7 @@ RDEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/qhull:= + net-libs/webkit-gtk:4.1 sci-libs/libigl sci-libs/nlopt sci-libs/opencascade:= @@ -66,6 +67,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch" "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" "${FILESDIR}/${PN}-2.8.1-fstream.patch" + "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch" ) src_prepare() { @@ -78,8 +80,8 @@ src_prepare() { sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ src/occt_wrapper/CMakeLists.txt || die - find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ - sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die + # remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608 + rm cmake/modules/FindEigen3.cmake || die cmake_src_prepare } |