diff -Nru cogl-1.22.2/debian/changelog cogl-1.22.2/debian/changelog --- cogl-1.22.2/debian/changelog 2017-12-19 21:24:19.000000000 +0000 +++ cogl-1.22.2/debian/changelog 2017-12-27 20:06:04.000000000 +0000 @@ -1,3 +1,15 @@ +cogl (1.22.2-3+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1.18.2-3+rpi1 by Peter Michael Green 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. + + [changes brought forward from 1.22.0-1+rpi2 by Peter Michael Green at Fri, 25 Sep 2015 01:24:58 +0000] + * Move libwayland-dev from Depends and Build-depends to build-conflicts. + Wayland without EGL seems to be a problem combination. + + -- Raspbian forward porter Wed, 27 Dec 2017 20:06:04 +0000 + cogl (1.22.2-3) unstable; urgency=medium * Add debian/patches/fix-undef-build-failure.patch: diff -Nru cogl-1.22.2/debian/control cogl-1.22.2/debian/control --- cogl-1.22.2/debian/control 2017-12-19 21:24:19.000000000 +0000 +++ cogl-1.22.2/debian/control 2017-12-27 20:06:04.000000000 +0000 @@ -12,12 +12,10 @@ 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), libglib2.0-dev (>= 2.32.0), - libwayland-dev (>= 1.1.90) [linux-any], libxfixes-dev (>= 1:3), libxdamage-dev, libxcomposite-dev (>= 1:0.4), @@ -27,6 +25,8 @@ gobject-introspection (>= 1.33.4-1~), libgirepository1.0-dev (>= 0.9.12), libgstreamer-plugins-base1.0-dev +Build-Conflicts: + libwayland-dev (>= 1.1.90) Standards-Version: 4.1.2 Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/cogl.git Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/cogl.git @@ -35,8 +35,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 Breaks: libclutter-1.0-0 (<< 1.17), @@ -72,10 +71,8 @@ gir1.2-cogl-1.0 (= ${binary:Version}), libcairo2-dev, 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], libgbm-dev [linux-any], libgdk-pixbuf2.0-dev (>= 2.0), libx11-dev, @@ -209,7 +206,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 ], @@ -228,7 +225,7 @@ Package: libcogl-gles2-dev Section: libdevel -Architecture: any +Architecture: kfreebsd-any Multi-Arch: same Depends: libcogl-gles2-20 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), diff -Nru cogl-1.22.2/debian/control.in cogl-1.22.2/debian/control.in --- cogl-1.22.2/debian/control.in 2017-12-19 21:24:19.000000000 +0000 +++ cogl-1.22.2/debian/control.in 2017-12-27 20:06:04.000000000 +0000 @@ -8,12 +8,10 @@ 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), libglib2.0-dev (>= 2.32.0), - libwayland-dev (>= 1.1.90) [linux-any], libxfixes-dev (>= 1:3), libxdamage-dev, libxcomposite-dev (>= 1:0.4), @@ -23,6 +21,8 @@ gobject-introspection (>= 1.33.4-1~), libgirepository1.0-dev (>= 0.9.12), libgstreamer-plugins-base1.0-dev +Build-Conflicts: + libwayland-dev (>= 1.1.90) Standards-Version: 4.1.2 Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/cogl.git Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/cogl.git @@ -31,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 Breaks: libclutter-1.0-0 (<< 1.17), @@ -68,10 +67,8 @@ gir1.2-cogl-1.0 (= ${binary:Version}), libcairo2-dev, 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], libgbm-dev [linux-any], libgdk-pixbuf2.0-dev (>= 2.0), libx11-dev, @@ -205,7 +202,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 ], @@ -224,7 +221,7 @@ Package: libcogl-gles2-dev Section: libdevel -Architecture: any +Architecture: kfreebsd-any Multi-Arch: same Depends: libcogl-gles2-20 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), diff -Nru cogl-1.22.2/debian/libcogl20.symbols cogl-1.22.2/debian/libcogl20.symbols --- cogl-1.22.2/debian/libcogl20.symbols 2017-12-19 21:24:19.000000000 +0000 +++ cogl-1.22.2/debian/libcogl20.symbols 2017-12-27 20:06:04.000000000 +0000 @@ -159,8 +159,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 @@ -345,12 +343,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 @@ -817,16 +809,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.22.2/debian/rules cogl-1.22.2/debian/rules --- cogl-1.22.2/debian/rules 2017-12-19 21:24:19.000000000 +0000 +++ cogl-1.22.2/debian/rules 2017-12-27 20:06:04.000000000 +0000 @@ -7,20 +7,20 @@ %: dh $@ --with gir,gnome -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) -CONFFLAGS += \ - --with-default-driver=gles2 -else +#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) +#CONFFLAGS += \ +# --with-default-driver=gles2 +#else CONFFLAGS += \ --with-default-driver=gl -endif +#endif -ifeq ($(DEB_HOST_ARCH_OS),linux) -CONFFLAGS += \ - --enable-wayland-egl-platform \ - --enable-wayland-egl-server \ - --enable-kms-egl-platform -endif +#ifeq ($(DEB_HOST_ARCH_OS),linux) +#CONFFLAGS += \ +# --enable-wayland-egl-platform \ +# --enable-wayland-egl-server \ +# --enable-kms-egl-platform +#endif override_dh_autoreconf: dh_autoreconf --as-needed @@ -33,10 +33,6 @@ --enable-introspection \ --enable-gl \ --enable-cogl-gst \ - --enable-xlib-egl-platform \ - --enable-cogl-gles2 \ - --enable-gles2 \ - --with-gles2-libname=libGLESv2.so.2 \ $(CONFFLAGS) override_dh_makeshlibs: