From bfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2024 00:05:36 +0100 Subject: gentoo auto-resync : 21:05:2024 - 00:05:35 --- media-gfx/Manifest.gz | Bin 38001 -> 38006 bytes media-gfx/prusaslicer/Manifest | 3 +- media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild | 1 + media-gfx/prusaslicer/prusaslicer-9999.ebuild | 105 +++++++++++++++++++++++++ media-gfx/skanpage/Manifest | 4 +- media-gfx/skanpage/skanpage-24.02.2.ebuild | 48 ----------- media-gfx/skanpage/skanpage-24.04.90.ebuild | 49 ++++++++++++ 7 files changed, 159 insertions(+), 51 deletions(-) create mode 100644 media-gfx/prusaslicer/prusaslicer-9999.ebuild delete mode 100644 media-gfx/skanpage/skanpage-24.02.2.ebuild create mode 100644 media-gfx/skanpage/skanpage-24.04.90.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 0b9ecbcdc52c..82476601ee8d 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 4b5a06589b2e..e2280ae9bf24 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -7,5 +7,6 @@ DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 7683e2c97458da6b6f2b0e826f538d556 DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b EBUILD prusaslicer-2.6.1.ebuild 2116 BLAKE2B 7b3a056615bdac9762bc6f8a04abc7d2e259e3fd803742bcae4a1561e67e0769a30bca3a77522cc8e3cec3ff5edea01c812d7ccfb6e796f7340c5efec485322f SHA512 30513133e6c72f0c98a0c40080cafcbcf72a54382d42b5f2ef0d4f5361af85940a510983b9e60085bb17322127d48f7d251a64cc1e29e9fa4ade4d7c6720787c EBUILD prusaslicer-2.7.1.ebuild 2082 BLAKE2B 92fe269699a582ec1192ac370e9b0c183d9de0cb82d2e7ff22d2ae1c27685102e74fb7ec902ebfc38daa28c6967a34e9e5326ccd47087b63d66ce845c83c6a07 SHA512 7d45b154c1aff505db45ad1cb28616c6941b9c957b9ce85352f52ceafc1e03e9cdebe2edf04c1bcca1525571622dd6aae1209b8ba9613f09659352f10ccd394c -EBUILD prusaslicer-2.7.4.ebuild 2171 BLAKE2B 51048af1ddd27962697f084a3771e0ed1e9e8e316a115643b0682649645e77aeb27d02f7c442cbdb54766a050cf37474fec35e94c0fafcce1516ab5729d11970 SHA512 19cc3898a9c493c723c04db8bb224523b8e8832d0fdf38aab85b90de8c1f7f7ff112c747ec6c257d2e423bd63073ccf323d522f70ca53da52d24d9e36e6d8be5 +EBUILD prusaslicer-2.7.4.ebuild 2200 BLAKE2B d50df8106771d0156ac4e577bbf9c18a5a8e19048d81c17fa83a779e122c10fe667595bb3e99df6e113db56ad02714686428f27752d1c47c239144aa6985093b SHA512 448153e889b76a30d2abb74428c18218a57662f1a9592f0002b407374fe83d494408284eb1d8deb388738233f868ee957f2b149a4bac18b7da5f34dc50f7d351 +EBUILD prusaslicer-9999.ebuild 2318 BLAKE2B 5e34c426e87d2b821bcfbddcb32e189a54ec7f38b5dfbfb1151b9f9c4816a8cb18463bf1c923ffd35618b5b904f23b11d3b79e3a538cccb928c1c444758d3d07 SHA512 33c7ad6035acd4bea7c2e2d73f505d1b2777e694bd9bb28886635af6cbef17165dca893832b70275cbfd2a327c2205e915456630c60878420f471789595377cd MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild index a4ea9747ee33..48092fb26071 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild @@ -51,6 +51,7 @@ RDEPEND=" " DEPEND="${RDEPEND} media-libs/qhull[static-libs] + test? ( =dev-cpp/catch-2* ) " PATCHES=( diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild new file mode 100644 index 000000000000..5f7e18907896 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 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 + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git" +else + SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/${MY_PN}-version_${MY_PV}" +fi + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +IUSE="test" + +RESTRICT="!test? ( 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:= + media-gfx/libbgcode + 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] + test? ( =dev-cpp/catch-2* ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch" + "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" +) + +src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + fi + + 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 +} + +src_test() { + CMAKE_SKIP_TESTS=( + "^libslic3r_tests$" + ) + cmake_src_test +} diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest index 72d7e390fa15..968522ce401b 100644 --- a/media-gfx/skanpage/Manifest +++ b/media-gfx/skanpage/Manifest @@ -1,5 +1,5 @@ DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158 -DIST skanpage-24.02.2.tar.xz 1322688 BLAKE2B 3a15bfd8555f8e32046d98c89955cd9de6853a3bdf1a87f2383b53a0921b9d4e179952d4acdae10692b6cc5c32dd6274f509ff0337faad73de89a2485231105c SHA512 5d9020e1ed8a94eee4d6ae21ea220f28287ab6ce6dadffcbd6887233acce0d6a37bece072fa8037fb7fc6901084b46734d065f0daa4d180802c1eaec17db7cee +DIST skanpage-24.04.90.tar.xz 1331856 BLAKE2B 9774ea6d2688a287247917a5a46e2644d18f44a7cb0b2c9507620a671cf30c7ec15bb6693cd09b02b25ed3dbfc09915760eb3876e0e34413f686c395fdbfa580 SHA512 89f1c28a9a0fba138635d9487237bfcc051c2cbf3ebfdcbd42b3ca8aea65cee03c469badf476ab89b2e5a3fa0ccdbed577ad028f1f23ec66cf591fd5cddaae0e EBUILD skanpage-23.08.5.ebuild 1383 BLAKE2B 2b2d5cf4582e9d1e4897b1aeb8c8c3b4fa91b753293eb8886c881bb150186a83df2946e8e278f102baf03005b7ae3c8edf9dd8cd7363545fbad33d3f80e04abc SHA512 c0fab6531ac492693bead97c2b231b2379490bb4de55bb05d4df4650599d15a9602521fe03f0afc1dd64b72ac2bdd362a492838bfb690e6adc57fe2a9321701b -EBUILD skanpage-24.02.2.ebuild 1188 BLAKE2B b886ac98062d4c21f8860b71c54cdd2baefc2c8c581ae22e2d6fa63c9f8a02c50f979a5dc6469780f83b6c12b7e3e1a4261b700e76033ff5e7663a81d9858917 SHA512 4fcef9848ab633d91227924cb3820f578247bc9ec578d94cec82245338ad850a4aa7cfea0dd1a1db8bf43e16fbcd6be3cc3bbe01819f9fe92b0d74722c19f31a +EBUILD skanpage-24.04.90.ebuild 1233 BLAKE2B 5cfe97b4474dc4399a2aba88361ff7c506278473753607804446db67646f3543ffdeee7f035303eaf7ac65c0aa5b4c2af67472c286c3057f1be51dee62d86eea SHA512 868902d4fa8a5294e0ac005c60905f6e9a4545e1cc8799f2e002b8187810e6a5e1c4c148222fa4afb81dd25120f640479373437233cc2eb138b527f948ac12ed MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8 diff --git a/media-gfx/skanpage/skanpage-24.02.2.ebuild b/media-gfx/skanpage/skanpage-24.02.2.ebuild deleted file mode 100644 index e0570e462b5f..000000000000 --- a/media-gfx/skanpage/skanpage-24.02.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY="utilities" -PVCUT=$(ver_cut 1-3) -KFMIN=6.0.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org - -DESCRIPTION="Multi-page scanning application supporting image and pdf files" -HOMEPAGE="https://apps.kde.org/skanpage/" - -LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" -SLOT="6" -KEYWORDS="~amd64" -IUSE="ocr" - -DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/purpose-${KFMIN}:6 - media-libs/kquickimageeditor:6 - >=media-libs/ksanecore-${PVCUT}:6 - ocr? ( - app-text/tesseract:= - media-libs/leptonica:= - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package ocr Tesseract) - $(cmake_use_find_package ocr Leptonica) - ) - ecm_src_configure -} diff --git a/media-gfx/skanpage/skanpage-24.04.90.ebuild b/media-gfx/skanpage/skanpage-24.04.90.ebuild new file mode 100644 index 000000000000..3a2f60a0cff1 --- /dev/null +++ b/media-gfx/skanpage/skanpage-24.04.90.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Multi-page scanning application supporting image and pdf files" +HOMEPAGE="https://apps.kde.org/skanpage/" + +LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" +SLOT="6" +KEYWORDS="~amd64" +IUSE="ocr" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[pdfium] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + media-libs/kquickimageeditor:6 + >=media-libs/ksanecore-${PVCUT}:6 + ocr? ( + >=app-text/tesseract-5:= + media-libs/leptonica:= + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package ocr Tesseract) + $(cmake_use_find_package ocr Leptonica) + ) + ecm_src_configure +} -- cgit v1.2.3