diff -Nru cogl-1.14.0/debian/changelog cogl-1.14.0/debian/changelog --- cogl-1.14.0/debian/changelog 2013-08-21 21:41:52.000000000 +0000 +++ cogl-1.14.0/debian/changelog 2014-01-15 20:43:22.000000000 +0000 @@ -1,3 +1,10 @@ +cogl (1.14.0-3+rpi1) jessie-staging; urgency=medium + + * Switch to regular opengl and disable egl/gles to avoid conflicting with + raspberry pi foundation libraries. + + -- Peter Michael Green Wed, 15 Jan 2014 20:42:58 +0000 + cogl (1.14.0-3) unstable; urgency=low * Add "Breaks: libclutter-1.0-0 (<< 1.14)" in libcogl12 to prevent diff -Nru cogl-1.14.0/debian/control cogl-1.14.0/debian/control --- cogl-1.14.0/debian/control 2013-08-21 21:44:40.000000000 +0000 +++ cogl-1.14.0/debian/control 2014-01-15 21:27:19.000000000 +0000 @@ -7,13 +7,12 @@ Section: libs Priority: optional Maintainer: Rico Tzschichholz -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Michael Biebl , Sjoerd Simons +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Sjoerd Simons Build-Depends: debhelper (>= 8.1.3~), 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~) [!hurd-any] | libgles2-dev [!hurd-any], libcairo2-dev (>= 1.10), libpango1.0-dev (>= 1.28.3-5), libgdk-pixbuf2.0-dev (>= 2.0), @@ -32,8 +31,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgl1-mesa-glx [!armel !armhf ], - libgles2-mesa [armel armhf] | libgles2 [armel armhf] + libgl1-mesa-glx Recommends: libcogl-common Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx Pre-Depends: ${misc:Pre-Depends} @@ -64,7 +62,6 @@ Depends: libcogl12 (= ${binary:Version}), gir1.2-cogl-1.0 (= ${binary:Version}), libgl1-mesa-dev (>= 7.1~rc3-1~), - libgles2-mesa-dev (>= 7.1~rc3-1~) [!hurd-any] | libgles2-dev [!hurd-any], libglib2.0-dev (>= 2.28.0), libdrm-dev [!hurd-any], libgdk-pixbuf2.0-dev (>= 2.0), @@ -196,11 +193,10 @@ dynamic bindings for libcogl-pango. Package: libcogl-gles2-12 -Architecture: linux-any kfreebsd-any +Architecture: kfreebsd-any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgl1-mesa-glx [!armel !armhf ], - libgles2-mesa [armel armhf] | libgles2 [armel armhf] + libgl1-mesa-glx Recommends: libcogl-common Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx Replaces: libcogl12 (<< 1.13.4-2) @@ -216,7 +212,7 @@ Package: libcogl-gles2-dev Section: libdevel -Architecture: linux-any kfreebsd-any +Architecture: kfreebsd-any Depends: libcogl-gles2-12 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), ${misc:Depends}, diff -Nru cogl-1.14.0/debian/control.in cogl-1.14.0/debian/control.in --- cogl-1.14.0/debian/control.in 2013-08-21 20:06:56.000000000 +0000 +++ cogl-1.14.0/debian/control.in 2014-01-15 21:16:21.000000000 +0000 @@ -8,7 +8,6 @@ gnome-pkg-tools, gtk-doc-tools (>= 1.13), libgl1-mesa-dev (>= 7.1~rc3-1~), - libgles2-mesa-dev (>= 7.1~rc3-1~) [!hurd-any] | libgles2-dev [!hurd-any], libcairo2-dev (>= 1.10), libpango1.0-dev (>= 1.28.3-5), libgdk-pixbuf2.0-dev (>= 2.0), @@ -27,8 +26,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgl1-mesa-glx [!armel !armhf ], - libgles2-mesa [armel armhf] | libgles2 [armel armhf] + libgl1-mesa-glx Recommends: libcogl-common Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx Pre-Depends: ${misc:Pre-Depends} @@ -59,7 +57,6 @@ Depends: libcogl12 (= ${binary:Version}), gir1.2-cogl-1.0 (= ${binary:Version}), libgl1-mesa-dev (>= 7.1~rc3-1~), - libgles2-mesa-dev (>= 7.1~rc3-1~) [!hurd-any] | libgles2-dev [!hurd-any], libglib2.0-dev (>= 2.28.0), libdrm-dev [!hurd-any], libgdk-pixbuf2.0-dev (>= 2.0), @@ -191,11 +188,10 @@ dynamic bindings for libcogl-pango. Package: libcogl-gles2-12 -Architecture: linux-any kfreebsd-any +Architecture: kfreebsd-any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgl1-mesa-glx [!armel !armhf ], - libgles2-mesa [armel armhf] | libgles2 [armel armhf] + libgl1-mesa-glx Recommends: libcogl-common Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx Replaces: libcogl12 (<< 1.13.4-2) @@ -211,7 +207,7 @@ Package: libcogl-gles2-dev Section: libdevel -Architecture: linux-any kfreebsd-any +Architecture: kfreebsd-any Depends: libcogl-gles2-12 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), ${misc:Depends}, diff -Nru cogl-1.14.0/debian/libcogl12.symbols cogl-1.14.0/debian/libcogl12.symbols --- cogl-1.14.0/debian/libcogl12.symbols 2013-03-25 14:39:00.000000000 +0000 +++ cogl-1.14.0/debian/libcogl12.symbols 2014-01-15 21:27:05.000000000 +0000 @@ -150,7 +150,7 @@ cogl_double_to_fixed@Base 1.7.4 cogl_double_to_int@Base 1.7.4 cogl_double_to_uint@Base 1.7.4 - (arch=!hurd-any)cogl_egl_context_get_egl_display@Base 1.13.4 +# (arch=!hurd-any)cogl_egl_context_get_egl_display@Base 1.13.4 cogl_end_gl@Base 1.7.4 cogl_error_copy@Base 1.13.4 cogl_error_free@Base 1.13.4 diff -Nru cogl-1.14.0/debian/rules cogl-1.14.0/debian/rules --- cogl-1.14.0/debian/rules 2013-03-25 17:44:19.000000000 +0000 +++ cogl-1.14.0/debian/rules 2014-01-15 20:42:31.000000000 +0000 @@ -20,18 +20,18 @@ --enable-introspection=yes \ --enable-gl=yes -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) - DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2 -else +#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 -endif +#endif -ifeq ($(DEB_HOST_ARCH_OS),$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd)) -DEB_CONFIGURE_EXTRA_FLAGS += \ - --enable-xlib-egl-platform=yes \ - --enable-cogl-gles2=yes \ - --with-gles2-libname=libGLESv2.so.2 \ - --enable-gles2=yes -endif +#ifeq ($(DEB_HOST_ARCH_OS),$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd)) +#DEB_CONFIGURE_EXTRA_FLAGS += \ +# --enable-xlib-egl-platform=yes \ +# --enable-cogl-gles2=yes \ +# --with-gles2-libname=libGLESv2.so.2 \ +# --enable-gles2=yes +#endif common-binary-predeb-arch:: list-missing