Thursday, August 22, 2024

UPDATE: cad/prusaslicer-2.8.0

Here is the diff updating cad/prusaslicer to 2.8.0. This requires
updated devel/libbgcode (20240328) and devel/tbb (2021.13.0) previously
posted to the list.


diff --git a/cad/prusaslicer/Makefile b/cad/prusaslicer/Makefile
index 3ecf73964bc..65a7de00696 100644
--- a/cad/prusaslicer/Makefile
+++ b/cad/prusaslicer/Makefile
@@ -2,9 +2,8 @@ COMMENT = g-code generator for 3D printers
ONLY_FOR_ARCHS = ${LP64_ARCHS}
DPB_PROPERTIES = parallel

-V = 2.7.4
+V = 2.8.0
PKGNAME = prusaslicer-${V}
-REVISION = 0

GH_ACCOUNT = prusa3d
GH_PROJECT = PrusaSlicer
@@ -25,16 +24,16 @@ WANTLIB += TKLCAF TKMath TKMesh TKPrim TKService TKShHealing TKTopAlgo
WANTLIB += TKV3d TKVCAF TKXCAF TKXSBase TKernel X11 atk-1.0 bgcode_binarize
WANTLIB += bgcode_convert bgcode_core boost_atomic-mt boost_chrono-mt
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_iostreams-mt
-WANTLIB += boost_locale-mt boost_log-mt boost_log_setup-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_thread-mt c cairo cairo-gobject
-WANTLIB += curl dbus-1 execinfo expat fontconfig freetype gdk-3
+WANTLIB += boost_locale-mt boost_log-mt boost_log_setup-mt boost_nowide-mt
+WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo cairo-gobject
+WANTLIB += curl crypto dbus-1 execinfo expat fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp gmpxx gobject-2.0
WANTLIB += gtk-3 harfbuzz hidapi-libusb intl jpeg m mpfr nlopt
-WANTLIB += openvdb pango-1.0 pangocairo-1.0 png qhull_r tbb tbbmalloc
-WANTLIB += tiff wayland-client wayland-egl wx_baseu-3.2 wx_gtk3u_core-3.2
-WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 z
+WANTLIB += openvdb pango-1.0 pangocairo-1.0 png qhull_r ssl tbb tbbmalloc
+WANTLIB += wayland-client wayland-egl wx_baseu-3.2 wx_gtk3u_core-3.2
+WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 wx_gtk3u_webview-3.2 z

-FIX_CRLF_FILES = src/libslic3r/Point.hpp src/slic3r/GUI/GLCanvas3D.cpp
+FIX_CRLF_FILES = src/slic3r/GUI/GLCanvas3D.cpp

COMPILER = base-clang ports-gcc

@@ -65,7 +64,8 @@ LIB_DEPENDS = cad/opencascade \
net/curl \
wayland/wayland \
x11/dbus \
- x11/wxWidgets
+ x11/wxWidgets \
+ x11/wxWidgets,-webview

CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_MODULE_PATH=${PREFIX}/lib/cmake/OpenVDB \
diff --git a/cad/prusaslicer/distinfo b/cad/prusaslicer/distinfo
index edfc4ca2b60..65fb40213de 100644
--- a/cad/prusaslicer/distinfo
+++ b/cad/prusaslicer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.7.4.tar.gz) = Y3CpWTrqxcVlQ+ZtFnq1/QU99VuTdjksLWGE6wv2X8g=
-SIZE (PrusaSlicer-version_2.7.4.tar.gz) = 65396083
+SHA256 (PrusaSlicer-version_2.8.0.tar.gz) = WNSE+Fs02DAm+CILq5g/hV+81ydn0Ih/IfXMOC5bGas=
+SIZE (PrusaSlicer-version_2.8.0.tar.gz) = 69806919
diff --git a/cad/prusaslicer/patches/patch-CMakeLists_txt b/cad/prusaslicer/patches/patch-CMakeLists_txt
index 6977c23d619..305156f2b11 100644
--- a/cad/prusaslicer/patches/patch-CMakeLists_txt
+++ b/cad/prusaslicer/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -218,7 +218,7 @@ if (APPLE)
+@@ -234,7 +234,7 @@ if (APPLE)
endif ()
endif ()

@@ -10,7 +10,7 @@ Index: CMakeLists.txt
find_package(PkgConfig REQUIRED)

if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -641,7 +641,6 @@ elseif (SLIC3R_FHS)
+@@ -658,7 +658,6 @@ elseif (SLIC3R_FHS)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer-gcodeviewer.png
)
endforeach()
diff --git a/cad/prusaslicer/patches/patch-src_CMakeLists_txt b/cad/prusaslicer/patches/patch-src_CMakeLists_txt
index 10a71007640..e7fd150d2bd 100644
--- a/cad/prusaslicer/patches/patch-src_CMakeLists_txt
+++ b/cad/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,10 +1,10 @@
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -33,8 +33,8 @@ endif ()
-
+@@ -32,8 +32,8 @@ endif ()
if (SLIC3R_GUI)
add_subdirectory(imgui)
+ add_subdirectory(libvgcode)
- add_subdirectory(hidapi)
- include_directories(hidapi/include)
+ pkg_check_modules(HIDAPI REQUIRED hidapi-libusb)
@@ -12,7 +12,7 @@ Index: src/CMakeLists.txt

if(WIN32)
message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
-@@ -158,6 +158,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
+@@ -150,6 +150,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
elseif (APPLE)
target_link_libraries(PrusaSlicer "-framework OpenGL")
diff --git a/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp b/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
index dd8a7cb00c5..b66cda7f908 100644
--- a/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
+++ b/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
@@ -1,7 +1,7 @@
Index: src/PrusaSlicer.cpp
--- src/PrusaSlicer.cpp.orig
+++ src/PrusaSlicer.cpp
-@@ -770,8 +770,8 @@ bool CLI::setup(int argc, char **argv)
+@@ -803,8 +803,8 @@ bool CLI::setup(int argc, char **argv)

No comments:

Post a Comment