r35389 - in /desktop/unstable/cogl/debian: changelog control control.in libcogl9.symbols libcogl9.symbols.egl patches/03_select_default_renderer_driver.patch patches/series rules
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Thu Jun 21 06:38:50 UTC 2012
Author: sjoerd
Date: Thu Jun 21 06:38:50 2012
New Revision: 35389
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35389
Log:
* Revert to 1.10.2-3, turning on GLESv2 on intel pull in 50MB due to libgbm1
and libegl1-mesa-drivers which is slightly over the top for enabling a
uncommon feature. Hopefully the changes can be reapplied after the
dependencies have gone on a diet.
* debian/control.in: Make libcogl9 depend on the renderer driver it uses
(GLES v2 on arm, GL on everything else)
Added:
desktop/unstable/cogl/debian/libcogl9.symbols.egl
Removed:
desktop/unstable/cogl/debian/patches/03_select_default_renderer_driver.patch
Modified:
desktop/unstable/cogl/debian/changelog
desktop/unstable/cogl/debian/control
desktop/unstable/cogl/debian/control.in
desktop/unstable/cogl/debian/libcogl9.symbols
desktop/unstable/cogl/debian/patches/series
desktop/unstable/cogl/debian/rules
Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog [utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog [utf-8] Thu Jun 21 06:38:50 2012
@@ -1,3 +1,14 @@
+cogl (1.10.2-5) UNRELEASED; urgency=low
+
+ * Revert to 1.10.2-3, turning on GLESv2 on intel pull in 50MB due to libgbm1
+ and libegl1-mesa-drivers which is slightly over the top for enabling a
+ uncommon feature. Hopefully the changes can be reapplied after the
+ dependencies have gone on a diet.
+ * debian/control.in: Make libcogl9 depend on the renderer driver it uses
+ (GLES v2 on arm, GL on everything else)
+
+ -- Sjoerd Simons <sjoerd at debian.org> Thu, 21 Jun 2012 08:37:46 +0200
+
cogl (1.10.2-4) unstable; urgency=low
* debian/patches/03_select_default_renderer_driver.patch:
Modified: desktop/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control [utf-8] (original)
+++ desktop/unstable/cogl/debian/control [utf-8] Thu Jun 21 06:38:50 2012
@@ -12,8 +12,8 @@
cdbs (>= 0.4.93~),
gnome-pkg-tools,
gtk-doc-tools (>= 1.13),
- libgl1-mesa-dev (>= 7.1~rc3-1~),
- libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
+ 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),
@@ -34,7 +34,6 @@
libgl1-mesa-glx [!armel !armhf ],
libgles2-mesa [armel armhf] | libgles2 [armel armhf]
Recommends: libcogl-common
-Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Object oriented GL/GLES Abstraction/Utility Layer
Modified: desktop/unstable/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control.in?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control.in [utf-8] (original)
+++ desktop/unstable/cogl/debian/control.in [utf-8] Thu Jun 21 06:38:50 2012
@@ -7,8 +7,8 @@
cdbs (>= 0.4.93~),
gnome-pkg-tools,
gtk-doc-tools (>= 1.13),
- libgl1-mesa-dev (>= 7.1~rc3-1~),
- libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
+ 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),
@@ -29,7 +29,6 @@
libgl1-mesa-glx [!armel !armhf ],
libgles2-mesa [armel armhf] | libgles2 [armel armhf]
Recommends: libcogl-common
-Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Object oriented GL/GLES Abstraction/Utility Layer
Modified: desktop/unstable/cogl/debian/libcogl9.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/libcogl9.symbols?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/libcogl9.symbols [utf-8] (original)
+++ desktop/unstable/cogl/debian/libcogl9.symbols [utf-8] Thu Jun 21 06:38:50 2012
@@ -136,7 +136,7 @@
cogl_double_to_fixed at Base 1.7.4
cogl_double_to_int at Base 1.7.4
cogl_double_to_uint at Base 1.7.4
- cogl_egl_context_get_egl_display at Base 1.9.2
+(arch=armel armhf)#include "libcogl9.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: desktop/unstable/cogl/debian/libcogl9.symbols.egl
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/libcogl9.symbols.egl?rev=35389&op=file
==============================================================================
--- desktop/unstable/cogl/debian/libcogl9.symbols.egl (added)
+++ desktop/unstable/cogl/debian/libcogl9.symbols.egl [utf-8] Thu Jun 21 06:38:50 2012
@@ -1,0 +1,1 @@
+ cogl_egl_context_get_egl_display at Base 1.9.2
Modified: desktop/unstable/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/series?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/patches/series [utf-8] (original)
+++ desktop/unstable/cogl/debian/patches/series [utf-8] Thu Jun 21 06:38:50 2012
@@ -1,2 +1,1 @@
#02_disable_armv5t_specific_optimization.patch
-03_select_default_renderer_driver.patch
Modified: desktop/unstable/cogl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/rules?rev=35389&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/rules [utf-8] (original)
+++ desktop/unstable/cogl/debian/rules [utf-8] Thu Jun 21 06:38:50 2012
@@ -15,16 +15,10 @@
--enable-gtk-doc \
--enable-gdk-pixbuf \
--enable-cogl-pango \
- --enable-introspection=yes \
- --enable-gl=yes \
- --enable-gles2=yes \
- --enable-xlib-egl-platform=yes \
- --with-gles2-libname=libGLESv2.so.2
+ --enable-introspection=yes
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
- DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2
-else
- DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gl
+ DEB_CONFIGURE_EXTRA_FLAGS += --enable-gl=no --enable-gles2=yes
endif
common-binary-predeb-arch:: list-missing
More information about the pkg-gnome-commits
mailing list