diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2019-01-20 11:36:56 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2019-01-22 18:31:52 +0100 |
| commit | 54685091f1bb98b9fcf45085031c9fa19caf7899 (patch) | |
| tree | 9d631437fb2af9e400c892e0f89041e79b3e65e3 /.gitlab-ci | |
| parent | d4a9535f04b4b230c1dd41285c0bd4bba18f8616 (diff) | |
| download | mutter-54685091f1bb98b9fcf45085031c9fa19caf7899.tar.gz | |
cogl-path: Remove own glu.h version
cogl-path uses types from glu.h, but to avoid a build dependency on glu,
it kept a minified copy of glu.h in tree. Drop this file and just use
the actual glu.h. To avoid linking to libGLU.so, just use the
includepath, instead of actually adding glu as a real dependency.
This means we can remove an includepath meant to make it possible to
include <GL/glu.h>.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index dafa5ac24..f755b126c 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -5,7 +5,7 @@ RUN dnf -y update && dnf -y upgrade && \ dnf builddep -y mutter && \ # Until Fedora catches up with meson build-deps - dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \ + dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland mesa-libGLU-devel && \ # For running unit tests dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \ |