r33954 - in /desktop/unstable/clutter-gst/debian: changelog patches/02_fix_buid_with_new_cogl.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Apr  1 12:33:20 2012
New Revision: 33954

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33954
Log:
* d/p/02_fix_buid_with_new_cogl.patch
  - Added. Make clutter-gst build forward-compatible with new cogl

Added:
    desktop/unstable/clutter-gst/debian/patches/02_fix_buid_with_new_cogl.patch
Modified:
    desktop/unstable/clutter-gst/debian/changelog
    desktop/unstable/clutter-gst/debian/patches/series

Modified: desktop/unstable/clutter-gst/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gst/debian/changelog?rev=33954&op=diff
==============================================================================
--- desktop/unstable/clutter-gst/debian/changelog [utf-8] (original)
+++ desktop/unstable/clutter-gst/debian/changelog [utf-8] Sun Apr  1 12:33:20 2012
@@ -1,9 +1,14 @@
 clutter-gst (1.4.6-2) UNRELEASED; urgency=low
 
+  [ Rico Tzschichholz ]
   * debian/control.in:
     - Make libclutter-gst-dev depend on libclutter-1.0-dev
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Thu, 19 Jan 2012 09:08:56 +0100
+  [ Sjoerd Simons ]
+  * d/p/02_fix_buid_with_new_cogl.patch
+    - Added. Make clutter-gst build forward-compatible with new cogl
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 01 Apr 2012 14:32:39 +0200
 
 clutter-gst (1.4.6-1) unstable; urgency=low
 

Added: desktop/unstable/clutter-gst/debian/patches/02_fix_buid_with_new_cogl.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gst/debian/patches/02_fix_buid_with_new_cogl.patch?rev=33954&op=file
==============================================================================
--- desktop/unstable/clutter-gst/debian/patches/02_fix_buid_with_new_cogl.patch (added)
+++ desktop/unstable/clutter-gst/debian/patches/02_fix_buid_with_new_cogl.patch [utf-8] Sun Apr  1 12:33:20 2012
@@ -1,0 +1,26 @@
+From 02f99f0742830a5137be1aff1416fa18dcb32758 Mon Sep 17 00:00:00 2001
+From: Damien Lespiau <damien.lespiau at intel.com>
+Date: Wed, 22 Feb 2012 12:19:31 +0000
+Subject: [PATCH] build: Don't ask for the Cogl 2.0 API
+
+When asking for it, your just get the 2.0 API and not the 1.0 one any
+more. Just don't ask for the 2.0 API, we don't use it anymore.
+---
+ clutter-gst/Makefile.am |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
+index 3f130ee..95922f8 100644
+--- a/clutter-gst/Makefile.am
++++ b/clutter-gst/Makefile.am
+@@ -65,7 +65,6 @@ AM_CPPFLAGS =					\
+ 	-DCLUTTER_GST_COMPILATION		\
+ 	-DG_DISABLE_SINGLE_INCLUDES		\
+ 	-DCOGL_ENABLE_EXPERIMENTAL_API		\
+-	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API	\
+ 	-DCLUTTER_ENABLE_EXPERIMENTAL_API	\
+ 	-DG_LOG_DOMAIN=\"Clutter-Gst\"		\
+ 	$(NULL)
+-- 
+1.7.9.5
+

Modified: desktop/unstable/clutter-gst/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gst/debian/patches/series?rev=33954&op=diff
==============================================================================
--- desktop/unstable/clutter-gst/debian/patches/series [utf-8] (original)
+++ desktop/unstable/clutter-gst/debian/patches/series [utf-8] Sun Apr  1 12:33:20 2012
@@ -1,1 +1,2 @@
 01_fix_dolt_m4.patch
+02_fix_buid_with_new_cogl.patch