From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
Date: Wed, 20 Jul 2022 09:28:17 +0000 (UTC) [thread overview]
Message-ID: <1658309125.a3676217af146645999831fc08ff0c97b657898d.andrewammerlaan@gentoo> (raw)
Message-ID: <20220720092817.ZjEO2w0oyXYIE8OHCtfyYAWkudk2QnkrwAL5eKv9e-w@z> (raw)
commit: a3676217af146645999831fc08ff0c97b657898d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 09:25:25 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 09:25:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3676217
media-gfx/superslicer: remove duplicate
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-gfx/superslicer/Manifest | 3 -
...or-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch | 64 ------------
.../superslicer/files/boost-endian-2.2.53.4.patch | 49 ---------
.../files/boost-mouse-atomic-2.2.53.4.patch | 9 --
.../files/cereal-new-versions-2.3.57.12.patch | 46 ---------
.../files/freecad-dialog-2.2.53.4.patch | 9 --
| 20 ----
| 19 ----
.../files/missing-imports-2.3.57.12.patch | 10 --
.../superslicer/files/symlink-fix-2.3.57.12.patch | 9 --
.../files/version-suffix-2.2.53.4.patch | 11 ---
.../files/version-suffix-2.3.57.12.patch | 42 --------
media-gfx/superslicer/metadata.xml | 11 ---
.../superslicer/superslicer-2.2.53.4-r1.ebuild | 88 -----------------
media-gfx/superslicer/superslicer-2.3.57.12.ebuild | 109 ---------------------
15 files changed, 499 deletions(-)
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
deleted file mode 100644
index 1175a6f62..000000000
--- a/media-gfx/superslicer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
-DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
-DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59
diff --git a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
deleted file mode 100644
index 214395524..000000000
--- a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a13b35ce92efed202ef43f02debb83dfb533d9b0 Mon Sep 17 00:00:00 2001
-From: Vojtech Bubnik <bubnikv@gmail.com>
-Date: Tue, 15 Dec 2020 12:14:30 +0100
-Subject: [PATCH] Support for HiDPI in OpenGL on Linux / GTK3. wxGTK3 HiDPI
- support seems to emulate what OSX does quite closely, thus the changes are
- relatively minimal.
-
-Also fixed an ugly rounding issue when populating the ImGUI font map
-with image thumbnails.
-
-Fixes Gtk3 issue on 4k+ screens #4135
-Fixes HiDPI screens with Wayland on Fedora 30 cause Plater view to be too small. #3245
-
-Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
----
- src/slic3r/GUI/GLCanvas3D.cpp | 10 +++++++++-
- src/slic3r/GUI/GLCanvas3D.hpp | 5 +++--
- src/slic3r/GUI/ImGuiWrapper.cpp | 8 ++++++--
- src/slic3r/GUI/MainFrame.cpp | 3 ++-
- 4 files changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
-index e778de879..c2e442431 100644
---- a/src/slic3r/GUI/GLCanvas3D.cpp
-+++ b/src/slic3r/GUI/GLCanvas3D.cpp
-@@ -86,6 +86,13 @@ static const size_t VERTEX_BUFFER_RESERVE_SIZE_SUM_MAX = 1024 * 1024 * 128 / 4;
- namespace Slic3r {
- namespace GUI {
-
-+#ifdef __WXGTK3__
-+// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support.
-+RetinaHelper::RetinaHelper(wxWindow* window) : m_window(window), m_self(nullptr) {}
-+RetinaHelper::~RetinaHelper() {}
-+float RetinaHelper::get_scale_factor() { return float(m_window->GetContentScaleFactor()); }
-+#endif // __WXGTK3__
-+
- Size::Size()
- : m_width(0)
- , m_height(0)
-@@ -3732,7 +3739,8 @@ void GLCanvas3D::update_ui_from_settings()
- {
- m_dirty = true;
-
--#if ENABLE_RETINA_GL
-+#if __APPLE__
-+ // Update OpenGL scaling on OSX after the user toggled the "use_retina_opengl" settings in Preferences dialog.
- const float orig_scaling = m_retina_helper->get_scale_factor();
-
- const bool use_retina = wxGetApp().app_config->get("use_retina_opengl") == "1";
-diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
-index 9c80aa236..e64e65d1b 100644
---- a/src/slic3r/GUI/GLCanvas3D.hpp
-+++ b/src/slic3r/GUI/GLCanvas3D.hpp
-@@ -31,7 +31,8 @@ class wxPaintEvent;
- class wxGLCanvas;
- class wxGLContext;
-
--// Support for Retina OpenGL on Mac OS
--#define ENABLE_RETINA_GL __APPLE__
-+// Support for Retina OpenGL on Mac OS.
-+// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support, enable it as well.
-+#define ENABLE_RETINA_GL (__APPLE__ || __WXGTK3__)
-
- namespace Slic3r {
diff --git a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
deleted file mode 100644
index 226ad261a..000000000
--- a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/admesh/stlinit.cpp
-+++ b/src/admesh/stlinit.cpp
-@@ -28,7 +28,7 @@
-
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/cstdio.hpp>
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
-
- #include "stl.h"
-
-@@ -36,9 +36,9 @@
- #error "SEEK_SET not defined"
- #endif
-
--#ifndef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_BIG_BYTE
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_BIG_BYTE */
-
- static FILE* stl_open_count_facets(stl_file *stl, const char *file)
- {
-@@ -89,10 +89,10 @@
- // Read the int following the header. This should contain # of facets.
- uint32_t header_num_facets;
- bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_BIG_BYTE
- // Convert from little endian to big endian.
- stl_internal_reverse_quads((char*)&header_num_facets, 4);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_BIG_BYTE */
- if (! header_num_faces_read || num_facets != header_num_facets)
- BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
- }
-@@ -158,10 +158,10 @@
- // Read a single facet from a binary .STL file. We assume little-endian architecture!
- if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
- return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_BIG_BYTE
- // Convert the loaded little endian data to big endian.
- stl_internal_reverse_quads((char*)&facet, 48);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_BIG_BYTE */
- } else {
- // Read a single facet from an ASCII .STL file
- // skip solid/endsolid
diff --git a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
deleted file mode 100644
index e7556e0aa..000000000
--- a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/slic3r/GUI/Mouse3DController.hpp
-+++ b/src/slic3r/GUI/Mouse3DController.hpp
-@@ -11,5 +11,6 @@
- #include "hidapi.h"
-
- #include <queue>
-+#include <atomic>
- #include <thread>
- #include <vector>
diff --git a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
deleted file mode 100644
index 7e3b5dfc3..000000000
--- a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# Backported via https://bugs.gentoo.org/834005
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -436,6 +436,9 @@ endif ()
-
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+ add_library(cereal::cereal ALIAS cereal)
-+endif ()
-
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -123,7 +123,7 @@
- set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
- endif ()
-
--target_link_libraries(Slic3r libslic3r cereal)
-+target_link_libraries(Slic3r libslic3r cereal::cereal)
- if (APPLE)
- # add_compile_options(-stdlib=libc++)
- # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -321,7 +321,7 @@
- target_link_libraries(libslic3r
- libnest2d
- admesh
-- cereal
-+ cereal::cereal
- libigl
- miniz
- boost_libs
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -259,6 +259,6 @@
-
- encoding_check(libslic3r_gui)
-
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
-
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
- target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})
diff --git a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
deleted file mode 100644
index 880ef6b1f..000000000
--- a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/slic3r/GUI/FreeCADDialog.cpp
-+++ b/src/slic3r/GUI/FreeCADDialog.cpp
-@@ -706,5 +706,5 @@
- m_text->Bind(wxEVT_KEY_DOWN, &FreeCADDialog::on_key_type, this);
- m_text->Bind(wxEVT_CHAR, &FreeCADDialog::on_char_type, this);
-- m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
-+ //m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
- m_text->Connect(wxID_ANY,
- wxEVT_KEY_DOWN,
diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
deleted file mode 100644
index 2294ba0b5..000000000
--- a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/761541
---- a/src/libslic3r/miniz_extension.hpp 2021-01-11 08:01:51.000000000 -0500
-+++ b/src/libslic3r/miniz_extension.hpp 2021-01-12 01:16:10.503404521 -0500
-@@ -4,4 +4,5 @@
- #include <string>
- #include <miniz.h>
-+#include <miniz_zip.h>
-
- namespace Slic3r {
-
---- a/src/libslic3r/Format/3mf.cpp
-+++ b/src/libslic3r/Format/3mf.cpp
-@@ -30,6 +30,7 @@ namespace pt = boost::property_tree;
- #include <expat.h>
- #include <Eigen/Dense>
- #include "miniz_extension.hpp"
-+#include <miniz_zip.h>
-
- // VERSION NUMBERS
- // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
deleted file mode 100644
index a00aefb9c..000000000
--- a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/libslic3r/Format/3mf.cpp
-+++ b/src/libslic3r/Format/3mf.cpp
-@@ -31,6 +31,7 @@ namespace pt = boost::property_tree;
- #include <expat.h>
- #include <Eigen/Dense>
- #include "miniz_extension.hpp"
-+#include <miniz_zip.h>
-
- // VERSION NUMBERS
- // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
---- a/src/libslic3r/miniz_extension.hpp
-+++ b/src/libslic3r/miniz_extension.hpp
-@@ -3,6 +3,7 @@
-
- #include <string>
- #include <miniz.h>
-+#include <miniz_zip.h>
-
- namespace Slic3r {
diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
deleted file mode 100644
index 009a4892a..000000000
--- a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/slic3r/Utils/PresetUpdater.cpp
-+++ b/src/slic3r/Utils/PresetUpdater.cpp
-@@ -6,6 +6,7 @@
- #include <ostream>
- #include <utility>
- #include <stdexcept>
-+#include <regex>
-
- #include <boost/algorithm/string.hpp>
- #include <boost/filesystem.hpp>
diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
deleted file mode 100644
index 80d9eddfa..000000000
--- a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -273,5 +273,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/files/version-suffix-2.2.53.4.patch b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
deleted file mode 100644
index e970f2e09..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version.inc
-+++ b/version.inc
-@@ -2,7 +2,7 @@
- # (the version numbers are generated by the build script from the git current label)
-
- set(SLIC3R_APP_NAME "SuperSlicer")
--set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_KEY "SuperSlicer2.2")
- set(SLIC3R_VERSION "2.2.53")
- set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")
- set(SLIC3R_RC_VERSION "2,2,53,0")
diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
deleted file mode 100644
index ed583fcf9..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/platform/unix/Gcodeviewer.desktop.in
-+++ b/src/platform/unix/Gcodeviewer.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=@GCODEVIEWER_APP_NAME@
-+Name=@GCODEVIEWER_APP_KEY@
- Comment=G-code viewer of Slic3r
- Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
- Icon=@GCODEVIEWER_APP_KEY@
---- a/src/platform/unix/Slic3r.desktop.in
-+++ b/src/platform/unix/Slic3r.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=@SLIC3R_APP_NAME@
-+Name=@SLIC3R_APP_KEY@
- GenericName=3D Printing Software
- Comment=G-code generator for 3D printers
- Icon=@SLIC3R_APP_KEY@
-@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
- Categories=Graphics;3DGraphics;Engineering;
- Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
- StartupNotify=false
--StartupWMClass=@SLIC3R_APP_KEY@
-+StartupWMClass=@SLIC3R_APP_NAME@
---- a/version.inc
-+++ b/version.inc
-@@ -4,12 +4,12 @@
- # name of the slicer
- set(SLIC3R_APP_NAME "SuperSlicer")
- # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
--set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_KEY "SuperSlicer2.3")
- # exe name of the slicer, should be lowercase and valid in all os
--set(SLIC3R_APP_CMD "superslicer")
-+set(SLIC3R_APP_CMD "superslicer-2.3")
- # versions
- set(SLIC3R_VERSION "2.3.57")
- set(SLIC3R_VERSION_FULL "2.3.57.12")
--set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN")
-+set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo")
- set(SLIC3R_RC_VERSION "2,3,57,12")
- set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")
diff --git a/media-gfx/superslicer/metadata.xml b/media-gfx/superslicer/metadata.xml
deleted file mode 100644
index a9b8c9f13..000000000
--- a/media-gfx/superslicer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>egorr.berd@gmail.com</email>
- <name>Yahor Berdnikau</name>
-</maintainer>
-<use>
- <flag name="profiles">Install additional 3d printer profiles.</flag>
-</use>
-</pkgmetadata>
diff --git a/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild b/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild
deleted file mode 100644
index 3e1e71e6b..000000000
--- a/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit xdg cmake desktop wxwidgets
-
-MY_PN="SuperSlicer"
-DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer"
-SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="22"
-KEYWORDS="~amd64"
-IUSE="gui test"
-
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ~dev-cpp/tbb-2020.3
- >=dev-libs/boost-1.73.0:=[nls,threads(+)]
- dev-libs/c-blosc
- dev-libs/cereal
- dev-libs/openssl
- >=dev-libs/miniz-2.1.0-r2
- media-gfx/openvdb:0/7
- media-libs/qhull:=
- media-libs/openexr:0=
- sci-libs/libigl
- sci-libs/nlopt
- >=sci-mathematics/cgal-5.0:=
- sys-libs/zlib:=
- gui? (
- dev-libs/glib:2
- media-libs/glew:0=
- net-misc/curl
- virtual/glu
- virtual/opengl
- x11-libs/gtk+:3
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/qhull[static-libs]
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/boost-endian-${PV}.patch"
- "${FILESDIR}/miniz-zip-header-${PV}.patch"
- "${FILESDIR}/freecad-dialog-${PV}.patch"
- "${FILESDIR}/boost-mouse-atomic-${PV}.patch"
- "${FILESDIR}/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-${PV}.patch"
- "${FILESDIR}/version-suffix-${PV}.patch"
-)
-
-src_configure() {
- use gui && setup-wxwidgets
-
- CMAKE_BUILD_TYPE=Release
- local mycmakeargs=(
- -DSLIC3R_BUILD_TESTS=$(usex test)
- -DSLIC3R_FHS=1
- -DSLIC3R_GUI=$(usex gui)
- -DSLIC3R_PCH=0
- -DSLIC3R_WX_STABLE=1
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use gui; then
- newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.2.png
- make_desktop_entry superslicer "SuperSlicer 2.2" "SuperSli3er_2.2" "Graphics;3DGraphics;Engineering;" \
- "MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
- "GenericName=3D Printing Software" \
- "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
- fi
-}
diff --git a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
deleted file mode 100644
index de043d7de..000000000
--- a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit xdg cmake desktop wxwidgets
-
-MY_PN="SuperSlicer"
-DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer"
-SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
- profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="23"
-KEYWORDS="~amd64"
-IUSE="gui test profiles"
-
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="profiles? ( app-arch/unzip )"
-RDEPEND="
- dev-cpp/eigen:3
- dev-cpp/tbb
- >=dev-libs/boost-1.73.0:=[nls,threads(+)]
- dev-libs/cereal
- dev-libs/expat
- dev-libs/c-blosc
- dev-libs/gmp:=
- >=dev-libs/miniz-2.1.0-r2
- dev-libs/mpfr:=
- >=media-gfx/openvdb-5.0.0
- media-libs/ilmbase:=
- media-libs/libpng:0=
- media-libs/openexr:0=
- media-libs/qhull:=
- sci-libs/libigl
- sci-libs/nlopt
- >=sci-mathematics/cgal-5.0:=
- sys-apps/dbus
- sys-libs/zlib:=
- gui? (
- dev-libs/glib:2
- media-libs/glew:0=
- net-misc/curl
- virtual/glu
- virtual/opengl
- x11-libs/gtk+:3
- >=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/qhull[static-libs]
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/miniz-zip-header-${PV}.patch"
- "${FILESDIR}/freecad-dialog-2.2.53.4.patch"
- "${FILESDIR}/missing-imports-${PV}.patch"
- "${FILESDIR}/cereal-new-versions-${PV}.patch"
- "${FILESDIR}/version-suffix-${PV}.patch"
- "${FILESDIR}/symlink-fix-${PV}.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
- mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
- mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
- mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
- mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
- cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
-
- use profiles && unpack ${P}-profiles.zip
- if use profiles ; then
- cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles"
- fi
-}
-
-src_configure() {
- use gui && setup-wxwidgets
-
- CMAKE_BUILD_TYPE=Release
- local mycmakeargs=(
- -DSLIC3R_BUILD_TESTS=$(usex test)
- -DSLIC3R_FHS=ON
- -DSLIC3R_GTK=3
- -DSLIC3R_GUI=$(usex gui)
- -DSLIC3R_PCH=OFF
- -DSLIC3R_WX_STABLE=ON
- -Wno-dev
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use gui; then
- newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
- fi
-}
next reply other threads:[~2022-07-20 9:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 9:35 Andrew Ammerlaan [this message]
2022-07-20 9:28 ` [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-02-20 8:46 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/ Florian Schmaus
2022-02-07 20:35 Arthur Zamarin
2021-12-15 10:35 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1658309125.a3676217af146645999831fc08ff0c97b657898d.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox