From 3018b5a4bd4777c51e2793818305d7af2409a7fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jul 2023 20:53:51 +0100 Subject: gentoo auto-resync : 23:07:2023 - 20:53:51 --- media-gfx/Manifest.gz | Bin 37985 -> 37987 bytes media-gfx/prusaslicer/Manifest | 4 + .../prusaslicer-2.6.0-disable-noisy-asserts.patch | 14 ++++ ...icer-2.6.0-libexpat-double-definition-fix.patch | 22 ++++++ media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild | 87 +++++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch create mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch create mode 100644 media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index f769bccdf6ce..141ce09b4fb4 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 5b53aba7346d..7cd6d73de67f 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -3,6 +3,10 @@ AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2509 BLAKE2B AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6 AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b AUX prusaslicer-2.5.2-fix-slicing.patch 5038 BLAKE2B 5d732bd8585e8a70c4f04270092bccfdfd7fc9d95999f58b8b9ba0f7516b9fad273102702959ce964a138a8f575f008277f84ff28ff2de77835b360d8f3a435d SHA512 40e5f094c5f9904b970e404f57ef9658024df4c60ecd75d4e4e8d2bc586d6c81bdcad6254e2355137bd1ec78b711bfdd7d1cc8ac73c46ae43cb0f4131763b8b2 +AUX prusaslicer-2.6.0-disable-noisy-asserts.patch 503 BLAKE2B 11624effbd6082bb04d6cad3a5f06c047dd267e8157607da9e29c1010632c17595515bc7958db0828392104f1c98e4571cca836d416277f66b703fd7606e7ede SHA512 9607f8819d886b777a7ff4ad4d3e4bf2c6cda51cc00660ce91c6750e6f74096f286685df92757af097098872624d07a064a9fbfea416df5b13a4f2df733083ef +AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 839 BLAKE2B 699b323d52bf8307e9dec433be337c6688815519a169bb27e3841a94ef364a50fc33cb115def6c715dc4eec5e9e9f44c10f4393c568251e9b4b4b6b28d56d6a8 SHA512 1835cb47b5a85b0af7bd565ae080d81bd844ff5976a960d9f1ee13d16cdc6ebe9eb95658f39ee6a8885474ac9cb140b088eba7e9559293b3b6fcb27ffc8ffdbf DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8 SHA512 7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2 +DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b SHA512 c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c EBUILD prusaslicer-2.5.2-r1.ebuild 2030 BLAKE2B 3e6010909c0091d12fb99915c524e9da1fb8a81925fec81e43f2a53eb59167d3cf398b0612025ce71b1b845fa8b986b9a1c580796aea67872e64e22df1751735 SHA512 defbdc0a6f2a1bb266ab8fbe8628b7e2376122926c49155448814e8fe447a2a15c59047551a8e7a6204184f369cc788addcb05aee2ae901d24a8cdc46ced42c3 +EBUILD prusaslicer-2.6.0.ebuild 1905 BLAKE2B 6ee6281583b69cc1e98831ec0b0bfe304895102557bd13451507443e53c03e42eab6f1967c87b5c35384ebe9722de36aec6ba63002c836d70795486de6bdcc70 SHA512 05927374cd1f98807efecb6cf12bf524947d09905d07890ba2a21aff92c74301da478e89d18624c4cfbde8e4736db59d94d3b5dfcaf6b764cb77d6af9226efa0 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch new file mode 100644 index 000000000000..0e3d1d340572 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch @@ -0,0 +1,14 @@ +diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp +index e855b6290..2479bf054 100644 +--- a/src/slic3r/GUI/GUI_App.cpp ++++ b/src/slic3r/GUI/GUI_App.cpp +@@ -1128,6 +1128,9 @@ bool GUI_App::OnInit() + + bool GUI_App::on_init_inner() + { ++ // Disable the wxWidgets asserts breakpoints, end users have no use for them. ++ wxSizerFlags::DisableConsistencyChecks(); ++ + // Set initialization of image handlers before any UI actions - See GH issue #7469 + wxInitAllImageHandlers(); + diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch new file mode 100644 index 000000000000..23006a2ceedf --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch @@ -0,0 +1,22 @@ +From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001 +From: Malte kleine Piening +Date: Tue, 18 Apr 2023 22:29:04 +0200 +Subject: [PATCH] fixed double definition of target libexpat described in #9581 + +--- + cmake/modules/FindEXPAT.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake +index de204c60f7e..5863e136ec5 100644 +--- a/cmake/modules/FindEXPAT.cmake ++++ b/cmake/modules/FindEXPAT.cmake +@@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND) + endif () + endif() + +-if (EXPAT_FOUND AND NOT TARGET EXPAT::EXPAT) ++if (EXPAT_FOUND AND NOT (TARGET EXPAT::EXPAT OR TARGET expat::expat)) + add_library(libexpat INTERFACE) + add_library(EXPAT::EXPAT ALIAS libexpat) + target_link_libraries(libexpat INTERFACE expat::expat) diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild new file mode 100644 index 000000000000..fcbc39930483 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 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 + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" +SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="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:= + 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] + media-libs/nanosvg:= +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +PATCHES=( + "${FILESDIR}/${P}-libexpat-double-definition-fix.patch" + "${FILESDIR}/${P}-disable-noisy-asserts.patch" +) + +S="${WORKDIR}/${MY_PN}-version_${MY_PV}" + +src_prepare() { + 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 +} -- cgit v1.2.3