From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79CA113835B for ; Sun, 7 Feb 2021 21:30:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83978E08D3; Sun, 7 Feb 2021 21:30:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B93AE08CD for ; Sun, 7 Feb 2021 21:30:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D1E9340C59 for ; Sun, 7 Feb 2021 21:30:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DF3A4C5 for ; Sun, 7 Feb 2021 21:30:49 +0000 (UTC) From: "Dennis Lamm" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Lamm" Message-ID: <1612733444.8957d845a5aa219acf1a63a1b6bfb0743423836f.expeditioneer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/prusaslicer/Manifest media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild X-VCS-Directories: media-gfx/prusaslicer/ media-gfx/prusaslicer/files/ X-VCS-Committer: expeditioneer X-VCS-Committer-Name: Dennis Lamm X-VCS-Revision: 8957d845a5aa219acf1a63a1b6bfb0743423836f X-VCS-Branch: master Date: Sun, 7 Feb 2021 21:30:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f0548e4e-084b-4df5-9b39-47f66d431495 X-Archives-Hash: d9a984a460504822f7057a92001b7836 commit: 8957d845a5aa219acf1a63a1b6bfb0743423836f Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 19:13:00 2021 +0000 Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 21:30:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8957d845 media-gfx/prusaslicer: drop old Signed-off-by: Dennis Lamm gentoo.org> media-gfx/prusaslicer/Manifest | 1 - .../files/prusaslicer-2.2.0-atomic.patch | 10 --- .../files/prusaslicer-2.2.0-boost-1.73.patch | 60 ---------------- media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild | 79 ---------------------- 4 files changed, 150 deletions(-) diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 4dcbadca21f..33a0f438d35 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,2 +1 @@ -DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch deleted file mode 100644 index 4319ad0f146..00000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/slic3r/GUI/Mouse3DController.hpp -+++ b/src/slic3r/GUI/Mouse3DController.hpp -@@ -8,6 +8,7 @@ - - #include "hidapi.h" - -+#include - #include - #include - #include diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch deleted file mode 100644 index 50abea11b32..00000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/admesh/stlinit.cpp -+++ b/src/admesh/stlinit.cpp -@@ -28,7 +28,6 @@ - - #include - #include --#include - - #include "stl.h" - -@@ -36,9 +35,9 @@ - #error "SEEK_SET not defined" - #endif - --#ifndef BOOST_LITTLE_ENDIAN -+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - extern void stl_internal_reverse_quads(char *buf, size_t cnt); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - - static FILE* stl_open_count_facets(stl_file *stl, const char *file) - { -@@ -89,10 +88,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 __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - // Convert from little endian to big endian. - stl_internal_reverse_quads((char*)&header_num_facets, 4); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - 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 +157,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 __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ - // Convert the loaded little endian data to big endian. - stl_internal_reverse_quads((char*)&facet, 48); --#endif /* BOOST_LITTLE_ENDIAN */ -+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */ - } else { - // Read a single facet from an ASCII .STL file - // skip solid/endsolid - ---- a/CMakeLists.txt (revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2) -+++ b/CMakeLists.txt (date 1607811414000) -@@ -260,7 +260,7 @@ - # set(Boost_COMPILER "-mgw81") - if(NOT WIN32) - # boost::process was introduced first in version 1.64.0 -- set(MINIMUM_BOOST_VERSION "1.64.0") -+ set(MINIMUM_BOOST_VERSION "1.72.0") - endif() - set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time") - find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components}) diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild deleted file mode 100644 index f7714afa61d..00000000000 --- a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit cmake desktop wxwidgets xdg-utils - -MY_PN="PrusaSlicer" - -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/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="gui test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb - >=dev-libs/boost-1.73.0:=[threads] - dev-libs/cereal - dev-libs/expat - dev-libs/miniz - media-libs/glew:0= - media-libs/qhull - >=media-gfx/openvdb-5.0.0 - net-misc/curl - >=sci-mathematics/cgal-5.0 - sci-libs/libigl - sci-libs/nlopt - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}[X] - " -DEPEND="${RDEPEND}" - -S="${WORKDIR}/PrusaSlicer-version_${PV}" -PATCHES=( - "${FILESDIR}/${P}-atomic.patch" - "${FILESDIR}/${P}-boost-1.73.patch" -) - -src_prepare() { - setup-wxwidgets - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - - local mycmakeargs=( - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=1 - -DSLIC3R_GUI=$(usex gui) - -DSLIC3R_PCH=0 - -SLIC3R_STATIC=0 - -DSLIC3R_WX_STABLE=1 - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - doicon resources/icons/PrusaSlicer.png || die - domenu "${FILESDIR}/PrusaGcodeviewer.desktop" || die - domenu "${FILESDIR}/PrusaSlicer.desktop" || die -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -}