From aa3df29a7249694a60190b96385136043ee7db3f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Aug 2022 02:55:12 +0100 Subject: gentoo auto-resync : 28:08:2022 - 02:55:12 --- media-gfx/superslicer/Manifest | 4 +- ...2.5.59.0-dont-install-bundled-angelscript.patch | 53 ++++++++++++ ...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 +++ .../superslicer/superslicer-2.5.59.0-r1.ebuild | 98 ++++++++++++++++++++++ media-gfx/superslicer/superslicer-2.5.59.0.ebuild | 96 --------------------- 5 files changed, 165 insertions(+), 97 deletions(-) create mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch create mode 100644 media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch create mode 100644 media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild delete mode 100644 media-gfx/superslicer/superslicer-2.5.59.0.ebuild (limited to 'media-gfx/superslicer') diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 81a224a45942..dfa6f0146104 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -6,6 +6,8 @@ AUX superslicer-2.4.58.3-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a AUX superslicer-2.4.58.3-wxgtk3-wayland.patch 485 BLAKE2B a6a12b7b6b0da28593ee417e45bc97d9c297ce40b8f4a3adb3defa237ca4849238d82f58b4e8e7a4432d3167613845dd828db37529db6dbc9626bb89aa29437c SHA512 515c9b4b00cdfdc268febba8614fe9d2f33c5721ab17935a19055a25ef870ec04a51fc9af801f159dd48fb1a2d882695df373ee3b28dc676ac50f0fbaf73d474 AUX superslicer-2.5.59.0-boost.patch 9423 BLAKE2B 8e797ed961fe2c1c8f0b5e67b6aaee8efa17933cecd190b1623e7df4f2724edb4e1c6559a839c4dc1d3b67f8f9db080476640e48187a03ec0541114863cdffc6 SHA512 f72eb91230c0e3aa2254533e5377a6aedcd806529c0cf3795eee883d4b8aaf6c618c7f2e064e80de3f688bf9f2a97d913e72d0b1c227d64caa7585cad1c97a84 AUX superslicer-2.5.59.0-cereal.patch 1974 BLAKE2B b28be995a1c258c1848ad78a00061c73ccb173da0f790573273123f8f1481131a75ec3fb84fd8cee26dc7cef750650c827b39b685343d9defd44edec48e698a6 SHA512 50510b349f43354da7a5712d662b94a0276081c9af28d04b8d63885ed0053b52522b686ecfffa45d0b197097ee7c08ea1c831f0995a337c44becd453c392a539 +AUX superslicer-2.5.59.0-dont-install-bundled-angelscript.patch 1671 BLAKE2B 211bbd88a3db29312bfd1b0a7fac23ade2fb1e38c99cd1c7125e2c5d5fda46adc2cb232345085783e37404c6fbc10cb831196b546ca3a76f4d59d8095f254f54 SHA512 a206103eac2969e68540d564149e843a24a16445b6157fc3409ff1c577657d35ef05493259e3fc3615d641eaad96832231aa969c53eaac87e11d1b365ffd99b1 +AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f71260334643bf53c0095d59f1090d8c7619502a32e319a6beb3f23937edd7d1c07eeab0fa9d332b8151b32605c8711492bf66b43c2fd64c85e19e54edaef SHA512 122d52d1f43aaedeee8d0ce56c5daef22f904de03101669fb9a870c18d1ea73615c2ec37da3de65f1f8d2a7455517111f75aeaadd60f66c82edebf288bc4767f AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855 AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e @@ -14,5 +16,5 @@ DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841 DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76 DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c EBUILD superslicer-2.4.58.3-r1.ebuild 2125 BLAKE2B 75b0f72a96f7f454c1cb49080bb57c64296b4504bb9b417fe832d60be5828b3ac0850f1891dd68a989de20e44d20712fe9d99fa8023e284c28949e161e3f9590 SHA512 54cb72e00f37dd760da19e15d4f4560d9934344f09b365376e38ecae324720962b68cd9c15cfe240228992dfd572aa6b48dd6a281356936740a7210af3db27a3 -EBUILD superslicer-2.5.59.0.ebuild 2041 BLAKE2B 302a497852c462dc4aba0806223630877ba8213065d039529cc3e6e8b43a98b11c8f3a14ddc9809c3d99853ea8df47ccb3bf5c8680e362dcb49f8fb05f39af39 SHA512 4130e571e5013046b2f14fcb48106b860949e1e511c53c1bb8b4a4ca77708152429663111fa77aee4b3c5609d9dca68f4cefdb4e2ada78f54c9c464de9801d8d +EBUILD superslicer-2.5.59.0-r1.ebuild 2150 BLAKE2B 6618e859d579539e2a3e0abeb0d53c84ef95e0d7e0af74c1fd80b6b428b9a87abb8bd04e18c7cb7ddead5224e7a83832a82453cf53afa2cc723c33e76f1bb9c5 SHA512 4e7856598dd07d3cab4a608a8607598e7e2d34362fcabd9acac9f8c1363f557962e3b6a263faf5e35f4fa010c24cb2cf4f63c525260909ec39749902423a016a MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331 diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch new file mode 100644 index 000000000000..603a96ac67a5 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch @@ -0,0 +1,53 @@ +diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt +index fed80a0ad..a65d9f8d5 100644 +--- a/src/angelscript/CMakeLists.txt ++++ b/src/angelscript/CMakeLists.txt +@@ -202,48 +202,3 @@ endif() + + # Don't override the default runtime output path to avoid conflicts when building for multiple target platforms + #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) +- +-#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part +-install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- INCLUDES DESTINATION include +-) +- +-install(FILES +- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h +- DESTINATION include +- COMPONENT Devel +-) +- +-include(CMakePackageConfigHelpers) +-write_basic_package_version_file( +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" +- VERSION ${PROJECT_VERSION} +- COMPATIBILITY AnyNewerVersion +-) +- +-export(EXPORT AngelscriptTargets +- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake" +- NAMESPACE Angelscript:: +-) +-configure_file(cmake/AngelscriptConfig.cmake +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake" +- COPYONLY +-) +- +-set(ConfigPackageLocation lib/cmake/Angelscript) +-install(EXPORT AngelscriptTargets +- FILE AngelscriptTargets.cmake +- NAMESPACE Angelscript:: +- DESTINATION ${ConfigPackageLocation} +-) +-install( +- FILES +- cmake/AngelscriptConfig.cmake +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" +- DESTINATION ${ConfigPackageLocation} +- COMPONENT Devel +-) +- diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch new file mode 100644 index 000000000000..5a5c9960cc00 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch @@ -0,0 +1,11 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9aae6dc11..75835903e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -299,5 +299,5 @@ else () + install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + # Install the symlink for gcodeviewer +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") + endif () diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild new file mode 100644 index 000000000000..ebd207c8f2d7 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild @@ -0,0 +1,98 @@ +# 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 + +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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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-1.73.0:=[nls,threads(+)] + 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-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}-openexr3.patch" + "${FILESDIR}/${P}-wxgtk3-wayland.patch" + "${FILESDIR}/${P}-cereal.patch" + "${FILESDIR}/${P}-boost.patch" + "${FILESDIR}/${P}-missing-includes.patch" + "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch" + "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch" +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_unpack() { + default + + mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die +} + +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_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.0.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0.ebuild deleted file mode 100644 index 3024d92b17a4..000000000000 --- a/media-gfx/superslicer/superslicer-2.5.59.0.ebuild +++ /dev/null @@ -1,96 +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 - -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/748fbdfd2ac077e4e415868e7bc963740b92aa8e.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-1.73.0:=[nls,threads(+)] - 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-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}-openexr3.patch" - "${FILESDIR}/${P}-wxgtk3-wayland.patch" - "${FILESDIR}/${P}-cereal.patch" - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-missing-includes.patch" -) - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_unpack() { - default - - mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die -} - -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_install() { - cmake_src_install - - rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die -} -- cgit v1.2.3