CVS commit: pkgsrc/graphics/glfw

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 19 11:23:54 UTC 2020

Modified Files:
        pkgsrc/graphics/glfw: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/glfw: options.mk

Log Message:
glfw: Update to 3.3.2

This is a primarily a bug fix release. It improves Vulkan support on macOS with VK_EXT_metal_surface support and better run-time loading, and adds fixes for issues on Windows, macOS and X11.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/glfw/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/glfw/PLIST \
    pkgsrc/graphics/glfw/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/glfw/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/glfw/options.mk

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

Modified files:

Index: pkgsrc/graphics/glfw/Makefile
diff -u pkgsrc/graphics/glfw/Makefile:1.6 pkgsrc/graphics/glfw/Makefile:1.7
--- pkgsrc/graphics/glfw/Makefile:1.6   Sat Dec 21 23:42:35 2019
+++ pkgsrc/graphics/glfw/Makefile       Thu Mar 19 11:23:53 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2019/12/21 23:42:35 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/19 11:23:53 nia Exp $
 
-DISTNAME=      glfw-3.3
+DISTNAME=      glfw-3.3.2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=glfw/}
 
 MAINTAINER=    ryo_on%yk.rim.or.jp@localhost
 HOMEPAGE=      https://www.glfw.org/
-COMMENT=       GLFW is a free, Open Source, multi-platform library of OpenGL
+COMMENT=       Free, portable framework for OpenGL application development
 LICENSE=       zlib
 
 USE_CMAKE=     yes
@@ -14,17 +14,12 @@ USE_TOOLS+= pkg-config
 
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=   -DGLFW_BUILD_DOCS=OFF
+CMAKE_ARGS+=   -DGLFW_BUILD_EXAMPLES=OFF
 
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.  include "options.mk"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../graphics/glu/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/glfw/PLIST
diff -u pkgsrc/graphics/glfw/PLIST:1.3 pkgsrc/graphics/glfw/PLIST:1.4
--- pkgsrc/graphics/glfw/PLIST:1.3      Sun Oct  6 11:32:18 2019
+++ pkgsrc/graphics/glfw/PLIST  Thu Mar 19 11:23:53 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/10/06 11:32:18 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/19 11:23:53 nia Exp $
 include/GLFW/glfw3.h
 include/GLFW/glfw3native.h
 lib/cmake/glfw3/glfw3Config.cmake
@@ -7,5 +7,5 @@ lib/cmake/glfw3/glfw3Targets-noconfig.cm
 lib/cmake/glfw3/glfw3Targets.cmake
 lib/libglfw.so
 lib/libglfw.so.3
-lib/libglfw.so.${PKGVERSION}
+lib/libglfw.so.3.3
 lib/pkgconfig/glfw3.pc
Index: pkgsrc/graphics/glfw/distinfo
diff -u pkgsrc/graphics/glfw/distinfo:1.3 pkgsrc/graphics/glfw/distinfo:1.4
--- pkgsrc/graphics/glfw/distinfo:1.3   Sun Oct  6 11:32:18 2019
+++ pkgsrc/graphics/glfw/distinfo       Thu Mar 19 11:23:53 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/10/06 11:32:18 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/03/19 11:23:53 nia Exp $
 
-SHA1 (glfw-3.3.tar.gz) = 0ac684c93a675c4b59ea53589709e186990e700d
-RMD160 (glfw-3.3.tar.gz) = fcd42ec35756bf37e2416e0cabe0caceed568fa8
-SHA512 (glfw-3.3.tar.gz) = e74bb7ba0c1c3a524a193c4fb5a2d13ba0e75f8e309612ea19cdcc944859d6e2fe29d8b2e3db76236e1011b637564ddd5f4a176dcccfeb84d09bda060f08f774
-Size (glfw-3.3.tar.gz) = 758352 bytes
+SHA1 (glfw-3.3.2.tar.gz) = c3eea7eb56b1f316da3d18a907d6fd370cfa8d5d
+RMD160 (glfw-3.3.2.tar.gz) = 8ac4d29c5087ee61c1b835115aad102245acd2ca
+SHA512 (glfw-3.3.2.tar.gz) = f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
+Size (glfw-3.3.2.tar.gz) = 759972 bytes

Index: pkgsrc/graphics/glfw/buildlink3.mk
diff -u pkgsrc/graphics/glfw/buildlink3.mk:1.1 pkgsrc/graphics/glfw/buildlink3.mk:1.2
--- pkgsrc/graphics/glfw/buildlink3.mk:1.1      Thu Feb  4 11:38:10 2016
+++ pkgsrc/graphics/glfw/buildlink3.mk  Thu Mar 19 11:23:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/02/04 11:38:10 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/03/19 11:23:53 nia Exp $
 
 BUILDLINK_TREE+=       glfw
 
@@ -8,16 +8,22 @@ GLFW_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.glfw+=   glfw>=3.1.2
 BUILDLINK_PKGSRCDIR.glfw?=     ../../graphics/glfw
 
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+pkgbase:= glfw
+
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.glfw:Mx11)
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.endif
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../graphics/glu/buildlink3.mk"
+.endif
+
 .endif # GLFW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -glfw

Added files:

Index: pkgsrc/graphics/glfw/options.mk
diff -u /dev/null pkgsrc/graphics/glfw/options.mk:1.1
--- /dev/null   Thu Mar 19 11:23:54 2020
+++ pkgsrc/graphics/glfw/options.mk     Thu Mar 19 11:23:53 2020
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1 2020/03/19 11:23:53 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.glfw
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+PKG_OPTIONS_REQUIRED_GROUPS=   context
+# wayland currently broken...
+#PKG_OPTIONS_GROUP.context=    osmesa wayland x11
+PKG_OPTIONS_GROUP.context=     osmesa x11
+PKG_SUGGESTED_OPTIONS=         x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mosmesa)
+CMAKE_ARGS+=   -DGLFW_USE_OSMESA=ON
+.endif
+
+.if !empty(PKG_OPTIONS:Mwayland)
+CMAKE_ARGS+=   -DGLFW_USE_WAYLAND=ON
+.  include "../../devel/wayland/buildlink3.mk"
+.  include "../../devel/wayland-protocols/buildlink3.mk"
+.  include "../../x11/libxkbcommon/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../x11/libICE/buildlink3.mk"
+.  include "../../x11/libXcursor/buildlink3.mk"
+.  include "../../x11/libXi/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.  include "../../x11/libXxf86vm/buildlink3.mk"
+.  include "../../x11/libxkbcommon/buildlink3.mk"
+.endif