Merge branch 'matthiasc/for-main' into 'main'

ci: Stop using deprecated options

See merge request GNOME/gtk!7160

.gitlab-ci.yml

@@ -445,7 +445,6 @@ reference:
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
             -Ddocumentation=true
-            -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
             -Dpango:gtk_doc=true
             -Dbuild-demos=false

NEWS

@@ -80,6 +80,7 @@ the new property to 'manual'.
 
 * Deprecations:
  - gdk_widget_set/get_font_options
+ - gdk_wayland/x11_display_set_cursor_theme
 
 * Translation updates:
  Basque

gsk/gskrenderer.c

@@ -1,5 +1,4 @@
 /* GSK - The GTK Scene Kit
- *
  * Copyright 2016  Endless
  *
  * This library is free software; you can redistribute it and/or
@@ -685,6 +684,26 @@ get_renderer_for_vulkan (GdkSurface *surface)
 #endif
 }
 
+static gboolean
+vulkan_friendly_platform (GdkSurface *surface)
+{
+#ifdef GDK_WINDOWING_WAYLAND
+  if (GDK_IS_WAYLAND_DISPLAY (gdk_surface_get_display (surface)))
+    return TRUE;
+#endif
+
+  return FALSE;
+}
+
+static GType
+get_renderer_for_vulkan_friendly_platform (GdkSurface *surface)
+{
+  if (vulkan_friendly_platform (surface))
+    return get_renderer_for_vulkan (surface);
+
+  return G_TYPE_INVALID;
+}
+
 static GType
 get_renderer_for_gles2 (GdkSurface *surface)
 {
@@ -703,8 +722,9 @@ static struct {
   { get_renderer_for_display },
   { get_renderer_for_env_var },
   { get_renderer_for_backend },
-  { get_renderer_for_vulkan },
+  { get_renderer_for_vulkan_friendly_platform },
   { get_renderer_for_gl },
+  { get_renderer_for_vulkan },
   { get_renderer_for_gles2 },
   { get_renderer_fallback },
 };

make-release.sh

@@ -16,7 +16,7 @@ fi
 meson subprojects update gi-docgen
 
 # make the release tarball
-meson setup -Dintrospection=enabled -Dgtk_doc=true --force-fallback-for gi-docgen ${release_build_dir} || exit
+meson setup -Dintrospection=enabled -Ddocumentation=true --force-fallback-for gi-docgen ${release_build_dir} || exit
 meson compile -C${release_build_dir} || exit
 meson dist -C${release_build_dir} --include-subprojects || exit