package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch

   1 From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001
   2 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
   3 Date: Mon, 18 Jan 2016 10:08:44 -0800
   4 Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows
   5
   6 Followup for anholt/libepoxy#52
   7
   8 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
   9 Fetched from pull #81 on github for libepoxy:
  10 https://github.com/anholt/libepoxy/pull/81/commits
  11 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  12 ---
  13  configure.ac          | 6 +++---
  14  src/dispatch_common.h | 4 ++--
  15  2 files changed, 5 insertions(+), 5 deletions(-)
  16
  17 diff --git a/configure.ac b/configure.ac
  18 index d3d947c..b4c7ede 100644
  19 --- a/configure.ac
  20 +++ b/configure.ac
  21 @@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
  22  AC_ARG_ENABLE([glx],
  23                  [AS_HELP_STRING([--disable-glx],
  24                                 [disable if you don't want x11/glx support])],
  25 -                [],
  26 +                [enable_glx=$enableval],
  27                  [enable_glx=yes]
  28               )
  29
  30 @@ -74,7 +74,7 @@ has_znow=yes
  31  case $host_os in
  32      mingw*)
  33          build_egl=no
  34 -        build_glx=no
  35 +        build_glx=$x11
  36          build_wgl=yes
  37          # On windows, the DLL has to have all of its functions
  38          # resolved at link time, so we have to link directly aginst
  39 @@ -89,7 +89,7 @@ case $host_os in
  40          ;;
  41      darwin*)
  42          build_egl=no
  43 -        build_glx=no
  44 +        build_glx=$x11
  45          build_wgl=no
  46          build_apple=yes
  47          has_znow=no
  48 diff --git a/src/dispatch_common.h b/src/dispatch_common.h
  49 index 2728b45..c30ce44 100644
  50 --- a/src/dispatch_common.h
  51 +++ b/src/dispatch_common.h
  52 @@ -26,12 +26,12 @@
  53
  54  #ifdef _WIN32
  55  #define PLATFORM_HAS_EGL 0
  56 -#define PLATFORM_HAS_GLX 0
  57 +#define PLATFORM_HAS_GLX BUILD_GLX
  58  #define PLATFORM_HAS_WGL BUILD_WGL
  59  #define EPOXY_IMPORTEXPORT __declspec(dllexport)
  60  #elif defined(__APPLE__)
  61  #define PLATFORM_HAS_EGL 0
  62 -#define PLATFORM_HAS_GLX 0
  63 +#define PLATFORM_HAS_GLX BUILD_GLX
  64  #define PLATFORM_HAS_WGL 0
  65  #define EPOXY_IMPORTEXPORT
  66  #elif defined(ANDROID)
  67