subject:"UPDATE\: cad\/prusaslicer 2.8.1"

Re: UPDATE: cad/prusaslicer 2.8.1

2024-11-22 Thread Stuart Henderson

On 2024/11/21 23:25, Renato Aguiar wrote:
> Diff updating cad/prusaslicer to 2.8.1:

Not sure if there's more that will be needed, but that includes at least
one commit that should help with newer boost

https://github.com/prusa3d/PrusaSlicer/commit/0b7616c121983e20956afe465d63b4b908b992fd

Diff LGTM.

> diff refs/remotes/upstream/master refs/heads/master
> commit - 62bbb427796aca41bf36017f257b21f31fb5c9db
> commit + 43a6f329399e4b81ced0b4fde610ce8e877fb881
> blob - 65a7de00696b242cfc68f83f2b52583e4adf93b9
> blob + 84b8fbcab46fcd30fb7e5eaf9b5cc89f49cd551b
> --- cad/prusaslicer/Makefile
> +++ cad/prusaslicer/Makefile
> @@ -2,7 +2,7 @@ COMMENT = g-code generator for 3D printers
>  ONLY_FOR_ARCHS = ${LP64_ARCHS}
>  DPB_PROPERTIES = parallel
>  
> -V =  2.8.0
> +V =  2.8.1
>  PKGNAME =prusaslicer-${V}
>  
>  GH_ACCOUNT = prusa3d
> @@ -25,13 +25,15 @@ WANTLIB += TKV3d TKVCAF TKXCAF TKXSBase TKernel X11 at
>  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_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 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
> +WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo
> +WANTLIB += cairo-gobject crypto curl dbus-1 execinfo expat fontconfig
> +WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
> +WANTLIB += gmp gmpxx gobject-2.0 gtk-3 harfbuzz hidapi-libusb
> +WANTLIB += intl javascriptcoregtk-4.1 jpeg m mpfr nlopt openvdb
> +WANTLIB += pango-1.0 pangocairo-1.0 png qhull_r soup-3.0 ssl tbb
> +WANTLIB += tbbmalloc wayland-client wayland-egl webkit2gtk-4.1
> +WANTLIB += wx_baseu-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2
> +WANTLIB += wx_gtk3u_webview-3.2 z
>  
>  FIX_CRLF_FILES = src/slic3r/GUI/GLCanvas3D.cpp
>  
> @@ -73,4 +75,7 @@ CONFIGURE_ARGS +=   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
>   -DSLIC3R_GTK=3 \
>   -DSLIC3R_PCH=OFF
>  
> +post-extract:
> + rm ${WRKDIST}/cmake/modules/FindEigen3.cmake
> +
>  .include 
> blob - 65fb40213de24a9b0aedef889831b313adf402e3
> blob + 2ea6f5d19aac4b521d3cf9164c2221e275bd8d3a
> --- cad/prusaslicer/distinfo
> +++ cad/prusaslicer/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (PrusaSlicer-version_2.8.0.tar.gz) = 
> WNSE+Fs02DAm+CILq5g/hV+81ydn0Ih/IfXMOC5bGas=
> -SIZE (PrusaSlicer-version_2.8.0.tar.gz) = 69806919
> +SHA256 (PrusaSlicer-version_2.8.1.tar.gz) = 
> 9xAz3U6f3Y5ax7W+WAPQ1tCewP2H3pKxUrPGu64EwQM=
> +SIZE (PrusaSlicer-version_2.8.1.tar.gz) = 69409077
> blob - 305156f2b113d16f14d2bb0c821970b75c63373a
> blob + 93bcd6e59d035b72952d1f3e096b1252326ab34c
> --- cad/prusaslicer/patches/patch-CMakeLists_txt
> +++ cad/prusaslicer/patches/patch-CMakeLists_txt
> @@ -10,7 +10,7 @@ Index: CMakeLists.txt
>   find_package(PkgConfig REQUIRED)
>   
>   if (CMAKE_VERSION VERSION_LESS "3.1")
> -@@ -658,7 +658,6 @@ elseif (SLIC3R_FHS)
> +@@ -646,7 +646,6 @@ elseif (SLIC3R_FHS)
>   DESTINATION 
> ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME 
> PrusaSlicer-gcodeviewer.png
>   )
>   endforeach()
> blob - e7fd150d2bd46f2a0c20151bcc6c7e3233dde540
> blob + 3b94fa45d7046f70236d6ba992ccb5aa7dd3d420
> --- cad/prusaslicer/patches/patch-src_CMakeLists_txt
> +++ cad/prusaslicer/patches/patch-src_CMakeLists_txt
> @@ -1,18 +1,7 @@
>  Index: src/CMakeLists.txt
>  --- src/CMakeLists.txt.orig
>  +++ src/CMakeLists.txt
> -@@ -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)
> -+include_directories(${HIDAPI_INCLUDE_DIRS})
> - 
> - if(WIN32)
> - message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
> -@@ -150,6 +150,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
> +@@ -136,6 +136,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
>   target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
>   elseif (APPLE)
>   target_link_libraries(PrusaSlicer "-framework OpenGL")
> blob - /dev/null
> blob + eb489e6f7f43021d563608a88da52b344d761321 (mode 644)
> --- /dev/null
> +++ cad/prusaslicer/patches/patch-bundled_deps_CMakeLists_txt
> @@ -0,0 +1,9 @@
> +Index: bundled_deps/CMakeLists.txt
> +--- bundled_deps/CMakeLists.txt.orig
>  bundled_deps/CMakeLists.txt
> +@@ -45,5 +45,4 @@ target_include_direct

