pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Update wxWidgets dep to 3.2 stable & patch for EGL initialisation failure



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Thu Jun 8 15:27:23 2023 +1000
Changeset:	09437cbee9c2af88a50ae5dede06d33ba5d6dfef

Modified Files:
	prusaslicer/Makefile
	prusaslicer/distinfo
Added Files:
	prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp

Log Message:
prusaslicer: Update wxWidgets dep to 3.2 stable & patch for EGL initialisation failure

aiui, the EGL init failure will be eventually fixed in glew?

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09437cbee9c2af88a50ae5dede06d33ba5d6dfef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/Makefile                                    |  2 +-
 prusaslicer/distinfo                                    |  1 +
 .../patches/patch-src_slic3r_GUI_OpenGLManager.cpp      | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index 3f4934d434..2f68d220c6 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -67,7 +67,7 @@ CMAKE_ARGS+=	-DSLIC3R_FHS:BOOL=TRUE
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/wxGTK31/buildlink3.mk"
+.include "../../x11/wxGTK32/buildlink3.mk"
 .include "../../x11/xcb-proto/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
 
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 9cddbbdda1..ef577cee60 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -38,6 +38,7 @@ SHA1 (patch-src_slic3r_GUI_InstanceCheck.hpp) = 2af0741f480c41d5cc5bd9d3e55480c8
 SHA1 (patch-src_slic3r_GUI_KBShortcutsDialog.cpp) = 82a395a10e9d0a1b049863d8d30bce2ed99cb5f2
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.cpp) = bf8bf60e17e304a2022b9a80852d7ab38fc2451d
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 6a008114e932b08951428b6fa882b41acaa85c0b
+SHA1 (patch-src_slic3r_GUI_OpenGLManager.cpp) = 594d8a99824fead23010cdbf8f97d8ba6727ddbe
 SHA1 (patch-src_slic3r_GUI_OptionsGroup.cpp) = c413f24a9a50069b93bdd611b95fa85ccab45567
 SHA1 (patch-src_slic3r_GUI_Plater.cpp) = a9c45bac6bf524b411882f3eedc859401e8a1a35
 SHA1 (patch-src_slic3r_GUI_Preferences.cpp) = 522ee0f2b024836b2b1d5521f0d368c3dd2c24c5
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp
new file mode 100644
index 0000000000..9e73f8bc25
--- /dev/null
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Workaround EGL initialisation failure.
+See discussions at, eg:
+https://github.com/nigels-com/glew/issues/273
+
+--- src/slic3r/GUI/OpenGLManager.cpp.orig	2023-06-02 13:41:15.000000000 +0000
++++ src/slic3r/GUI/OpenGLManager.cpp
+@@ -336,7 +336,7 @@ bool OpenGLManager::init_gl()
+         glewExperimental = true;
+ #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
+         GLenum err = glewInit();
+-        if (err != GLEW_OK) {
++        if (err != GLEW_OK && err != GLEW_ERROR_NO_GLX_DISPLAY) {
+             BOOST_LOG_TRIVIAL(error) << "Unable to init glew library: " << glewGetErrorString(err);
+             return false;
+         }


Home | Main Index | Thread Index | Old Index