[cogl/master: 13/13] Merge branch 'wip/hadess/automake-1.16' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 0d32bdef01b254aafc415977c243effd263599e9
Merge: 7250eefd 559e5f54
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Jun 4 11:45:36 2020 +0000

    Merge branch 'wip/hadess/automake-1.16' into 'master'
    
    Add automake 1.16 support
    
    See merge request GNOME/cogl!24

 .gitlab-ci.yml                               | 48 ++++++++++++++++++++++++++++
 autogen.sh                                   |  2 +-
 cogl/cogl-atlas.c                            |  2 +-
 cogl/cogl-blend-string.c                     |  2 +-
 cogl/cogl-primitive.h                        |  3 +-
 cogl/cogl.c                                  |  2 ++
 cogl/driver/gl/cogl-attribute-gl.c           |  2 ++
 cogl/driver/gl/cogl-framebuffer-gl.c         |  2 +-
 cogl/driver/gl/cogl-pipeline-fragend-fixed.c |  3 ++
 cogl/driver/gl/cogl-util-gl.c                |  5 +++
 10 files changed, 65 insertions(+), 6 deletions(-)
---