UPDATE: cad/prusaslicer 2.8.1

2024-11-21 Thread Renato Aguiar

Diff updating cad/prusaslicer to 2.8.1:


diff refs/remotes/upstream/master refs/heads/master
commit - 62bbb427796aca41bf36017f257b21f31fb5c9db
commit + 43a6f329399e4b81ced0b4fde610ce8e877fb881
blob - 65a7de00696b242cfc68f83f2b52583e4adf93b9
blob + 84b8fbcab46fcd30fb7e5eaf9b5cc89f49cd551b
--- cad/prusaslicer/Makefile
+++ cad/prusaslicer/Makefile
@@ -2,7 +2,7 @@ COMMENT =   g-code generator for 3D printers
 ONLY_FOR_ARCHS = ${LP64_ARCHS}
 DPB_PROPERTIES = parallel
 
-V =2.8.0
+V =2.8.1
 PKGNAME =  prusaslicer-${V}
 
 GH_ACCOUNT =   prusa3d
@@ -25,13 +25,15 @@ WANTLIB += TKV3d TKVCAF TKXCAF TKXSBase TKernel X11 at
 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_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 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
+WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo
+WANTLIB += cairo-gobject crypto curl dbus-1 execinfo expat fontconfig
+WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gmp gmpxx gobject-2.0 gtk-3 harfbuzz hidapi-libusb
+WANTLIB += intl javascriptcoregtk-4.1 jpeg m mpfr nlopt openvdb
+WANTLIB += pango-1.0 pangocairo-1.0 png qhull_r soup-3.0 ssl tbb
+WANTLIB += tbbmalloc wayland-client wayland-egl webkit2gtk-4.1
+WANTLIB += wx_baseu-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2
+WANTLIB += wx_gtk3u_webview-3.2 z
 
 FIX_CRLF_FILES =   src/slic3r/GUI/GLCanvas3D.cpp
 
@@ -73,4 +75,7 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSLIC3R_GTK=3 \
-DSLIC3R_PCH=OFF
 
+post-extract:
+   rm ${WRKDIST}/cmake/modules/FindEigen3.cmake
+
 .include 
blob - 65fb40213de24a9b0aedef889831b313adf402e3
blob + 2ea6f5d19aac4b521d3cf9164c2221e275bd8d3a
--- cad/prusaslicer/distinfo
+++ cad/prusaslicer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.8.0.tar.gz) = 
WNSE+Fs02DAm+CILq5g/hV+81ydn0Ih/IfXMOC5bGas=
-SIZE (PrusaSlicer-version_2.8.0.tar.gz) = 69806919
+SHA256 (PrusaSlicer-version_2.8.1.tar.gz) = 
9xAz3U6f3Y5ax7W+WAPQ1tCewP2H3pKxUrPGu64EwQM=
+SIZE (PrusaSlicer-version_2.8.1.tar.gz) = 69409077
blob - 305156f2b113d16f14d2bb0c821970b75c63373a
blob + 93bcd6e59d035b72952d1f3e096b1252326ab34c
--- cad/prusaslicer/patches/patch-CMakeLists_txt
+++ cad/prusaslicer/patches/patch-CMakeLists_txt
@@ -10,7 +10,7 @@ Index: CMakeLists.txt
  find_package(PkgConfig REQUIRED)
  
  if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -658,7 +658,6 @@ elseif (SLIC3R_FHS)
+@@ -646,7 +646,6 @@ elseif (SLIC3R_FHS)
  DESTINATION 
${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME 
PrusaSlicer-gcodeviewer.png
  )
  endforeach()
blob - e7fd150d2bd46f2a0c20151bcc6c7e3233dde540
blob + 3b94fa45d7046f70236d6ba992ccb5aa7dd3d420
--- cad/prusaslicer/patches/patch-src_CMakeLists_txt
+++ cad/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,18 +1,7 @@
 Index: src/CMakeLists.txt
 --- src/CMakeLists.txt.orig
 +++ src/CMakeLists.txt
-@@ -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)
-+include_directories(${HIDAPI_INCLUDE_DIRS})
- 
- if(WIN32)
- message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
-@@ -150,6 +150,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
+@@ -136,6 +136,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
  target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
  elseif (APPLE)
  target_link_libraries(PrusaSlicer "-framework OpenGL")
blob - /dev/null
blob + eb489e6f7f43021d563608a88da52b344d761321 (mode 644)
--- /dev/null
+++ cad/prusaslicer/patches/patch-bundled_deps_CMakeLists_txt
@@ -0,0 +1,9 @@
+Index: bundled_deps/CMakeLists.txt
+--- bundled_deps/CMakeLists.txt.orig
 bundled_deps/CMakeLists.txt
+@@ -45,5 +45,4 @@ target_include_directories(tcbspan INTERFACE tcbspan)
+ 
+ if (SLIC3R_GUI)
+ add_subdirectory(imgui)
+-add_subdirectory(hidapi)
+ endif ()
blob - b66cda7f908b8564b626fa28b497f09b7f6ae222
blob + ef0f62cea48485573e9d8af519e00fd29129c098
--- cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
+++ cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp
@@ -1,7 +1,7 @@
 Index: src/PrusaSlicer.cpp
 --- src/PrusaSlicer.cpp.orig
 +++ src/PrusaSlicer.cpp
-@@ -803,8 +803,8 @@ bool CL

Re: UPDATE: cad/prusaslicer 2.8.1

UPDATE: cad/prusaslicer 2.8.1

2 matches

Site Navigation

Mail list logo

Footer information