From cada2b54fe9e54334a401b45e65efddab7e91a71 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 58b6ad82d..2acacc1ac 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -18,7 +18,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 && \
 
     # Until Fedora catches up with mesa bug fixes
     dnf upgrade -y mesa-dri-drivers mesa-libEGL && \
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 1057ef955..0be388637 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -494,7 +494,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 64a54a522..2dfe5bcc6 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -18,6 +18,7 @@ cogl_config_h = configure_file(
 cogl_pkg_deps = [
   glib_dep,
   gobject_dep,
+  graphene_dep,
 ]
 
 cogl_pkg_private_deps = [
diff --git a/meson.build b/meson.build
index 4b456dbac..f6395054f 100644
--- a/meson.build
+++ b/meson.build
@@ -17,6 +17,7 @@ libmutter_api_version = '@0@'.format(api_version)
 fribidi_req = '>= 1.0.0'
 glib_req = '>= 2.61.1'
 gi_req = '>= 0.9.5'
+graphene_req = '>= 1.9.3'
 gtk3_req = '>= 3.19.8'
 gdk_pixbuf_req = '>= 2.0'
 uprof_req = '>= 0.3'
@@ -86,6 +87,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)