From: Rob Bradford <rob@linux.intel.com>
Date: Thu, 17 Jan 2013 16:05:25 +0000 (+0000)
Subject: wayland: Drop build configuration support for cairo-gl
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=46cc2d825e1f86bdf120eb8149a549c6b639da2e

wayland: Drop build configuration support for cairo-gl

The underlying code uses API that is no longer available with 1.0. This
optional, off by default build mode hasn't worked since the release of
Wayland 1.0.
---

diff --git a/configure.ac b/configure.ac
index c16fec662..6908f896a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,12 +322,6 @@ AC_ARG_ENABLE(quartz-relocation,
                               [enable bundle-based relocation functions])],
                               [quartz_relocation=yes])
 
-AC_ARG_ENABLE(wayland-cairo-gl,
-              AS_HELP_STRING([--enable-wayland-cairo-gl],
-                             [enable the use of Cairo GL in the Wayland backend]),
-              [enable_wayland_cairo_gl=yes])
-
-
 cairo_backends=
 backend_immodules=
 have_gio_unix=no
@@ -397,22 +391,13 @@ else
 fi
 
 if test "x$enable_wayland_backend" = "xyes"; then
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    # Wayland can use cairo-gl
-    cairo_backends="$cairo_backends cairo-gl"
-    AC_DEFINE(GDK_WAYLAND_USE_EGL, [1], [Whether to use EGL in Wayland backend])
-  else
-    # For the cairo image backend
-    cairo_backends="$cairo_backends cairo"
-  fi
+  # For the cairo image backend
+  cairo_backends="$cairo_backends cairo"
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
   WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
-  fi
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)