From: Raspbian forward pporter Date: Wed, 27 Dec 2017 20:06:04 +0000 (+0000) Subject: Merge version 1.22.2-2+rpi1 and 1.22.2-3 to produce 1.22.2-3+rpi1 X-Git-Tag: archive/raspbian/1.22.2-3+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8cdd7d33c53f43d72589c3910b954f17fd632718;p=cogl.git Merge version 1.22.2-2+rpi1 and 1.22.2-3 to produce 1.22.2-3+rpi1 --- 8a1aeca0f82adebf39173013cb0ccf0040f3130b diff --cc debian/changelog index b2de89c,2f71b28..372b094 --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,16 +1,28 @@@ - cogl (1.22.2-2+rpi1) stretch-staging; urgency=medium ++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. + - -- Peter Michael Green Thu, 29 Sep 2016 15:26:58 +0000 ++ -- 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: + - Patch from Bugzilla to fix kfreebsd build failure + * Update Vcs fields for conversion to git + * Add Multi-Arch metadata, thanks multiarch hinter + * Add debian/gbp.conf + * Run build tests with xvfb, but still don't fail build for test failures + * Bump debhelper compat to 11 + * Bump Standards-Version to 4.1.2 + * Build with all hardening flags + + -- Jeremy Bicha Tue, 19 Dec 2017 16:24:19 -0500 cogl (1.22.2-2) unstable; urgency=medium diff --cc debian/control index 131ce98,3020bf5..2dcdca6 --- a/debian/control +++ b/debian/control @@@ -24,20 -27,18 +25,19 @@@ Build-Depends: debhelper (>= 11) 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: 3.9.8 - Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl - Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/ + 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 Package: libcogl20 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} Breaks: libclutter-1.0-0 (<< 1.17), libcogl9, libcogl11, @@@ -224,7 -228,8 +225,8 @@@ Description: Object oriented GL/GLES Ab Package: libcogl-gles2-dev Section: libdevel -Architecture: any +Architecture: kfreebsd-any + Multi-Arch: same Depends: libcogl-gles2-20 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), ${misc:Depends}, diff --cc debian/control.in index 663118a,5053461..9d14340 --- a/debian/control.in +++ b/debian/control.in @@@ -20,20 -23,18 +21,19 @@@ Build-Depends: debhelper (>= 11) 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: 3.9.8 - Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl - Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/ + 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 Package: libcogl20 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} Breaks: libclutter-1.0-0 (<< 1.17), libcogl9, libcogl11, @@@ -220,7 -224,8 +221,8 @@@ Description: Object oriented GL/GLES Ab Package: libcogl-gles2-dev Section: libdevel -Architecture: any +Architecture: kfreebsd-any + Multi-Arch: same Depends: libcogl-gles2-20 (= ${binary:Version}), libcogl-dev (= ${binary:Version}), ${misc:Depends}, diff --cc debian/rules index 6316870,82b28a5..f35bb30 --- a/debian/rules +++ b/debian/rules @@@ -1,25 -1,30 +1,30 @@@ #!/usr/bin/make -f + -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk - include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + export DEB_BUILD_MAINT_OPTIONS = hardening=+all + export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with autoreconf,gir,gnome + 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 + override_dh_auto_configure: dh_auto_configure -- \ --enable-gtk-doc \