isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl/path: Don't depend on GL/glu.h

Browse Source 
It's not needed for anything, and we can get rid of the dependency we
just added.

Also remove the installation step from Dockerfile.
This commit is contained in:
Jonas Ådahl 2019-01-22 19:01:51 +01:00
parent 6c91683380
commit c57ae7fc9c
8 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/Dockerfile
View File

@ -5,7 +5,7 @@ RUN dnf -y update && dnf -y upgrade && \
dnf builddep -y mutter && \ dnf builddep -y mutter && \
# Until Fedora catches up with meson build-deps # 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 # For running unit tests
dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \ dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \

1
cogl/cogl-path/meson.build
View File

@ -50,7 +50,6 @@ cogl_path_sources += libmutter_cogl_path_enum_types
cogl_path_c_args = [ cogl_path_c_args = [
cogl_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, libmutter_cogl_path = shared_library('mutter-cogl-path-' + libmutter_api_version,

2
cogl/cogl-path/tesselator/mesh.h
View File

@ -35,7 +35,7 @@
#ifndef __mesh_h_ #ifndef __mesh_h_
#define __mesh_h_ #define __mesh_h_
#include <GL/glu.h> #include <GL/gl.h>
typedef struct GLUmesh GLUmesh; typedef struct GLUmesh GLUmesh;

1
cogl/cogl-path/tesselator/normal.h
View File

@ -36,6 +36,7 @@
#define __normal_h_ #define __normal_h_
#include "tess.h" #include "tess.h"
#include "tesselator.h"
/* __gl_projectPolygon( tess ) determines the polygon normal /* __gl_projectPolygon( tess ) determines the polygon normal
* and project vertices onto the plane of the polygon. * and project vertices onto the plane of the polygon.

1
cogl/cogl-path/tesselator/render.h
View File

@ -36,6 +36,7 @@
#define __render_h_ #define __render_h_
#include "mesh.h" #include "mesh.h"
#include "tesselator.h"
/* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle /* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle
* fans, strips, and separate triangles. A substantial effort is made * fans, strips, and separate triangles. A substantial effort is made

1
cogl/cogl-path/tesselator/sweep.h
View File

@ -36,6 +36,7 @@
#define __sweep_h_ #define __sweep_h_
#include "mesh.h" #include "mesh.h"
#include "tesselator.h"
/* __gl_computeInterior( tess ) computes the planar arrangement specified /* __gl_computeInterior( tess ) computes the planar arrangement specified
* by the given contours, and further subdivides this arrangement * by the given contours, and further subdivides this arrangement

1
cogl/cogl-path/tesselator/tess.h
View File

@ -35,7 +35,6 @@
#ifndef __tess_h_ #ifndef __tess_h_
#define __tess_h_ #define __tess_h_
#include <GL/glu.h>
#include <setjmp.h> #include <setjmp.h>
#include "mesh.h" #include "mesh.h"
#include "dict.h" #include "dict.h"

1
meson.build
View File

@ -120,7 +120,6 @@ xinerama_dep = dependency('xinerama')
ice_dep = dependency('ice') ice_dep = dependency('ice')
atk_dep = dependency('atk', version: atk_req) atk_dep = dependency('atk', version: atk_req)
libcanberra_dep = dependency('libcanberra', version: libcanberra_req) libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
glu_dep = dependency('glu')
# For now always require X11 support # For now always require X11 support
have_x11 = true have_x11 = true