fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: For glesv3 detection, use glesv2.pc + header check

Browse source 
There is no glesv3.pc provided by mesa, perhaps because
the glesv3 support is provided by the libGLESv2 library.
Don't bother testing for glesv3.pc, just check for glesv2.pc
and then search for the gl3.h header file.

This fixes an issue reported by Theo Veenker, where building
with glesv3 enabled would result in a cairo.pc file that depends
on the non-existant glesv3.pc.
This commit is contained in:
Bryce Harrington 2018-06-12 12:34:48 -07:00
parent 2b6b23fd8c
commit 9c7d5a49c6
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
configure.ac
View file

@ -395,15 +395,18 @@ CAIRO_ENABLE_SURFACE_BACKEND(glesv2, OpenGLESv2, no, [
dnl ===========================================================================
CAIRO_ENABLE_SURFACE_BACKEND(glesv3, OpenGLESv3, no, [
glesv3_REQUIRES="glesv3"
dnl glesv3 is provided via libGLESv2.so, so require glesv2.pc (there is no libGLESv3, nor glesv3.pc)
glesv3_REQUIRES="glesv2"
PKG_CHECK_MODULES(glesv3, $glesv3_REQUIRES,, [
dnl Fallback to searching for headers
AC_CHECK_HEADER(GLES3/gl3.h,, [use_glesv3="no (glesv3.pc nor OpenGL ES 3.0 headers not found)"])
if test "x$use_glesv3" = "xyes"; then
glesv3_NONPKGCONFIG_CFLAGS=
dnl glesv3 is provided by the libGLESv2 library (there is no separate libGLESv3)
glesv3_NONPKGCONFIG_LIBS="-lGLESv2"
fi])
use_glesv3="no (glesv2.pc not found, required for glesv3)"
])
dnl Since there is no glesv3.pc, need to search for header files
AC_CHECK_HEADER(GLES3/gl3.h,, [use_glesv3="no (OpenGL ES 3.0 headers not found)"])
if test "x$use_glesv3" = "xyes"; then
glesv3_NONPKGCONFIG_CFLAGS=
glesv3_NONPKGCONFIG_LIBS="-lGLESv2"
fi
if test "x$have_dl" = "xyes" -a "x$have_dlsym" = "xyes"; then
glesv3_LIBS="$glesv3_LIBS -ldl"