diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index f755b126c..dafa5ac24 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 mesa-libGLU-devel && \ + dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \ # For running unit tests dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \ diff --git a/cogl/cogl-path/meson.build b/cogl/cogl-path/meson.build index 37cd18fc4..7df5636cc 100644 --- a/cogl/cogl-path/meson.build +++ b/cogl/cogl-path/meson.build @@ -50,7 +50,6 @@ cogl_path_sources += libmutter_cogl_path_enum_types cogl_path_c_args = [ cogl_c_args, - '-I@0@'.format(glu_dep.get_pkgconfig_variable('includedir')), ] libmutter_cogl_path = shared_library('mutter-cogl-path-' + libmutter_api_version, diff --git a/cogl/cogl-path/tesselator/mesh.h b/cogl/cogl-path/tesselator/mesh.h index 690c5f2f6..ede4798a3 100644 --- a/cogl/cogl-path/tesselator/mesh.h +++ b/cogl/cogl-path/tesselator/mesh.h @@ -35,7 +35,7 @@ #ifndef __mesh_h_ #define __mesh_h_ -#include +#include typedef struct GLUmesh GLUmesh; diff --git a/cogl/cogl-path/tesselator/normal.h b/cogl/cogl-path/tesselator/normal.h index c376ca445..b699e087a 100644 --- a/cogl/cogl-path/tesselator/normal.h +++ b/cogl/cogl-path/tesselator/normal.h @@ -36,6 +36,7 @@ #define __normal_h_ #include "tess.h" +#include "tesselator.h" /* __gl_projectPolygon( tess ) determines the polygon normal * and project vertices onto the plane of the polygon. diff --git a/cogl/cogl-path/tesselator/render.h b/cogl/cogl-path/tesselator/render.h index a298c9a94..e0621e84e 100644 --- a/cogl/cogl-path/tesselator/render.h +++ b/cogl/cogl-path/tesselator/render.h @@ -36,6 +36,7 @@ #define __render_h_ #include "mesh.h" +#include "tesselator.h" /* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle * fans, strips, and separate triangles. A substantial effort is made diff --git a/cogl/cogl-path/tesselator/sweep.h b/cogl/cogl-path/tesselator/sweep.h index feb68b0ff..8b3857796 100644 --- a/cogl/cogl-path/tesselator/sweep.h +++ b/cogl/cogl-path/tesselator/sweep.h @@ -36,6 +36,7 @@ #define __sweep_h_ #include "mesh.h" +#include "tesselator.h" /* __gl_computeInterior( tess ) computes the planar arrangement specified * by the given contours, and further subdivides this arrangement diff --git a/cogl/cogl-path/tesselator/tess.h b/cogl/cogl-path/tesselator/tess.h index 162496088..061dd760c 100644 --- a/cogl/cogl-path/tesselator/tess.h +++ b/cogl/cogl-path/tesselator/tess.h @@ -35,7 +35,6 @@ #ifndef __tess_h_ #define __tess_h_ -#include #include #include "mesh.h" #include "dict.h" diff --git a/meson.build b/meson.build index 4db8b8cfc..cb3e77a58 100644 --- a/meson.build +++ b/meson.build @@ -120,7 +120,6 @@ xinerama_dep = dependency('xinerama') ice_dep = dependency('ice') atk_dep = dependency('atk', version: atk_req) libcanberra_dep = dependency('libcanberra', version: libcanberra_req) -glu_dep = dependency('glu') # For now always require X11 support have_x11 = true