diff --git a/SOURCES/cogl-1.14.0-swrast-copy-sub-buffer.patch b/SOURCES/cogl-1.14.0-swrast-copy-sub-buffer.patch
new file mode 100644
index 0000000..9837312
--- /dev/null
+++ b/SOURCES/cogl-1.14.0-swrast-copy-sub-buffer.patch
@@ -0,0 +1,12 @@
+diff -up cogl-1.14.0/cogl/winsys/cogl-winsys-glx.c.jx cogl-1.14.0/cogl/winsys/cogl-winsys-glx.c
+--- cogl-1.14.0/cogl/winsys/cogl-winsys-glx.c.jx 2013-02-21 10:41:08.000000000 -0500
++++ cogl-1.14.0/cogl/winsys/cogl-winsys-glx.c 2014-01-28 14:03:25.939579533 -0500
+@@ -698,7 +698,7 @@ update_winsys_features (CoglContext *con
+ COGL_FLAGS_SET (context->features,
+ COGL_FEATURE_ID_ONSCREEN_MULTIPLE, TRUE);
+
+- if (glx_renderer->glXCopySubBuffer || context->glBlitFramebuffer)
++ if (0)
+ {
+ CoglGpuInfoArchitecture arch;
+
diff --git a/SPECS/cogl.spec b/SPECS/cogl.spec
index fc6bce2..bc3ec09 100644
--- a/SPECS/cogl.spec
+++ b/SPECS/cogl.spec
@@ -1,15 +1,20 @@
Name: cogl
Version: 1.14.0
-Release: 3%{?dist}
+Release: 5.1%{?dist}
Summary: A library for using 3D graphics hardware to draw pretty pictures
Group: Development/Libraries
License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://download.gnome.org/sources/cogl/1.14/cogl-%{version}.tar.xz
-
+# Updates to a git snapshot of the 1.4 branch of Cogl as of 2013-05-01,
+# since there is no 1.4.1 yet. Fixes, among other things
+# https://bugzilla.gnome.org/show_bug.cgi?id=699431
# extra BRs just because we're touching Makefile.am in this patch
Patch0: cogl-1.14.0-21-ge26464f.patch
+# Don't disable copy_sub_buffer on llvmpipe
+Patch1: cogl-1.14.0-swrast-copy-sub-buffer.patch
+
BuildRequires: autoconf automake libtool gettext-devel
BuildRequires: cairo-devel
@@ -26,6 +31,8 @@ BuildRequires: mesa-libGL-devel
BuildRequires: pango-devel
BuildRequires: pkgconfig
+Conflicts: mesa-dri-drivers < 9.2.5-1
+
%description
Cogl is a small open source library for using 3D graphics hardware to draw
pretty pictures. The API departs from the flat state machine style of
@@ -66,6 +73,7 @@ This package contains documentation for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -105,6 +113,16 @@ rm %{buildroot}%{_datadir}/cogl/examples-data/crate.jpg
%{_datadir}/gtk-doc/html/cogl-2.0-experimental
%changelog
+* Tue Jan 28 2014 Adam Jackson <ajax@redhat.com> 1.14.0-5.1
+- Enable GLX_MESA_copy_sub_buffer on llvmpipe, since RHEL's Mesa includes
+ a fix for that; also conflict with Mesas that don't.
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.14.0-5
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.14.0-4
+- Mass rebuild 2013-12-27
+
* Wed Jun 12 2013 Kalev Lember <kalevlember@gmail.com> 1.14.0-3
- Disable the wayland backend for F19 (#973542)