From bb8c9132545ddf1e366b0b478c0dc89c56cf6dcd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Jun 2023 15:34:41 +0100 Subject: gentoo auto-resync : 04:06:2023 - 15:34:41 --- media-gfx/superslicer/Manifest | 6 +- ...superslicer-2.5.59.2-missing-includes-fix.patch | 36 +++++++ .../superslicer/superslicer-2.5.59.0-r3.ebuild | 3 +- .../superslicer/superslicer-2.5.59.2-r1.ebuild | 105 -------------------- .../superslicer/superslicer-2.5.59.2-r2.ebuild | 106 +++++++++++++++++++++ 5 files changed, 147 insertions(+), 109 deletions(-) delete mode 100644 media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild create mode 100644 media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild (limited to 'media-gfx/superslicer') diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index c0368f3c8b97..c2c999bb95f4 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -13,7 +13,7 @@ AUX superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch 51 AUX superslicer-2.5.59.2-fix-spiral_vase-null-pointer.patch 1228 BLAKE2B 2eb5ce866cd6f3489fa635b10fd096ee00538131f52c8e6c67c814579a7daa39dd044b5d57e1e08bb20d951fd5bc899ba9e56ac5b715344f76dc5e5153ff1b37 SHA512 3701b003ad206c5b4f813e2cb82ed680d8bcb8fea5ddbae8374558f6c94a43c4707612fbd324b5b7bcf52629466f202f91aa0be4b457cd3fd602e7c1eb09f538 AUX superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch 686 BLAKE2B 869ba2516ecfb72cc59b50be5590ff07879b146dcec7b5b7e9cebd6d42d5bb011f353e89bf921b825392f4b0dbaa0cef5032f0a5a5b691e829ae7ad84e4e31a2 SHA512 5eb73e13d691e9b5a89a5f06181e7b8a5e13e7b26a9ce80b33618ab945aaaf2d7a29bf85aa4cf702212f33994ad28f19e11359ee29055175194e13173704f3ec AUX superslicer-2.5.59.2-link-occtwrapper-statically.patch 2916 BLAKE2B 9f28ba510235b20ad5cc8cd919bce00137b62ac1b64141ccaf0559f2e5d263b9c71539cc302a7e2ed046b3965aa5de36dff6131491a666fd90275bbbee95f450 SHA512 b49f2db32814c1bc467751f6d1b73bf22bba75e37b84b42bb0b8f42b5aa712a30cc9bb70f2210abed124509ca3d037e2450700a82d0994e8c3e4bafe498c6dc9 -AUX superslicer-2.5.59.2-missing-includes-fix.patch 2165 BLAKE2B ed39e6e2e07e7623a7dfc87f5127f310ae8d7847597619634d162bca73cbb39f0fe08e6ea64e0965d5bbc3c06c9fc61b14c808b8c97f227599cb94dfe88d73dd SHA512 7deacf27bbc17e847b46cea00193c76bfec7b3b885f3fefd67bc0da8ec1df0c284252833b09560d0a5240630c0e3d88cc49fe40a1fbf80295f39fb18139dc655 +AUX superslicer-2.5.59.2-missing-includes-fix.patch 3042 BLAKE2B bc0d9e39abd204fefd59b0c1bb1077d0264f2a9bcfdf19bfb36d79dbbf8a1c08329dd8fedf60ab3bae6598131a98fd9712f2a6a598677fd2a557841c4a30f319 SHA512 e461c0111197c915aebe084c59ec1f84fe711cc29ae8f8aacd33309c52dd528ad9f4b85f25a14eeb06ce5d7b141f80a4bdd7fac56b428ec183cfeb84d2164106 AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5 AUX superslicer-2.5.59.2-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339 @@ -21,6 +21,6 @@ DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746c DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd -EBUILD superslicer-2.5.59.0-r3.ebuild 2243 BLAKE2B dd9727cfb208c694890deccc696845ad8dc0ce48a17a244513c333854b782dba9103b713482909cfb6238ec3063514f68b960750c2a2a5a667355d8373beef91 SHA512 a8dca57479744a2de97e2dc6feb37a5b41a3a5e44878d8fdb37689d70895ff7eafd782ee4178df65738c4c995aaba81f1e4eaa2dbfd22f6d09c54e197315b61e -EBUILD superslicer-2.5.59.2-r1.ebuild 2433 BLAKE2B 57bc52b87dd1688cf37f0b772a9d8672cb6cf9f5ac0a3cb9d398f7ec82dc926238f36bcce18e1f5ca7537bfacc12c344982dd598308f4be2f384cc6d5fcc03c0 SHA512 8c8115ae9e9a72bd42829bbb6807efe09dba1692454ddb0a700ae21011c6170a79b94e63d98ed338c79b8d231cf14c0fcd907103b993a1a6d66ca59531a9700c +EBUILD superslicer-2.5.59.0-r3.ebuild 2294 BLAKE2B f7bbe1b0cfeeaf1b95495b8cdbbc128786286a430d6d5908f8abca08c08788443ae274b2d181e63d67b5c65f9cb2e799681f5dd44ef912a63dcdb5420154941a SHA512 b8f7563a780dd62255abc62fb88df9a7fa0547fd0acbbc1c5b603f5236175027e0d6291f15d8d8dcf1a86e21a7bf26e1f54b2b04b57dc5add23c2e4c42cb8724 +EBUILD superslicer-2.5.59.2-r2.ebuild 2484 BLAKE2B 66c73f415866e3dd9c7c1ce0c3af5c9ada97e94a9fc4cd595a4abc9793682e6285cfa0095e630847a502693a280f0b901dcc9e98a24ed62f86943caecf9f12c0 SHA512 4f6cf315f15438c228aa08d2e43e258436d9ca3b2472fea05c3e9984e23ccd8bba43f0e3e937e2e134c04a20162c6c5249ccd3fa500fbbddc6cf227560c09139 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331 diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch index 289198863367..432f4f16870e 100644 --- a/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch +++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch @@ -10,6 +10,18 @@ index a626986..5f2d963 100644 #include "AppConfig.hpp" #include "Exception.hpp" #include "LocalesUtils.hpp" +diff --git a/src/libslic3r/CustomGCode.hpp b/src/libslic3r/CustomGCode.hpp +index 633edc8..fcd26ff 100644 +--- a/src/libslic3r/CustomGCode.hpp ++++ b/src/libslic3r/CustomGCode.hpp +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace Slic3r { + diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp index 1c54588..c74df3a 100644 --- a/src/libslic3r/ExtrusionEntity.hpp @@ -35,6 +47,18 @@ index 34ef2ae..20fe8b7 100644 namespace Slic3r { namespace Geometry { +diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp +index 01e1f47..1dce27a 100644 +--- a/src/libslic3r/PNGReadWrite.hpp ++++ b/src/libslic3r/PNGReadWrite.hpp +@@ -2,6 +2,7 @@ + #define PNGREAD_HPP + + #include ++#include + #include + #include + diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp index 34ec4e6..ed83b3e 100644 --- a/src/libslic3r/PerimeterGenerator.hpp @@ -60,6 +84,18 @@ index f69d68f..1dd55f2 100644 #include #include +diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp +index 34821c4..a74a850 100644 +--- a/src/slic3r/GUI/BitmapCache.hpp ++++ b/src/slic3r/GUI/BitmapCache.hpp +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + #include + #ifndef WX_PRECOMP diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp index 553a183..686630c 100644 --- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild index 083ab1fda40d..7cdeaa9cc284 100644 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild @@ -5,6 +5,7 @@ EAPI=8 WX_GTK_VER="3.0-gtk3" MY_PN="SuperSlicer" +SLICER_PROFILES_COMMIT="748fbdfd2ac077e4e415868e7bc963740b92aa8e" inherit cmake wxwidgets xdg flag-o-matic @@ -12,7 +13,7 @@ DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D HOMEPAGE="https://github.com/supermerill/SuperSlicer/" SRC_URI=" https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> ${P}-profiles.tar.gz + https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz " LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" diff --git a/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild deleted file mode 100644 index c29633c2bc55..000000000000 --- a/media-gfx/superslicer/superslicer-2.5.59.2-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" -MY_PN="SuperSlicer" - -inherit cmake wxwidgets xdg flag-o-matic - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://github.com/supermerill/SuperSlicer/" -SRC_URI=" - https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/slic3r/slic3r-profiles/archive/f6b1b123062a77101fe350f6d2a2a57be9adc684.tar.gz -> ${P}-profiles.tar.gz -" - -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RESTRICT="test" - -# No dep on sci-libs/libigl, in-tree version cannot build -# static library currently. Using bundled one. -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:= - dev-libs/imath:= - >=media-gfx/openvdb-8.2:= - net-misc/curl[adns] - media-libs/glew:0= - media-libs/libpng:0= - media-libs/qhull:= - sci-libs/nlopt - sci-libs/opencascade:= - >=sci-mathematics/cgal-5.0:= - sys-apps/dbus - sys-libs/zlib:= - virtual/glu - virtual/opengl - x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] -" - -PATCHES=( - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-cereal.patch" - "${FILESDIR}/${P}-dont-install-angelscript.patch" - "${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch" - "${FILESDIR}/${P}-missing-includes-fix.patch" - "${FILESDIR}/${P}-openexr3.patch" - "${FILESDIR}/${P}-wxgtk3-wayland-fix.patch" - "${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch" - "${FILESDIR}/${P}-link-occtwrapper-statically.patch" - "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch" - "${FILESDIR}/${P}-fix-spiral_vase-null-pointer.patch" -) - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_unpack() { - default - - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - - append-flags -fno-strict-aliasing - - 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_install() { - cmake_src_install - - rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die -} diff --git a/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild new file mode 100644 index 000000000000..572cbef82012 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +MY_PN="SuperSlicer" +SLICER_PROFILES_COMMIT="f6b1b123062a77101fe350f6d2a2a57be9adc684" + +inherit cmake wxwidgets xdg flag-o-matic + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://github.com/supermerill/SuperSlicer/" +SRC_URI=" + https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz +" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="test" + +# No dep on sci-libs/libigl, in-tree version cannot build +# static library currently. Using bundled one. +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:= + dev-libs/imath:= + >=media-gfx/openvdb-8.2:= + net-misc/curl[adns] + media-libs/glew:0= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/nlopt + sci-libs/opencascade:= + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +PATCHES=( + "${FILESDIR}/${P}-boost.patch" + "${FILESDIR}/${P}-cereal.patch" + "${FILESDIR}/${P}-dont-install-angelscript.patch" + "${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch" + "${FILESDIR}/${P}-missing-includes-fix.patch" + "${FILESDIR}/${P}-openexr3.patch" + "${FILESDIR}/${P}-wxgtk3-wayland-fix.patch" + "${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch" + "${FILESDIR}/${P}-link-occtwrapper-statically.patch" + "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch" + "${FILESDIR}/${P}-fix-spiral_vase-null-pointer.patch" +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_unpack() { + default + + mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + append-flags -fno-strict-aliasing + + 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_install() { + cmake_src_install + + rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die +} -- cgit v1.2.3