On Wed, Jan 27, 2021 at 01:06:02PM -0500, Kurt Mosiejczuk wrote: > This is an update of glfw from 3.2.1 to 3.3.2 > > As far as I can tell, there are only additions to the .so, so I kept > it to a minor bump. > > This is needed for my upcoming port of lwjgl 3.x > > The only real consumer right now is cegui and then sumwars. sumwars doesn't > actually work for me _before_ the update, crashing during character creation. > It performs identically after the update too.
This looks good to me. I built the updated glfw. cegui still builds after the update. The cegui sample CEGUISampleFramework-0.8 fails to run both before and after the glfw update (attached as ceguisampleframework.txt). CC cegui Maintainer. Looks like sumwars is the only consumer of cegui. I was able to run sumwars after changing to "Full Screen=No" in ~/.sumwars/ogre.cfg. In my case, this doesn't crash after character creation. Runs without visible issues both with glfw 3.2.1 and 3.3.2. There were a couple of other proposed diffs to update to 3.3 before [1][2][3], but somehow it never got updated. ok thfr@ [1] https://marc.info/?l=openbsd-ports&m=157723005028167&w=2 [2] https://marc.info/?l=openbsd-ports&m=157859612703067&w=2 [3] https://marc.info/?l=openbsd-ports&m=158610418115958&w=2 > > ok? > > (cc maintainer) > > --Kurt > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/glfw/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 12 Jul 2019 20:46:59 -0000 1.4 > +++ Makefile 27 Jan 2021 18:03:59 -0000 > @@ -1,11 +1,11 @@ > # $OpenBSD: Makefile,v 1.4 2019/07/12 20:46:59 sthen Exp $ > > COMMENT = open source, multi-platform library for creating windows > -DISTNAME = glfw-3.2.1 > +V = 3.3.2 > +DISTNAME = glfw-${V} > CATEGORIES = graphics x11 > -REVISION = 0 > > -SHARED_LIBS += glfw 1.0 # 3.1 > +SHARED_LIBS += glfw 1.1 # 3.1 > > HOMEPAGE = http://www.glfw.org/ > MAINTAINER = Gregor Best <[email protected]> > @@ -15,7 +15,8 @@ PERMIT_PACKAGE = Yes > > WANTLIB += X11 Xcursor Xinerama Xrandr Xxf86vm m pthread > > -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=glfw/} > +MASTER_SITES = https://github.com/glfw/glfw/releases/download/${V}/ > +EXTRACT_SUFX = .zip > > MODULES = devel/cmake > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/graphics/glfw/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 14 Jan 2017 17:29:45 -0000 1.2 > +++ distinfo 27 Jan 2021 18:03:59 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (glfw-3.2.1.tar.gz) = jjJSky+xUTSt7YeAyMXMidoKkAfhOcptmrDtffbT+aA= > -SIZE (glfw-3.2.1.tar.gz) = 870660 > +SHA256 (glfw-3.3.2.zip) = CKM6US8p19v3jqs5vXhYV2rcyVIoye/o5LxfDzJh78c= > +SIZE (glfw-3.3.2.zip) = 1434297 > Index: patches/patch-CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/graphics/glfw/patches/patch-CMakeLists_txt,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 14 Jan 2017 17:29:45 -0000 1.2 > +++ patches/patch-CMakeLists_txt 27 Jan 2021 18:03:59 -0000 > @@ -1,7 +1,8 @@ > $OpenBSD: patch-CMakeLists_txt,v 1.2 2017/01/14 17:29:45 danj Exp $ > ---- CMakeLists.txt.orig Thu Aug 18 07:32:27 2016 > -+++ CMakeLists.txt Fri Jan 13 21:20:41 2017 > -@@ -172,13 +172,6 @@ endif() > +Index: CMakeLists.txt > +--- CMakeLists.txt.orig > ++++ CMakeLists.txt > +@@ -156,13 +156,6 @@ endif() > # Find and add Unix math and time libraries > #-------------------------------------------------------------------- > if (UNIX AND NOT APPLE) > Index: patches/patch-src-egl_context-c > =================================================================== > RCS file: /cvs/ports/graphics/glfw/patches/patch-src-egl_context-c,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-src-egl_context-c > --- patches/patch-src-egl_context-c 14 Jan 2017 17:29:45 -0000 1.2 > +++ patches/patch-src-egl_context-c 27 Jan 2021 18:03:59 -0000 > @@ -1,9 +1,10 @@ > $OpenBSD: patch-src-egl_context-c,v 1.2 2017/01/14 17:29:45 danj Exp $ > ---- src/egl_context.c.orig Thu Aug 18 07:32:27 2016 > -+++ src/egl_context.c Fri Jan 13 21:20:41 2017 > -@@ -615,6 +615,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window, > - { > - #if defined(_GLFW_WIN32) > +Index: src/egl_context.c > +--- src/egl_context.c.orig > ++++ src/egl_context.c > +@@ -657,6 +657,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window, > + _GLFW_OPENGL_LIBRARY, > + #elif defined(_GLFW_WIN32) > #elif defined(_GLFW_COCOA) > +#elif defined(__OpenBSD__) > + "libGL.so", >
$ CEGUISampleFramework-0.8 -- CEGUI Sample Application Framework -- Please select a renderer: 1. OpenGL GUI Renderer. 2. OpenGL 3.2 Core Renderer. 3. Irrlicht GUI Renderer. 1 CEGUISampleFramework-0.8:/usr/local/lib/libfreeimage.so.2.0: /usr/local/lib/libjpeg.so.70.0 : WARNING: symbol(jpeg_std_message_table) size mismatch, relink your program CEGUI::GenericException in function 'virtual CEGUI::Texture *CEGUI::FreeImageImageCodec::load(const CEGUI::RawDataContainer &, CEGUI::Texture *)' (/usr/obj/ports/cegui-0.8.7/cegui-0.8.7/cegui/src/ImageCodecModules/FreeImage/ImageCodec.cpp:108) : Unable to load image, FreeImage_LoadFromMemory failed CEGUI::RendererException in function 'virtual void CEGUI::OpenGLTexture::loadFromFile(const CEGUI::String &, const CEGUI::String &)' (/usr/obj/ports/cegui-0.8.7/cegui-0.8.7/cegui/src/RendererModules/OpenGL/Texture.cpp:246) : FreeImageCodec - FreeImage based image codec failed to load image 'logo.png'. An exception was thrown within the sample framework: CEGUI::RendererException in function 'virtual void CEGUI::OpenGLTexture::loadFromFile(const CEGUI::String &, const CEGUI::String &)' (/usr/obj/ports/cegui-0.8.7/cegui-0.8.7/cegui/src/RendererModules/OpenGL/Texture.cpp:246) : FreeImageCodec - FreeImage based image codec failed to load image 'logo.png'.
