diff options
| author |   Christophe Lermytte <gentoo@lermytte.be> | 2022-02-24 23:10:07 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-02-24 22:26:54 +0000 |
| commit | c2e007c630acea68b4be35af63ebc1accb33b210 (patch) | |
| tree | a296ae58919491e9b388f89bf52ce7612aad6e11 /media-gfx | |
| parent | dev-python/APScheduler: Bump to 3.9.0 (diff) | |
| download | gentoo-c2e007c630acea68b4be35af63ebc1accb33b210.tar.gz gentoo-c2e007c630acea68b4be35af63ebc1accb33b210.tar.bz2 gentoo-c2e007c630acea68b4be35af63ebc1accb33b210.zip | |
media-gfx/prusaslicer: fix build with cereal-1.3.1
Upstream patch on master branch, should make it in the new release.
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Closes: https://bugs.gentoo.org/834005
Closes: https://github.com/gentoo/gentoo/pull/24341
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/prusaslicer/files/2.4.0-fix-build-with-cereal-1.3.1.patch | 47 | ||||
| -rw-r--r-- | media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild | 4 |
2 files changed, 51 insertions, 0 deletions
diff --git a/media-gfx/prusaslicer/files/2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/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/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-r2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild index c6e7e07d2d27..e3318ba01834 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild @@ -49,6 +49,10 @@ DEPEND="${RDEPEND} media-libs/qhull[static-libs] " +PATCHES=( + "${FILESDIR}"/${PV}-fix-build-with-cereal-1.3.1.patch +) + S="${WORKDIR}/${MY_PN}-version_${PV}" src_prepare() { |