gnome-session: Make GLESv2 support optional for older NetBSD releases

This commit is contained in:
nia 2020-11-05 13:51:32 +01:00
parent dc34fe605c
commit b988367121
5 changed files with 54 additions and 3 deletions

View File

@ -22,6 +22,15 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gettext-tools perl pkg-config
.include "../../graphics/MesaLib/features.mk"
PLIST_VARS+= gles2
.if ${MESALIB_SUPPORTS_GLESv2} == "no"
MESON_ARGS+= -Dgles2=false
.else
PLIST.gles2= yes
.endif
MESON_ARGS+= -Dsystemd=false
MESON_ARGS+= -Dsystemd_session=disable
MESON_ARGS+= -Dsystemd_journal=false

View File

@ -6,7 +6,7 @@ bin/gnome-session-quit
libexec/gnome-session-binary
libexec/gnome-session-check-accelerated
libexec/gnome-session-check-accelerated-gl-helper
libexec/gnome-session-check-accelerated-gles-helper
${PLIST.gles2}libexec/gnome-session-check-accelerated-gles-helper
libexec/gnome-session-failed
man/man1/gnome-session-inhibit.1
man/man1/gnome-session-quit.1

View File

@ -4,5 +4,5 @@ SHA1 (gnome-session-3.36.0.tar.xz) = dcdecdd85a40894408aa36eceb13ea9b256dd208
RMD160 (gnome-session-3.36.0.tar.xz) = 4c24337f04c812b7edcb3c2cc88f98ff30e20971
SHA512 (gnome-session-3.36.0.tar.xz) = 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
Size (gnome-session-3.36.0.tar.xz) = 475492 bytes
SHA1 (patch-ae) = 31759f8ee3f4415c43feb9ce5e93cba549de06a3
SHA1 (patch-gnome-session_main.c) = 81283ba5d57bc41842fc267b2d37d43ed24e8fbf
SHA1 (patch-meson__options.txt) = 6c0c9968c4546f60547cc0cf235e6d546532e85b
SHA1 (patch-tools_meson.build) = a2ab4b52be4933a86f64fc08d8cf89542f5a15ca

View File

@ -0,0 +1,11 @@
$NetBSD$
Make GLESv2 support optional for older NetBSD releases.
--- meson_options.txt.orig 2020-03-08 20:04:15.000000000 +0000
+++ meson_options.txt
@@ -6,3 +6,4 @@ option('systemd_journal', type: 'boolean
option('consolekit', type: 'boolean', value: false, description: 'Use consolekit')
option('docbook', type: 'boolean', value: true, description: 'build documentation')
option('man', type: 'boolean', value: true, description: 'build documentation (requires xmlto)')
+option('gles2', type: 'boolean', value: true, description: 'enable GLESv2 support)')

View File

@ -0,0 +1,31 @@
$NetBSD$
Make GLESv2 support optional for older NetBSD releases.
--- tools/meson.build.orig 2020-03-08 20:04:15.000000000 +0000
+++ tools/meson.build
@@ -31,6 +31,11 @@ if enable_session_selector
programs += [['gnome-session-selector', deps, cflags, session_bindir]]
endif
+cflags = '-DPKGDATADIR="@0@"'.format(session_pkgdatadir)
+
+enable_glesv2 = get_option('gles2')
+if enable_glesv2
+
deps = [
gtk_dep,
x11_dep,
@@ -38,10 +43,10 @@ deps = [
dependency('glesv2')
]
-cflags = '-DPKGDATADIR="@0@"'.format(session_pkgdatadir)
-
programs += [['gnome-session-check-accelerated-gles-helper', deps, cflags, session_libexecdir]]
+endif
+
deps = [
glib_dep,
x11_dep,