r29683 - in /packages/experimental/cogl/debian: changelog control control.in libcogl2.symbols libcogl2.symbols.egl rules

[ricotz-guest at users.alioth.debian.org]

Author: ricotz-guest
Date: Mon Sep 19 18:47:27 2011
New Revision: 29683

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29683
Log:
Enable EGL/Gles2 for armhf and make symbols file more generic

Added:
    packages/experimental/cogl/debian/libcogl2.symbols.egl
Modified:
    packages/experimental/cogl/debian/changelog
    packages/experimental/cogl/debian/control
    packages/experimental/cogl/debian/control.in
    packages/experimental/cogl/debian/libcogl2.symbols
    packages/experimental/cogl/debian/rules

Modified: packages/experimental/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/changelog?rev=29683&op=diff
==============================================================================
--- packages/experimental/cogl/debian/changelog [utf-8] (original)
+++ packages/experimental/cogl/debian/changelog [utf-8] Mon Sep 19 18:47:27 2011
@@ -1,3 +1,10 @@
+cogl (1.7.8-2) UNRELEASED; urgency=low
+
+  * debian/*.symbols*,debian/rules:
+    - build with EGL/GLES2 on armhf
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Tue, 13 Sep 2011 19:20:51 +0200
+
 cogl (1.7.8-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/experimental/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control?rev=29683&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control [utf-8] (original)
+++ packages/experimental/cogl/debian/control [utf-8] Mon Sep 19 18:47:27 2011
@@ -12,8 +12,8 @@
                cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),
-               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel],
-               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel] | libgles2-dev [armel],
+               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
+               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),

Modified: packages/experimental/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control.in?rev=29683&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control.in [utf-8] (original)
+++ packages/experimental/cogl/debian/control.in [utf-8] Mon Sep 19 18:47:27 2011
@@ -7,8 +7,8 @@
                cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),
-               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel],
-               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel] | libgles2-dev [armel],
+               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
+               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),

Modified: packages/experimental/cogl/debian/libcogl2.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/libcogl2.symbols?rev=29683&op=diff
==============================================================================
--- packages/experimental/cogl/debian/libcogl2.symbols [utf-8] (original)
+++ packages/experimental/cogl/debian/libcogl2.symbols [utf-8] Mon Sep 19 18:47:27 2011
@@ -152,6 +152,7 @@
  cogl_double_to_uint at Base 1.7.4
  cogl_draw_attributes at Base 1.7.4
  cogl_draw_indexed_attributes at Base 1.7.4
+(arch=armel armhf)#include "libcogl2.symbols.egl"
  cogl_end_gl at Base 1.7.4
  cogl_error_get_type at Base 1.7.4
  cogl_euler_copy at Base 1.7.4

Added: packages/experimental/cogl/debian/libcogl2.symbols.egl
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/libcogl2.symbols.egl?rev=29683&op=file
==============================================================================
--- packages/experimental/cogl/debian/libcogl2.symbols.egl (added)
+++ packages/experimental/cogl/debian/libcogl2.symbols.egl [utf-8] Mon Sep 19 18:47:27 2011
@@ -1,0 +1,1 @@
+ cogl_egl_context_get_egl_display_EXP at Base 1.7.4

Modified: packages/experimental/cogl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/rules?rev=29683&op=diff
==============================================================================
--- packages/experimental/cogl/debian/rules [utf-8] (original)
+++ packages/experimental/cogl/debian/rules [utf-8] Mon Sep 19 18:47:27 2011
@@ -14,7 +14,7 @@
 	--enable-gtk-doc \
 	--enable-introspection=yes
 
-ifeq ($(DEB_HOST_ARCH),armel)
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
         DEB_CONFIGURE_EXTRA_FLAGS += --enable-gl=no --enable-gles2=yes
 endif