Sat Oct 5 14:59:47 2019 UTC ()
webkit-gtk: Disable WPE when wayland is enabled for now


(nia)
diff -r1.18 -r1.19 pkgsrc/www/webkit-gtk/options.mk
cvs diff -r1.18 -r1.19 pkgsrc/www/webkit-gtk/options.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/options.mk 2019/08/29 10:40:14 1.18
+++ pkgsrc/www/webkit-gtk/options.mk 2019/10/05 14:59:47 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.18 2019/08/29 10:40:14 nia Exp $ 1# $NetBSD: options.mk,v 1.19 2019/10/05 14:59:47 nia Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk 4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
5PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland 5PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland
6PKG_SUGGESTED_OPTIONS= enchant introspection opengl 6PKG_SUGGESTED_OPTIONS= enchant introspection opengl
7 7
8PLIST_VARS= introspection 8PLIST_VARS= introspection
9 9
10.include "../../mk/bsd.prefs.mk" 10.include "../../mk/bsd.prefs.mk"
11 11
12# 12#
13# Platforms that support the webkit-jit option 13# Platforms that support the webkit-jit option
14# 14#
@@ -75,17 +75,18 @@ PLIST.introspection= yes @@ -75,17 +75,18 @@ PLIST.introspection= yes
75BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 75BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
76BUILDLINK_DEPMETHOD.gobject-introspection+= build 76BUILDLINK_DEPMETHOD.gobject-introspection+= build
77.include "../../devel/gobject-introspection/buildlink3.mk" 77.include "../../devel/gobject-introspection/buildlink3.mk"
78CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON 78CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
79.else 79.else
80CMAKE_ARGS+= -DENABLE_INTROSPECTION=OFF 80CMAKE_ARGS+= -DENABLE_INTROSPECTION=OFF
81.endif 81.endif
82 82
83# 83#
84# Wayland display server support 84# Wayland display server support
85# 85#
86.if !empty(PKG_OPTIONS:Mwayland) 86.if !empty(PKG_OPTIONS:Mwayland)
87CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=ON 87CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
 88CMAKE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
88.include "../../devel/wayland/buildlink3.mk" 89.include "../../devel/wayland/buildlink3.mk"
89.else 90.else
90CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF 91CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
91.endif 92.endif