gentoo auto-resync : 16:12:2024 - 02:01:58

3 files changed, 60 insertions, 5 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index f1a7655ddf48..418718866434 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -6,7 +6,8 @@ AUX prusaslicer-2.8.1-fix-libsoup-double-linking.patch 482 BLAKE2B 0b4f0ba5808ac
 AUX prusaslicer-2.8.1-fixed-linking.patch 394 BLAKE2B bb4d6285ee9e199f4d8bed3ecf0a4e0ac814f311a5220958e8a6023a343954bc78454697704ce9ee8bc583a9a536cec249f42b8b3d28fff6515e2499c4de3442 SHA512 b84c966d22be5fda04c8a97421026855289038d69de11ac1a9b053381a35b2e5d3f3354ac51d37ad58f0ba4fec177894de67ef44360b050b9ca61cb06d5a178c
 AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22
 AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49
+AUX prusaslicer-2.9.0-fpic.patch 2470 BLAKE2B c2e97f6451b3b8f3eb791780ab49269767e7a47eb22f085f6559d5009c0dc66ad0f0fffd521f3262f595d8b21a783167094e0b8882c26d37c7bed645d8f51048 SHA512 22d708b0e077e15a83a6a515d10c2aad91674c7fcd0a855470431e1506b98b70f263eae5fe32f1a584b8ad079ed58c3610a9d4e5d88a296d4baebf3afda48ed5
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
 EBUILD prusaslicer-2.8.1-r1.ebuild 2708 BLAKE2B 895f155bc49426f137807be45a3f2942d6255090cecc15657896e21f6fdb4ebc1c144ef474f69ae9487306b36cb83860dcebb09cef73e825e658206933b5d0cc SHA512 cf473a7b8978acffae92d579272ee69717b59e849a052422f0aaf66b6b82357ef85536025d8e6e1c32fada8e907be1ecb81ed19a16e14ade1b6fab132c636b3c
-EBUILD prusaslicer-9999.ebuild 2709 BLAKE2B 720b5d4954e1fa45cc5ca5feaa7f3b71f537cec1e6cb03002ae93676fc8989149fa7e47555fcc83b73f52fb6bd6cee406bdc8b77badfe686b5be7607c9c8789d SHA512 fe5979e54dac63f5ae449207444f3f55780793acbbc2ba3235142802fe5e051c8c94a03b44a0c92b590d29b5c471094fcfa3937aded6088a6f1301c27dd5af9f
+EBUILD prusaslicer-9999.ebuild 2571 BLAKE2B 37a804380047fdb934bd4aa0e59ef2a7eb3ef5a4eb4cd78dd276413fc6922497a8e01f9673468dfbac0816d48d205b0c66e0d4fa38af4d9c208fa58fbaafaf05 SHA512 ea743a8c7bddfeea7bc44c9e27bc8e79590be434b628d12fdcbd1d4f7f8f62e644d59e492b7412fc7fb73f62fc8c9d6d67733dfc4e7983c713cfc6f0c14c6755
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch
new file mode 100644
index 000000000000..ea6e297e96db
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch
@@ -0,0 +1,57 @@
+--- a/bundled_deps/admesh/CMakeLists.txt
++++ b/bundled_deps/admesh/CMakeLists.txt
+@@ -14,3 +14,4 @@ add_library(admesh STATIC
+ target_include_directories(admesh PUBLIC .)
+ target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
+ target_link_libraries(admesh PUBLIC Eigen3::Eigen)
++set_target_properties(admesh PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/bundled_deps/glu-libtess/CMakeLists.txt
++++ b/bundled_deps/glu-libtess/CMakeLists.txt
+@@ -34,3 +34,4 @@ if(UNIX)
+ endif(UNIX)
+ 
+ target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
++set_target_properties(glu-libtess PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/bundled_deps/miniz/CMakeLists.txt
++++ b/bundled_deps/miniz/CMakeLists.txt
+@@ -7,6 +7,7 @@ add_library(miniz_static STATIC
+     miniz.c
+     miniz.h
+ )
++set_target_properties(miniz_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+     target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE)
+--- a/bundled_deps/CMakeLists.txt
++++ b/bundled_deps/CMakeLists.txt
+@@ -33,6 +33,7 @@ add_library(localesutils STATIC
+ )
+ target_include_directories(localesutils PUBLIC localesutils)
+ target_link_libraries(localesutils PRIVATE fastfloat)
++set_target_properties(localesutils PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ add_library(ankerl INTERFACE)
+ target_include_directories(ankerl INTERFACE ankerl)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -532,6 +532,7 @@ add_library(libslic3r_cgal STATIC
+     TryCatchSignal.hpp TryCatchSignal.cpp
+     Triangulation.hpp Triangulation.cpp
+ )
++set_target_properties(libslic3r_cgal PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ target_include_directories(libslic3r_cgal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
+ 
+@@ -622,3 +623,5 @@ endif ()
+ if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
+     add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
+ endif ()
++
++set_target_properties(libslic3r PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/src/clipper/CMakeLists.txt
++++ b/src/clipper/CMakeLists.txt
+@@ -12,3 +12,4 @@ add_library(clipper STATIC
+ target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128)
+ target_link_libraries(clipper PUBLIC Eigen3::Eigen)
+ target_include_directories(clipper PUBLIC .)
++set_target_properties(clipper PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index 66c1089c97e8..1832088d5630 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -64,10 +64,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
 	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
 	"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
-	"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
 	"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
 	"${FILESDIR}/${PN}-2.8.1-fstream.patch"
 	"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+	"${FILESDIR}/${PN}-2.9.0-fpic.patch"
 )
 
 src_prepare() {
@@ -80,9 +80,6 @@ src_prepare() {
 	sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
 		src/occt_wrapper/CMakeLists.txt || die
 
-	# remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608
-	rm cmake/modules/FindEigen3.cmake || die
-
 	cmake_src_prepare
 }