gentoo resync : 20.03.2022

5 files changed, 83 insertions, 52 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index b414593f9cdc..e2d87e7f66e9 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,6 +1,6 @@
-AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
-DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
+AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
-EBUILD prusaslicer-2.3.3-r1.ebuild 2091 BLAKE2B b9193ade560bc73c04f5d09cf8ecf41ea58d18a4672df9244420935bea887a101847cc39e44f4bde6318c4091826f511890a2f48c05c682de3f11cebbea192cd SHA512 0892aa78102d8cc6984a379603ffec364750d82b34e07e0c618673e16c4185db8769a3808f3a77c267171537ce4600b2bf364d7755440a9e5c659712c758dd92
-EBUILD prusaslicer-2.4.0-r1.ebuild 1545 BLAKE2B 2254a52fa2a97ea6c96a24121fb69397fec2fe0fe7d61a81b96f509cb9268a03fc0fc83d4ff34d72fabb580b94a03b84cfb6b8b1234b289bd3392df07b6e57a3 SHA512 bf07c03079c87a822c688aaa0f1758828acfee6f079062ae1f341a2e352302185bcc60e5729cf0613865606dc1c51f5c710cb52f24a37c7af49d07317739a330
+DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7 SHA512 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
+EBUILD prusaslicer-2.4.0-r2.ebuild 1677 BLAKE2B 1dfd7abe15a808fce2e03d8b561e183e8174e5e3fa3655d760cf376b7b77042473ebcfc3bf648020002426f47b7a8bf599057da578b3a6027f95b7f4387a0d9a SHA512 0cd62a20ca04af6ca609a0020c3f80f300a7092b23b319b557ca557733d38bf6cecdad9889c8594f51b65a3d45f25d0930d4de59faa443be74171539a557b659
+EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
deleted file mode 100644
index 8fd587d3d481..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
+++ /dev/null
@@ -1,9 +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 {
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
new file mode 100644
index 000000000000..d57eb8a31728
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/834005
+https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -506,6 +506,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
+@@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer 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
+@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -270,7 +270,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
index 51a5b4378a17..f0e766df6b30 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,17 +22,17 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0
+	>=dev-cpp/tbb-2021.4.0:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/gmp:=
 	dev-libs/mpfr:=
-	>=media-gfx/openvdb-8.2
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
 	net-misc/curl
 	media-libs/glew:0=
-	media-libs/ilmbase:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/libigl
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-with-cereal-1.3.1.patch
+)
+
 S="${WORKDIR}/${MY_PN}-version_${PV}"
 
 src_prepare() {
@@ -62,6 +66,8 @@ src_configure() {
 	setup-wxwidgets
 
 	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
 		-DSLIC3R_BUILD_TESTS=$(usex test)
 		-DSLIC3R_FHS=ON
 		-DSLIC3R_GTK=3
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
index 8504f9ddf60e..c402f1a876fd 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit xdg cmake desktop wxwidgets
+inherit cmake desktop wxwidgets xdg
 
 MY_PN="PrusaSlicer"
 
@@ -16,24 +16,23 @@ SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gui test"
+IUSE="test"
 
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
 RESTRICT="!test? ( test )"
 
-# Please check if works with newer TBB on next release, bug #820785
 RDEPEND="
 	dev-cpp/eigen:3
-	<dev-cpp/tbb-2021.4.0:=
+	>=dev-cpp/tbb-2021.4.0:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
+	dev-libs/glib:2
 	dev-libs/gmp:=
-	>=dev-libs/miniz-2.1.0-r2
 	dev-libs/mpfr:=
-	>=media-gfx/openvdb-5.0.0
-	media-libs/ilmbase:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl
+	media-libs/glew:0=
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/libigl
@@ -41,26 +40,21 @@ RDEPEND="
 	>=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:${WX_GTK_VER}[X,opengl]
-	)
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 "
 DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
-S="${WORKDIR}/${MY_PN}-version_${PV}"
-
 PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch"
+	"${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
 )
 
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
 src_prepare() {
 	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
 	cmake_src_prepare
@@ -69,27 +63,20 @@ src_prepare() {
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 
-	use gui && setup-wxwidgets
+	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=$(usex gui)
+		-DSLIC3R_GUI=ON
 		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
 		-DSLIC3R_WX_STABLE=ON
 		-Wno-dev
 	)
 
 	cmake_src_configure
 }
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
-		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
-		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
-	fi
-}