- up to 1.12.4; enable GL by default

diff --git a/cairo-link.patch b/cairo-link.patch
index 39c36aa09b4b14f889e3006484ffe6106b17cacd..8bce68aa2e1dec6f463f1bbc91c9378c57531f8c 100644 (file)
--- a/cairo-link.patch
+++ b/cairo-link.patch
@@ -1,11 +1,11 @@
---- cairo-1.8.10/configure.ac.orig     2010-02-19 19:38:03.000000000 +0100
-+++ cairo-1.8.10/configure.ac  2010-02-23 08:25:04.000000000 +0100
-@@ -43,7 +43,7 @@
+--- cairo-1.12.4/configure.ac~ 2012-09-13 13:38:21.000000000 +0200
++++ cairo-1.12.4/configure.ac  2012-10-07 07:13:25.814449494 +0200
+@@ -71,7 +71,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib,
                     if test "x$no_x" = xyes; then
                       use_xlib="no (requires X development libraries)"
                     else
--                     xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+                     xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
+-                     xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
++                     xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
                       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
                     fi])
  ])

diff --git a/cairo.spec b/cairo.spec
index c193192c7791d873d37b5ce69db0f0699cdb28d1..3935caff6b6e0706c4914f24485856525888ae21 100644 (file)
--- a/cairo.spec
+++ b/cairo.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
 %bcond_without svg             # disable SVG support (to boostrap librsvg)
-%bcond_with    gl              # enable OpenGL support
+%bcond_without gl              # enable OpenGL support
 %if "%{pld_release}" == "ac"
 %bcond_with    xcb             # XCB backend
 %else
@@ -13,12 +13,12 @@
 Summary:       Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):     Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:          cairo
-Version:       1.12.2
-Release:       10
+Version:       1.12.4
+Release:       1
 License:       LGPL v2.1 or MPL v1.1
 Group:         Libraries
 Source0:       http://cairographics.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 87649eb75789739d517c743e94879e51
+# Source0-md5: a64bb8774a1e476e5cdd69e635794dfb
 Patch0:                %{name}-link.patch
 URL:           http://cairographics.org/
 BuildRequires: autoconf >= 2.63
@@ -247,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cairo
 %exclude %{_includedir}/cairo/cairo-gobject.h
 %{_pkgconfigdir}/cairo.pc
+%{?with_gl:%{_pkgconfigdir}/cairo-egl.pc}
 %{?with_gl:%{_pkgconfigdir}/cairo-gl.pc}
 %{?with_gl:%{_pkgconfigdir}/cairo-glx.pc}
 %{_pkgconfigdir}/cairo-fc.pc