From 72eb0667067869f970a219db784c796cf0f15848 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 19 Jun 2013 14:47:17 -0400 Subject: [PATCH] make gl backend support conditional --- packaging/cairo.changes | 3 +++ packaging/cairo.spec | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packaging/cairo.changes b/packaging/cairo.changes index 01d038c..0e27ffc 100644 --- a/packaging/cairo.changes +++ b/packaging/cairo.changes @@ -1,3 +1,6 @@ +* Wed Jun 19 2013 Anas Nashif accepted/tizen/20130608.044146@f7aee60 +- make gl backend support conditional + * Fri Jun 07 2013 Anas Nashif accepted/tizen/20130520.095138@a4edfc8 - do not build wayland by default, use config option from project diff --git a/packaging/cairo.spec b/packaging/cairo.spec index e60cd03..9cecf47 100644 --- a/packaging/cairo.spec +++ b/packaging/cairo.spec @@ -1,5 +1,5 @@ -%define build_xcb_backend 0 -%define build_gl_backend 1 +%bcond_without cairo_xcb_backend +%bcond_without cairo_gl_backend %bcond_with wayland @@ -16,24 +16,24 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(x11) BuildRequires: which -%if %build_xcb_backend +%if %{with cairo_xcb_backend} BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-shm) %endif -%if %build_gl_backend +%if %{with cairo_gl_backend} BuildRequires: mesa-devel %if %{with wayland} BuildRequires: pkgconfig(wayland-egl) %endif %endif BuildRequires: pkgconfig(xrender) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Cairo is a vector graphics library with cross-device output support. @@ -126,15 +126,19 @@ NOCONFIGURE=1 ./autogen.sh --with-pic \ --enable-fc \ --enable-ft \ -%if %build_gl_backend - --enable-gl --enable-egl \ +%if %{with cairo_gl_backend} + --enable-gl \ + --enable-egl \ +%ifnarch %ix86 x86_64 + --enable-glesv2=yes \ +%endif %endif --enable-ps \ --enable-pdf \ --enable-script \ --enable-svg \ --enable-tee \ -%if %build_xcb_backend +%if %{with cairo_xcb_backend} --enable-xcb \ %endif --enable-xlib \ @@ -184,8 +188,8 @@ make %{?_smp_mflags} V=1 %files devel %defattr(-, root, root) %doc PORTING_GUIDE -%doc %{_datadir}/gtk-doc/html/cairo %{_includedir}/cairo/ +%doc %{_datadir}/gtk-doc/html/cairo %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -- 2.7.4