gentoo auto-resync : 01:09:2022 - 19:24:10

4 files changed, 36 insertions, 17 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 52f94dc45df0..51663f927fd4 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,8 +1,9 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5
-AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1691 BLAKE2B e8886bdd4a22ac215203422cd9dcc88972d61fcd522f65506a206f23849204175bf56b537f9984bc82b38528b3f08ee9f62020ee0fcb817f237a6b1b33a11be5 SHA512 d8b32d653bc1a21bf12dd75449ee018f04063536d0a519409bf520913b8e89ef3acd185a5351ec7a1225188f2d669d1cfcaf9a2552c509689d24d605aac56209
+AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6
+AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
-DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d SHA512 5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
+DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e SHA512 94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3
 EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1752 BLAKE2B 439d0db2496b075d674bfa74e8284b347bdb170b1b1d0f60fda0ec40c9bb0c578d93bb2a2307e4f077b6b1820bdb5ad830ede7066ee96a5761eecae0f1b19db6 SHA512 2bfd12ae34d061a0c0f8545813361a980929e0997064307ec791ea8b33e0ea26800f975a5da672947c465e8f6fcce4c186ddd2280230b79eaa3f3430307e26e6
-EBUILD prusaslicer-2.5.0_rc1.ebuild 1748 BLAKE2B 29aed6919880bee74596c4b3fdf8f3dedbf37a734d4218a8857bff4618dc1eddc9f68eebf2d8047eaf6086c0406932f0342ba0a8eacfef422db6b846f3fea402 SHA512 d31946306e37652d027deaad4751fa47588d0fcc47b7b0e4aa3c97cbe4f248e5eb5b4dfad4b317cb1dd2ce120db5775347fab4326bcc2b697b0630a37e748a9e
+EBUILD prusaslicer-2.5.0_rc2.ebuild 1970 BLAKE2B a1714b2f38d960ad45ff1c5e0abeb6bac88832ecf40d496180bfed10b8448e2d919e4a416704dff0786793098823ffdd490e1116dabbf0665e8a5e17400399bb SHA512 cf24b0b9acd4696a3a707c4e9a4155487579c47cb2b3e32847005e719503b29ea9c37f9f1ff5b052fd431daef1f36aa8af5fb13440cb4ee27bf0a1b8ddfad6f5
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
index 29e01422b41f..056c6150a7b0 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -1,38 +1,38 @@
---- a/src/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/CMakeLists.txt	(date 1661704655632)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -127,7 +127,7 @@
      set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
  endif ()
 
 -target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
 
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
---- a/src/slic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/slic3r/CMakeLists.txt	(date 1661704724566)
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
 @@ -260,7 +260,7 @@
 
  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})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
 
  if (MSVC)
      target_link_libraries(libslic3r_gui Setupapi.lib)
---- a/src/libslic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/libslic3r/CMakeLists.txt	(date 1661704699199)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
 @@ -395,7 +395,7 @@
  target_link_libraries(libslic3r
      libnest2d
      admesh
 -    cereal
-+    cereal::cereal
++    libcereal
      libigl
      miniz
      boost_libs
---- a/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/CMakeLists.txt	(date 1661704556468)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -446,6 +446,12 @@
 
  # Find the Cereal serialization library
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
new file mode 100644
index 000000000000..c86c585926ab
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
@@ -0,0 +1,14 @@
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -4,10 +4,9 @@
+ #include "libslic3r/GCodeReader.hpp"
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/Print.hpp"
+-#include "libslic3r/Format/OBJ.hpp"
+-#include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
index f99c7d8cc487..a7890eb5a290 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
@@ -29,18 +29,18 @@ RDEPEND="
 	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/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/libigl
 	sci-libs/nlopt
+	=sci-libs/opencascade-7.6*:=
 	>=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]
@@ -51,13 +51,17 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-	"${FILESDIR}/${P}-cereal-1.3.1.patch"
+	"${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+	"${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 src_prepare() {
 	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
 }