[jhbuild] core-deps-3.20: Fix building cogl on osx
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] core-deps-3.20: Fix building cogl on osx
- Date: Fri, 8 Jan 2016 16:29:31 +0000 (UTC)
commit 348f0060f3cd8e69ed854ab982d8536af30598f0
Author: Patrick Griffis <tingping tingping se>
Date: Thu Jan 7 17:18:34 2016 +0000
core-deps-3.20: Fix building cogl on osx
modulesets/gnome-suites-core-deps-3.20.modules | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 2aed787..fa71f34 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -319,21 +319,31 @@
</dependencies>
</autotools>
- <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst --disable-maintainer-flags">
+ <autotools id="cogl" autogenargs="--enable-cogl-gst --disable-maintainer-flags">
+ <if condition-set="x11">
+ <autogenargs value="--enable-xlib-egl-platform"/>
+ </if>
<if condition-set="wayland">
<autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server
--enable-kms-egl-platform"/>
</if>
+ <if condition-set="quartz">
+ <autogenargs value="--enable-gl"/>
+ </if>
<pkg-config>cogl-1.0.pc</pkg-config>
<branch revision="cogl-1.22"/>
<dependencies>
<dep package="glib"/>
<dep package="gtk-doc"/>
- <dep package="libdrm"/>
- <dep package="libXcomposite"/>
- <dep package="xcb-dri2" />
<dep package="pango"/>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
+ <if condition-unset="quartz">
+ <dep package="libdrm"/>
+ </if>
+ <if condition-set="x11">
+ <dep package="libXcomposite"/>
+ <dep package="xcb-dri2" />
+ </if>
<if condition-set="wayland">
<dep package="wayland"/>
<dep package="wayland-egl"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]