r35379 - 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
Wed Jun 20 11:38:44 UTC 2012
Author: sjoerd
Date: Wed Jun 20 11:38:43 2012
New Revision: 35379
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35379
Log:
* debian/patches/03_select_default_renderer_driver.patch:
+ Added. Allow the default renderer driver to be selected at configure time
* Build both GL and GLESv2 renderer support on all platforms, default to
GLESv2 on ARM and to GL on everything else.
Added:
desktop/unstable/cogl/debian/patches/03_select_default_renderer_driver.patch
Removed:
desktop/unstable/cogl/debian/libcogl9.symbols.egl
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=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog [utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog [utf-8] Wed Jun 20 11:38:43 2012
@@ -1,3 +1,12 @@
+cogl (1.10.2-4) UNRELEASED; urgency=low
+
+ * debian/patches/03_select_default_renderer_driver.patch:
+ + Added. Allow the default renderer driver to be selected at configure time
+ * Build both GL and GLESv2 renderer support on all platforms, default to
+ GLESv2 on ARM and to GL on everything else.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Wed, 20 Jun 2012 10:37:34 +0200
+
cogl (1.10.2-3) unstable; urgency=low
* Make libcogl-pango0 break libcogl5 (<< 1.10.1-1) to avoid partial
Modified: desktop/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control?rev=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control [utf-8] (original)
+++ desktop/unstable/cogl/debian/control [utf-8] Wed Jun 20 11:38:43 2012
@@ -12,8 +12,8 @@
cdbs (>= 0.4.93~),
gnome-pkg-tools,
gtk-doc-tools (>= 1.13),
- libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
- libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+ libgl1-mesa-dev (>= 7.1~rc3-1~),
+ libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
libcairo2-dev (>= 1.10),
libpango1.0-dev (>= 1.28.3-5),
libgdk-pixbuf2.0-dev (>= 2.0),
@@ -31,7 +31,10 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ 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=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control.in [utf-8] (original)
+++ desktop/unstable/cogl/debian/control.in [utf-8] Wed Jun 20 11:38:43 2012
@@ -7,8 +7,8 @@
cdbs (>= 0.4.93~),
gnome-pkg-tools,
gtk-doc-tools (>= 1.13),
- libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
- libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+ libgl1-mesa-dev (>= 7.1~rc3-1~),
+ libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
libcairo2-dev (>= 1.10),
libpango1.0-dev (>= 1.28.3-5),
libgdk-pixbuf2.0-dev (>= 2.0),
@@ -26,7 +26,10 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ 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=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/libcogl9.symbols [utf-8] (original)
+++ desktop/unstable/cogl/debian/libcogl9.symbols [utf-8] Wed Jun 20 11:38:43 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
-(arch=armel armhf)#include "libcogl9.symbols.egl"
+ cogl_egl_context_get_egl_display at Base 1.9.2
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/patches/03_select_default_renderer_driver.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/03_select_default_renderer_driver.patch?rev=35379&op=file
==============================================================================
--- desktop/unstable/cogl/debian/patches/03_select_default_renderer_driver.patch (added)
+++ desktop/unstable/cogl/debian/patches/03_select_default_renderer_driver.patch [utf-8] Wed Jun 20 11:38:43 2012
@@ -1,0 +1,102 @@
+From 8406eb9d2fa5ac752f762da1db98a0ee8921ceac Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Wed, 20 Jun 2012 09:47:41 +0200
+Subject: [PATCH] Make the default driver selectable at configure time
+
+When building COGL with multiple backends it can be useful to force a
+default driver to be selected. For example while for Debian we do want to
+build the GL renderer on ARM, GLESv2 is much more suitable as the
+default renderer on that platform.
+
+Conflicts:
+
+ cogl/cogl-renderer.c
+---
+ cogl/Makefile.am | 6 ++++++
+ cogl/cogl-renderer.c | 5 +++++
+ configure.ac | 15 ++++++++++++++-
+ 3 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/Makefile.am b/cogl/Makefile.am
+index f6dbb0d..5ab2d97 100644
+--- a/cogl/Makefile.am
++++ b/cogl/Makefile.am
+@@ -32,6 +32,12 @@ AM_CPPFLAGS = \
+ -DCOGL_LOCALEDIR=\""$(localedir)"\" \
+ $(NULL)
+
++if HAVE_COGL_DEFAULT_DRIVER
++AM_CPPFLAGS += \
++ -DCOGL_DEFAULT_DRIVER=\"$(COGL_DEFAULT_DRIVER)\"
++endif
++
++
+ AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+
+ BUILT_SOURCES += cogl-defines.h
+diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
+index d07a3ca..b448483 100644
+--- a/cogl/cogl-renderer.c
++++ b/cogl/cogl-renderer.c
+@@ -243,6 +243,11 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
+ if (!driver_name)
+ driver_name = _cogl_config_driver;
+
++#ifdef COGL_DEFAULT_DRIVER
++ if (!driver_name)
++ driver_name = COGL_DEFAULT_DRIVER;
++#endif
++
+ #ifdef HAVE_COGL_GL
+ if (renderer->driver_override == COGL_DRIVER_GL ||
+ (renderer->driver_override == COGL_DRIVER_ANY &&
+diff --git a/configure.ac b/configure.ac
+index 7b67457..299366c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -614,7 +614,7 @@ AM_CONDITIONAL([COGL_DRIVER_GL_SUPPORTED], [test "x$enable_gl" = "xyes"])
+ AM_CONDITIONAL([COGL_DRIVER_GLES_SUPPORTED],
+ [test "x$enable_gles1" = "xyes" || test "x$enable_gles2" = "xyes"])
+
+-dnl Allow the GL library names to be overridden with configure options
++dnl Allow the GL library names and default driver to be overridden with configure options
+ AC_ARG_WITH([gl-libname],
+ [AS_HELP_STRING([--with-gl-libname],
+ override the name of the GL library to dlopen)],
+@@ -627,6 +627,15 @@ AC_ARG_WITH([gles2-libname],
+ [AS_HELP_STRING([--with-gles2-libname],
+ override the name of the GLESv2 library to dlopen)],
+ [COGL_GLES2_LIBNAME="$withval"])
++AC_ARG_WITH([default-driver],
++ [AS_HELP_STRING([--with-default-driver],
++ specify a default cogl driver)],
++ [COGL_DEFAULT_DRIVER="${withval}"],
++ [COGL_DEFAULT_DRIVER="" ])
++
++AM_CONDITIONAL(HAVE_COGL_DEFAULT_DRIVER,
++ [ test "x$COGL_DEFAULT_DRIVER" != "x" ])
++
+
+ AC_SUBST([COGL_GL_LIBNAME])
+ AC_SUBST([HAVE_GL])
+@@ -634,6 +643,7 @@ AC_SUBST([COGL_GLES1_LIBNAME])
+ AC_SUBST([HAVE_GLES1])
+ AC_SUBST([COGL_GLES2_LIBNAME])
+ AC_SUBST([HAVE_GLES2])
++AC_SUBST([COGL_DEFAULT_DRIVER])
+
+ if test "x$GL_LIBRARY_DIRECTLY_LINKED" = "xyes"; then
+ AC_DEFINE([HAVE_DIRECTLY_LINKED_GL_LIBRARY], [1],
+@@ -1150,6 +1160,9 @@ echo "Cogl - $COGL_1_VERSION/$COGL_VERSION (${COGL_RELEASE_STATUS})"
+ echo ""
+ echo " • Global:"
+ echo " Prefix: ${prefix}"
++if test "x$COGL_DEFAULT_DRIVER" != "x"; then
++echo " Default driver: ${COGL_DEFAULT_DRIVER}"
++fi
+
+ echo ""
+ # Features
+--
+1.7.10
+
Modified: desktop/unstable/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/patches/series?rev=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/patches/series [utf-8] (original)
+++ desktop/unstable/cogl/debian/patches/series [utf-8] Wed Jun 20 11:38:43 2012
@@ -1,1 +1,2 @@
#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=35379&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/rules [utf-8] (original)
+++ desktop/unstable/cogl/debian/rules [utf-8] Wed Jun 20 11:38:43 2012
@@ -15,10 +15,16 @@
--enable-gtk-doc \
--enable-gdk-pixbuf \
--enable-cogl-pango \
- --enable-introspection=yes
+ --enable-introspection=yes \
+ --enable-gl=yes \
+ --enable-gles2=yes \
+ --enable-xlib-egl-platform=yes \
+ --with-gles2-libname=libGLESv2.so.2
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-gl=no --enable-gles2=yes
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2
+else
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gl
endif
common-binary-predeb-arch:: list-missing
More information about the pkg-gnome-commits
mailing list