pkgsrc-WIP-changes archive

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

fynedesk: Add some glfw patches to allow building on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat Jul 9 12:19:22 2022 +0200
Changeset:	6e0e0746207986e63355469b91b730cf0e0c05cc

Modified Files:
	fynedesk/Makefile
	fynedesk/distinfo
Added Files:
	fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_build.go
	fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_native__linbsd.go

Log Message:
fynedesk: Add some glfw patches to allow building on NetBSD

This is not done yet.

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

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

diffstat:
 fynedesk/Makefile                                  |  1 +
 fynedesk/distinfo                                  |  2 ++
 ...vendor_github.com_go-gl_glfw_v3.3_glfw_build.go | 22 ++++++++++++++++++++++
 ...thub.com_go-gl_glfw_v3.3_glfw_native__linbsd.go | 11 +++++++++++
 4 files changed, 36 insertions(+)

diffs:
diff --git a/fynedesk/Makefile b/fynedesk/Makefile
index 0fb170c231..070e32a608 100644
--- a/fynedesk/Makefile
+++ b/fynedesk/Makefile
@@ -14,5 +14,6 @@ GO_BUILD_PATTERN=	./cmd/...
 
 .include "go-modules.mk"
 
+.include "../../graphics/glfw/buildlink3.mk"
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fynedesk/distinfo b/fynedesk/distinfo
index 611b8a363b..5274e2ebcf 100644
--- a/fynedesk/distinfo
+++ b/fynedesk/distinfo
@@ -423,3 +423,5 @@ Size (howett.net_plist_@v_v0.0.0-20181124034731-591f970eefbb.mod) = 222 bytes
 BLAKE2s (howett.net_plist_@v_v0.0.0-20181124034731-591f970eefbb.zip) = cb9f1df8ec5c48729845454b9baf1cf03813d0904b4f5813f64a19d7d9057855
 SHA512 (howett.net_plist_@v_v0.0.0-20181124034731-591f970eefbb.zip) = 42edffcf1da65083864d4ad866a4bf09bb184f52888e3ae7c2e47e6ff1967916cfe6e777de231a5e5a46f25b658b1c633429b6793584886373b2f8ebef8c5cef
 Size (howett.net_plist_@v_v0.0.0-20181124034731-591f970eefbb.zip) = 69738 bytes
+SHA1 (patch-vendor_github.com_go-gl_glfw_v3.3_glfw_build.go) = 068b6ab37520c77fefde822d18da7d65efe6d64f
+SHA1 (patch-vendor_github.com_go-gl_glfw_v3.3_glfw_native__linbsd.go) = 385cfe5c73477dd8afa22c687585a7401c0b60bb
diff --git a/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_build.go b/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_build.go
new file mode 100644
index 0000000000..c518b14d36
--- /dev/null
+++ b/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_build.go
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- vendor/github.com/go-gl/glfw/v3.3/glfw/build.go.orig	2021-12-16 15:57:57.000000000 +0000
++++ vendor/github.com/go-gl/glfw/v3.3/glfw/build.go
+@@ -41,13 +41,13 @@ package glfw
+ // BSD Build Tags
+ // ----------------
+ // GLFW Options:
+-#cgo freebsd,!wayland openbsd pkg-config: x11 xau xcb xdmcp
++#cgo freebsd,!wayland netbsd openbsd pkg-config: x11 xau xcb xdmcp
+ #cgo freebsd,wayland pkg-config: wayland-client wayland-cursor wayland-egl epoll-shim
+-#cgo freebsd openbsd CFLAGS: -D_GLFW_HAS_DLOPEN
+-#cgo freebsd,!wayland openbsd CFLAGS: -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESSARB
++#cgo freebsd netbsd openbsd CFLAGS: -D_GLFW_HAS_DLOPEN
++#cgo freebsd,!wayland netbsd openbsd CFLAGS: -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESSARB
+ #cgo freebsd,wayland CFLAGS: -D_GLFW_WAYLAND
+ 
+ // Linker Options:
+-#cgo freebsd openbsd LDFLAGS: -lm
++#cgo freebsd netbsd openbsd LDFLAGS: -lm
+ */
+ import "C"
diff --git a/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_native__linbsd.go b/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_native__linbsd.go
new file mode 100644
index 0000000000..26796310fb
--- /dev/null
+++ b/fynedesk/patches/patch-vendor_github.com_go-gl_glfw_v3.3_glfw_native__linbsd.go
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- vendor/github.com/go-gl/glfw/v3.3/glfw/native_linbsd.go.orig	2021-12-16 15:57:57.000000000 +0000
++++ vendor/github.com/go-gl/glfw/v3.3/glfw/native_linbsd.go
+@@ -1,4 +1,5 @@
+-// +build linux,!wayland freebsd,!wayland openbsd
++//go:build (linux && !wayland) || (freebsd && !wayland) || openbsd || netbsd
++// +build linux,!wayland freebsd,!wayland openbsd netbsd
+ 
+ package glfw
+ 


Home | Main Index | Thread Index | Old Index