diff options
| author | Marvin Schmidt <marv@exherbo.org> | 2019-09-24 09:58:43 +0200 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2019-11-05 08:12:03 -0800 |
| commit | a57729d3180ee4bc3ae012cfd03fe5188d858a83 (patch) | |
| tree | 63d776eef846e6b3e89cd681fa208da40dc99dde | |
| parent | 3491f1dc5c701656e2f69f74b459dfcaef9451d6 (diff) | |
build: glx: Lower gl version to work with libglvnd
When using mesa with libglvnd support, mesa will no longer install the
gl, glx, egl pkg-config files but instead let libglvnd provide them.
libglvnd maintainers decided to change the versioning as it was
mesa-specific previously. Now the libraries have versions of the API
they expose[1].
This causes problems when building the X server:
checking for glproto >= 1.4.17 gl >= 9.2.0... no
configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
Requested 'gl >= 9.2.0' but version of gl is 1.2
Lower the version requirement to 1.2 to allow building against libglvnd
provided libraries
[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
(cherry picked from commit e6ef2b12404dfec7f23592a3524d2a63d9d25802)
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | glx/meson.build | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cb9765a70..42950ff19 100644 --- a/configure.ac +++ b/configure.ac @@ -765,7 +765,7 @@ LIBDRI="dri >= 7.8.0" LIBDRM="libdrm >= 2.4.89" LIBEGL="egl" LIBGBM="gbm >= 10.2.0" -LIBGL="gl >= 7.1.0" +LIBGL="gl >= 1.2" LIBXEXT="xext >= 1.0.99.4" LIBXFONT="xfont2 >= 2.0.0" LIBXI="xi >= 1.2.99.1" @@ -1116,7 +1116,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in yes,yes | auto,yes) AC_DEFINE(DRI2, 1, [Build DRI2 extension]) DRI2=yes - LIBGL="gl >= 9.2.0" + LIBGL="gl >= 1.2" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO" ;; esac diff --git a/glx/meson.build b/glx/meson.build index 69d558e78..bd5c62fea 100644 --- a/glx/meson.build +++ b/glx/meson.build @@ -39,7 +39,7 @@ if build_glx common_dep, dl_dep, dependency('glproto', version: '>= 1.4.17'), - dependency('gl', version: '>= 9.2.0'), + dependency('gl', version: '>= 1.2'), ], c_args: [ glx_align64, |