From: Klemens Nanni <kn@openbsd.org>
Subject: Re: [maintainer update] graphics/glfw 3.3.9
To: Kurt Mosiejczuk <kurt@cranky.work>, OpenBSD Ports <ports@openbsd.org>
Date: Tue,  6 Feb 2024 04:09:55 +0000

On Mon, Feb 05, 2024 at 10:33:25PM -0500, Kurt Mosiejczuk wrote:
> https://www.glfw.org/changelog.html
> 
> Various bugfixes.
> 
> Tested with Minecraft via Blockgames. No regressions that I've seen.

bonzomatic is happy, too.

> ok?

You have NO_TEST=Yes, but tests are still compiled.
Either en- or disable them properly (115 -> 45 cmake targets).

HOMEPAGE has TLS, port-lib-depends-check shows extra WANTLIB.

is patch-deps_getopt_c from 2017 still needed?  Builds without...
	XXX borrow variables from system getopt, work-around clang bug.

patch-CMakeLists_txt (-lrt omission) seems unneeded as cmake gracefully
skips linking if librt wasn't found.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/glfw/Makefile,v
diff -u -p -r1.11 Makefile
--- Makefile	26 Sep 2023 11:39:04 -0000	1.11
+++ Makefile	6 Feb 2024 03:58:48 -0000
@@ -1,25 +1,26 @@
 COMMENT =	open source, multi-platform library for creating windows
 
-V =		3.3.8
+V =		3.3.9
 DISTNAME =	glfw-${V}
 CATEGORIES =	graphics x11
 
 SHARED_LIBS +=  glfw                      1.1 # 3.1
 
-HOMEPAGE =	http://www.glfw.org/
+HOMEPAGE =	https://www.glfw.org/
 MAINTAINER =	Kurt Mosiejczuk <kmos@openbsd.org>
 
 # zlib
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += X11 Xcursor Xinerama Xrandr Xxf86vm m pthread
+WANTLIB =	X11 m pthread
 
 SITES =		https://github.com/glfw/glfw/releases/download/${V}/
 EXTRACT_SUFX =	.zip
 
 MODULES =	devel/cmake
 
-CONFIGURE_ARGS =	-DBUILD_SHARED_LIBS=ON
+CONFIGURE_ARGS =	-DBUILD_SHARED_LIBS=ON \
+			-DGLFW_BUILD_TESTS=OFF
 
 CFLAGS +=		-I${X11BASE}/include
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/glfw/distinfo,v
diff -u -p -r1.7 distinfo
--- distinfo	23 Aug 2022 16:53:25 -0000	1.7
+++ distinfo	6 Feb 2024 03:52:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.3.8.zip) = TQJQg8xKPdH5Grm5uk9YBxk4I+Vlpbz0viAmadmRHqY=
-SIZE (glfw-3.3.8.zip) = 1495490
+SHA256 (glfw-3.3.9.zip) = VSYUEPjDqcxHzoMDRoqQ9AplPNjyX7losSRAYk+ybQg=
+SIZE (glfw-3.3.9.zip) = 1465859
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	8 May 2022 22:29:59 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -168,13 +168,6 @@ endif()
- # Find and add Unix math and time libraries
- #--------------------------------------------------------------------
- if (UNIX AND NOT APPLE)
--    find_library(RT_LIBRARY rt)
--    mark_as_advanced(RT_LIBRARY)
--    if (RT_LIBRARY)
--        list(APPEND glfw_LIBRARIES "${RT_LIBRARY}")
--        list(APPEND glfw_PKG_LIBS "-lrt")
--    endif()
--
-     find_library(MATH_LIBRARY m)
-     mark_as_advanced(MATH_LIBRARY)
-     if (MATH_LIBRARY)
Index: patches/patch-deps_getopt_c
===================================================================
RCS file: patches/patch-deps_getopt_c
diff -N patches/patch-deps_getopt_c
--- patches/patch-deps_getopt_c	11 Mar 2022 19:22:25 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-XXX borrow variables from system getopt, work-around clang bug.
-
-Index: deps/getopt.c
---- deps/getopt.c.orig
-+++ deps/getopt.c
-@@ -33,11 +33,10 @@ const int no_argument = 0;
- const int required_argument = 1;
- const int optional_argument = 2;
- 
--char* optarg;
--int optopt;
--/* The variable optind [...] shall be initialized to 1 by the system. */
--int optind = 1;
--int opterr;
-+extern char *optarg;
-+extern int optopt;
-+extern int optind;
-+extern int opterr;
- 
- static char* optcursor = NULL;
-