diff -Nru cogl-1.20.0/debian/changelog cogl-1.20.0/debian/changelog
--- cogl-1.20.0/debian/changelog 2015-05-23 17:43:05.000000000 +0000
+++ cogl-1.20.0/debian/changelog 2015-06-11 04:06:57.000000000 +0000
@@ -1,3 +1,10 @@
+cogl (1.20.0-2+rpi1) stretch-staging; urgency=medium
+ [changes brought forward from 1.18.2-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:29:18 +0000]
+ * Switch to regular opengl and disable egl/gles to avoid conflicting with
+ raspberry pi foundation libraries.
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 11 Jun 2015 04:06:53 +0000
+
cogl (1.20.0-2) unstable; urgency=medium
* Upload to unstable.
diff -Nru cogl-1.20.0/debian/control cogl-1.20.0/debian/control
--- cogl-1.20.0/debian/control 2015-05-24 07:19:21.000000000 +0000
+++ cogl-1.20.0/debian/control 2015-06-11 04:21:25.000000000 +0000
@@ -14,7 +14,6 @@
gtk-doc-tools (>= 1.13),
libgbm-dev [linux-any],
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),
@@ -35,8 +34,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}
@@ -71,7 +69,6 @@
Depends: libcogl20 (= ${binary:Version}),
gir1.2-cogl-1.0 (= ${binary:Version}),
libgl1-mesa-dev (>= 7.1~rc3-1~),
- libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
libglib2.0-dev (>= 2.28.0),
libdrm-dev [!hurd-any],
libwayland-dev [linux-any],
@@ -235,7 +232,7 @@
dynamic bindings for libcogl-pango.
Package: libcogl-gles2-20
-Architecture: any
+Architecture: kfreebsd-any
Depends: ${shlibs:Depends},
${misc:Depends},
libgl1-mesa-glx [!armel !armhf ],
@@ -255,7 +252,7 @@
Package: libcogl-gles2-dev
Section: libdevel
-Architecture: any
+Architecture: kfreebsd-any
Depends: libcogl-gles2-20 (= ${binary:Version}),
libcogl-dev (= ${binary:Version}),
${misc:Depends},
diff -Nru cogl-1.20.0/debian/control.in cogl-1.20.0/debian/control.in
--- cogl-1.20.0/debian/control.in 2015-05-04 11:57:31.000000000 +0000
+++ cogl-1.20.0/debian/control.in 2015-06-11 04:06:57.000000000 +0000
@@ -10,7 +10,6 @@
gtk-doc-tools (>= 1.13),
libgbm-dev [linux-any],
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,8 +30,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}
@@ -67,7 +65,6 @@
Depends: libcogl20 (= ${binary:Version}),
gir1.2-cogl-1.0 (= ${binary:Version}),
libgl1-mesa-dev (>= 7.1~rc3-1~),
- libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
libglib2.0-dev (>= 2.28.0),
libdrm-dev [!hurd-any],
libwayland-dev [linux-any],
@@ -231,7 +228,7 @@
dynamic bindings for libcogl-pango.
Package: libcogl-gles2-20
-Architecture: any
+Architecture: kfreebsd-any
Depends: ${shlibs:Depends},
${misc:Depends},
libgl1-mesa-glx [!armel !armhf ],
@@ -251,7 +248,7 @@
Package: libcogl-gles2-dev
Section: libdevel
-Architecture: any
+Architecture: kfreebsd-any
Depends: libcogl-gles2-20 (= ${binary:Version}),
libcogl-dev (= ${binary:Version}),
${misc:Depends},
diff -Nru cogl-1.20.0/debian/libcogl20.symbols cogl-1.20.0/debian/libcogl20.symbols
--- cogl-1.20.0/debian/libcogl20.symbols 2015-05-04 11:57:31.000000000 +0000
+++ cogl-1.20.0/debian/libcogl20.symbols 2015-06-11 04:06:57.000000000 +0000
@@ -158,8 +158,6 @@
cogl_double_to_fixed@Base 1.17.4
cogl_double_to_int@Base 1.17.4
cogl_double_to_uint@Base 1.17.4
- cogl_egl_context_get_egl_context@Base 1.18.0
- cogl_egl_context_get_egl_display@Base 1.17.4
cogl_end_gl@Base 1.17.4
cogl_error_copy@Base 1.17.4
cogl_error_free@Base 1.17.4
@@ -344,12 +342,6 @@
cogl_is_texture_rectangle@Base 1.17.4
cogl_is_vertex_buffer@Base 1.17.4
cogl_is_vertex_buffer_indices@Base 1.17.4
- (arch=linux-any)cogl_kms_display_queue_modes_reset@Base 1.17.4
- (arch=linux-any)cogl_kms_display_set_ignore_crtc@Base 1.18.2
- (arch=linux-any)cogl_kms_display_set_layout@Base 1.17.4
- (arch=linux-any)cogl_kms_renderer_get_gbm@Base 1.18.2
- (arch=linux-any)cogl_kms_renderer_get_kms_fd@Base 1.17.4
- (arch=linux-any)cogl_kms_renderer_set_kms_fd@Base 1.18.0
cogl_material_alpha_func_get_type@Base 1.17.4
cogl_material_copy@Base 1.17.4
cogl_material_filter_get_type@Base 1.17.4
@@ -816,16 +808,6 @@
cogl_vertex_buffer_unref@Base 1.17.4
cogl_vertices_mode_get_type@Base 1.17.4
cogl_viewport@Base 1.17.4
- (arch=linux-any)cogl_wayland_display_set_compositor_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_get_shell_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_get_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_resize@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_set_foreign_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_get_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_set_event_dispatch_enabled@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_set_foreign_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_texture_2d_new_from_buffer@Base 1.17.4
- (arch=linux-any)cogl_wayland_texture_set_region_from_shm_buffer@Base 1.17.4
cogl_winding_get_type@Base 1.17.4
cogl_winsys_feature_get_type@Base 1.17.4
cogl_x11_onscreen_get_visual_xid@Base 1.17.4
diff -Nru cogl-1.20.0/debian/rules cogl-1.20.0/debian/rules
--- cogl-1.20.0/debian/rules 2015-05-04 11:57:31.000000000 +0000
+++ cogl-1.20.0/debian/rules 2015-06-11 04:06:57.000000000 +0000
@@ -23,23 +23,23 @@
--enable-gl=yes \
--enable-cogl-gst=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
-DEB_CONFIGURE_EXTRA_FLAGS += \
- --enable-xlib-egl-platform=yes \
- --enable-cogl-gles2=yes \
- --with-gles2-libname=libGLESv2.so.2 \
- --enable-gles2=yes
+#DEB_CONFIGURE_EXTRA_FLAGS += \
+# --enable-xlib-egl-platform=yes \
+# --enable-cogl-gles2=yes \
+# --with-gles2-libname=libGLESv2.so.2 \
+# --enable-gles2=yes
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += \
- --enable-wayland-egl-platform \
- --enable-wayland-egl-server \
- --enable-kms-egl-platform=yes
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#DEB_CONFIGURE_EXTRA_FLAGS += \
+# --enable-wayland-egl-platform \
+# --enable-wayland-egl-server \
+# --enable-kms-egl-platform=yes
+#endif
common-binary-predeb-arch:: list-missing