From 9cc096d189584862e0135fa40d78bb3e25553b30 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 15 Feb 2019 14:22:25 -0200
Subject: [PATCH] Add Graphene dependency

Graphene is a small library with data types and APIs
specially crafted to computer graphics. It contains
performant implementations of matrices, vectors, points
and rotation tools. It is performance because, among
other reasons, it uses vectorized processor commands
to compute various operations.

Add Graphene dependency to Mutter.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/458
---
 .gitlab-ci/Dockerfile | 2 +-
 cogl/cogl/meson.build | 2 +-
 cogl/meson.build      | 1 +
 meson.build           | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index fcf0ae352..f23bec52b 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -5,7 +5,7 @@ RUN dnf -y update && dnf -y upgrade && \
     dnf builddep -y mutter && \
 
     # Until Fedora catches up with meson build-deps
-    dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \
+    dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland graphene-devel && \
 
     # For running unit tests
     dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index cb940420a..64d00a493 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -495,7 +495,7 @@ if have_introspection
     sources: cogl_introspected_headers,
     nsversion: libmutter_api_version,
     namespace: 'Cogl',
-    includes: ['GL-1.0', 'GObject-2.0'],
+    includes: ['GL-1.0', 'GObject-2.0', 'Graphene-1.0'],
     dependencies: [cogl_deps],
     extra_args: introspection_args + [
       '-UCOGL_COMPILATION',
diff --git a/cogl/meson.build b/cogl/meson.build
index 356d596f5..3d359a2fe 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -30,6 +30,7 @@ cogl_pkg_private_deps = [
   cairo_dep,
   gmodule_no_export_dep,
   gdk_pixbuf_dep,
+  graphene_dep,
   #uprof_dep,
 ]
 
diff --git a/meson.build b/meson.build
index 6ce9e59f2..e765bf9f8 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,7 @@ libmutter_api_version = '4'
 # generic version requirements
 glib_req = '>= 2.53.2'
 gi_req = '>= 0.9.5'
+graphene_req = '>= 1.5.0'
 gtk3_req = '>= 3.19.8'
 gdk_pixbuf_req = '>= 2.0'
 uprof_req = '>= 0.3'
@@ -83,6 +84,7 @@ mutter_installed_tests_libexecdir = join_paths(
 
 m_dep = cc.find_library('m', required: true)
 x11_dep = dependency('x11')
+graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req)
 gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
 pango_dep = dependency('pango', version: pango_req)