[mutter/gbsneto/graphene: 11/11] build: Use graphene as a fallback subproject



commit 9066a17093d51b85d0bc282fa6b5d2bcabe0162e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jun 5 16:07:10 2019 -0300

    build: Use graphene as a fallback subproject
    
    This allows building and testing mutter with graphene
    even without the unreleased version from master. It also
    helps CI -- not only GitLab's CI, but also Continuous.
    
    When graphene 1.10 is released and broadly distributed,
    we can remove this.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/458

 .gitmodules          | 3 +++
 meson.build          | 3 ++-
 subprojects/graphene | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..dce6d82f0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/graphene"]
+       path = subprojects/graphene
+       url = https://github.com/ebassi/graphene.git
diff --git a/meson.build b/meson.build
index dcf0b4930..7554c216e 100644
--- a/meson.build
+++ b/meson.build
@@ -82,7 +82,8 @@ 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)
+graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req,
+                          fallback: ['graphene', 'graphene_dep'])
 gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
 pango_dep = dependency('pango', version: pango_req)
diff --git a/subprojects/graphene b/subprojects/graphene
new file mode 160000
index 000000000..48570b109
--- /dev/null
+++ b/subprojects/graphene
@@ -0,0 +1 @@
+Subproject commit 48570b10981831e40da1dcd683a440896fd6fd01


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]