From: Boram Park Date: Fri, 23 May 2014 04:16:45 +0000 (+0900) Subject: Revert "Always enable gl backend." X-Git-Tag: accepted/tizen/common/20141002.100421~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ade6f21c8d2a0676e68bbb9ead0220c87a4cc695;p=platform%2Fupstream%2Fcairo.git Revert "Always enable gl backend." This reverts commit 7d3296e1de73df1d3cbd9704ad51e2940e08b542. Change-Id: Ibac827dd97a3a63d4f2e3277a4ddf3552b59ed72 --- diff --git a/packaging/cairo.spec b/packaging/cairo.spec index 308e8b4..720b9c5 100644 --- a/packaging/cairo.spec +++ b/packaging/cairo.spec @@ -1,4 +1,5 @@ %bcond_without cairo_xcb_backend +%bcond_without cairo_gl_backend %bcond_with wayland %bcond_with x %bcond_with desktop @@ -23,6 +24,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) BuildRequires: which +%if %{with cairo_gl_backend} %if %{with x} && %{with desktop} BuildRequires: pkgconfig(gl) %endif @@ -30,6 +32,7 @@ BuildRequires: pkgconfig(glesv2) %if %{with wayland} BuildRequires: pkgconfig(wayland-egl) %endif +%endif %if %{with x} BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(x11) @@ -133,8 +136,10 @@ NOCONFIGURE=1 ./autogen.sh --with-pic \ --enable-fc \ --enable-ft \ +%if %{with cairo_gl_backend} --enable-egl \ --enable-glesv2=yes \ +%endif --enable-ps \ --enable-pdf \ --enable-script \