diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-27 17:01:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-28 16:32:57 +0200 |
| commit | 7d0d1b198e8f87b9a59a584abf71800874f6a431 (patch) | |
| tree | 20ccaa25b57e27c631925c8f34b9d4a56026a797 /external/epoxy/epoxy.noegl.by.default.patch | |
| parent | 7f3c6efd859050c8f376b6820710e91fa9077ac4 (diff) | |
upgrade epoxy to 1.5.2
Change-Id: Ic3093d3c12c33cbcc09903409daec6277428ecd6
Reviewed-on: https://gerrit.libreoffice.org/59664
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/epoxy/epoxy.noegl.by.default.patch')
| -rw-r--r-- | external/epoxy/epoxy.noegl.by.default.patch | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/external/epoxy/epoxy.noegl.by.default.patch b/external/epoxy/epoxy.noegl.by.default.patch index d80a3b99f15c..b562af433198 100644 --- a/external/epoxy/epoxy.noegl.by.default.patch +++ b/external/epoxy/epoxy.noegl.by.default.patch @@ -1,11 +1,29 @@ --- src/dispatch_common.h +++ src/dispatch_common.h -@@ -39,7 +39,7 @@ +@@ -24,20 +24,19 @@ + #include "config.h" + + #ifdef _WIN32 +-#define PLATFORM_HAS_EGL ENABLE_EGL +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_EGL 0 ++#define PLATFORM_HAS_GLX 0 + #define PLATFORM_HAS_WGL 1 + #elif defined(__APPLE__) +-#define PLATFORM_HAS_EGL ENABLE_EGL +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_EGL 0 ++#define PLATFORM_HAS_GLX 0 + #define PLATFORM_HAS_WGL 0 + #elif defined(ANDROID) +-#define PLATFORM_HAS_EGL ENABLE_EGL ++#define PLATFORM_HAS_EGL 1 + #define PLATFORM_HAS_GLX 0 #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT #else --#define PLATFORM_HAS_EGL 1 -+ - #define PLATFORM_HAS_GLX 1 +-#define PLATFORM_HAS_EGL ENABLE_EGL +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_GLX 1 #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT + #endif + |