package/libepoxy/0006-Make-egl-conditional.patch

   1 From 5492e81f317e48141b0687ad77252c52c2dfcd6d Mon Sep 17 00:00:00 2001
   2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
   3 Date: Fri, 5 Feb 2016 19:03:39 -0300
   4 Subject: [PATCH] Make egl conditional
   5
   6 Mesa can be built with GLX and without EGL support, so make this
   7 possible in epoxy as well.
   8
   9 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  10 ---
  11  configure.ac | 11 +++++++++--
  12  1 file changed, 9 insertions(+), 2 deletions(-)
  13
  14 diff --git a/configure.ac b/configure.ac
  15 index 6e56599..21e3a25 100644
  16 --- a/configure.ac
  17 +++ b/configure.ac
  18 @@ -58,6 +58,13 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
  19  # uintptr_t to a void *") by default.  Kill that.
  20  XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
  21
  22 +AC_ARG_ENABLE([egl],
  23 +               [AS_HELP_STRING([--disable-egl],
  24 +                               [disable if you don't want egl support])],
  25 +               [enable_egl=$enableval],
  26 +               [enable_egl=yes]
  27 +             )
  28 +
  29  AC_ARG_ENABLE([glx],
  30                  [AS_HELP_STRING([--disable-glx],
  31                                 [disable if you don't want x11/glx support])],
  32 @@ -65,6 +72,7 @@ AC_ARG_ENABLE([glx],
  33                  [enable_glx=yes]
  34               )
  35
  36 +PKG_CHECK_MODULES(EGL, [egl], [egl=$enable_egl], [egl=no])
  37  PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
  38
  39  AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
  40 @@ -96,7 +104,7 @@ case $host_os in
  41          EPOXY_LINK_LIBS=""
  42          ;;
  43      *)
  44 -        build_egl=yes
  45 +        build_egl=$egl
  46          build_glx=$x11
  47          build_wgl=no
  48          # On platforms with dlopen, we load everything dynamically and
  49 @@ -109,7 +117,6 @@ AC_SUBST(EPOXY_LINK_LIBS)
  50
  51  AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
  52  if test x$build_egl = xyes; then
  53 -    PKG_CHECK_MODULES(EGL, [egl])
  54      AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
  55  fi
  56
  57 --
  58 2.4.10
  59