diff options
| author | Haibo Huang <hhb@google.com> | 2019-09-13 17:13:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-13 17:13:26 -0700 |
| commit | e8646ce3255d0afe6894b943fc33ce6679f408aa (patch) | |
| tree | d97183c3280b99ee60ef74424c2dc8587620aa03 | |
| parent | e337bc34507bf7eddd9db2ab5079a5956c54cb66 (diff) | |
| parent | affffb66ec25c17986f606106460f9c44eb7d8ec (diff) | |
| download | libepoxy-e8646ce3255d0afe6894b943fc33ce6679f408aa.tar.gz | |
Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313
am: affffb66ec
Change-Id: Ib9f90cc674c6ec42b5097b211803bf7d00464694
| -rw-r--r-- | METADATA | 12 | ||||
| -rw-r--r-- | test/egl_epoxy_api.c | 4 | ||||
| -rw-r--r-- | test/egl_has_extension_nocontext.c | 4 | ||||
| -rw-r--r-- | test/meson.build | 2 |
4 files changed, 16 insertions, 6 deletions
@@ -1,13 +1,15 @@ name: "libepoxy" -description: - "Epoxy is a library for handling OpenGL function pointers" - +description: "Epoxy is a library for handling OpenGL function pointers" third_party { url { type: GIT value: "https://github.com/anholt/libepoxy.git" } - version: "707f50e680ab4f1861b1e54ca6e2907aaca56c12" - last_upgrade_date { year: 2019 month: 3 day: 26 } + version: "af38a466caf9c2ae49b8acda4ff842ae44d57f78" license_type: NOTICE + last_upgrade_date { + year: 2019 + month: 9 + day: 11 + } } diff --git a/test/egl_epoxy_api.c b/test/egl_epoxy_api.c index a840525..252b535 100644 --- a/test/egl_epoxy_api.c +++ b/test/egl_epoxy_api.c @@ -27,7 +27,11 @@ * Tests the Epoxy API using EGL. */ +#ifdef __sun +#define __EXTENSIONS__ +#else #define _GNU_SOURCE +#endif #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/test/egl_has_extension_nocontext.c b/test/egl_has_extension_nocontext.c index a95860a..4fa5f60 100644 --- a/test/egl_has_extension_nocontext.c +++ b/test/egl_has_extension_nocontext.c @@ -28,7 +28,11 @@ * no context bound would fail out in dispatch. */ +#ifdef __sun +#define __EXTENSIONS__ +#else #define _GNU_SOURCE +#endif #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/test/meson.build b/test/meson.build index c73bf5d..862d57a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -80,7 +80,7 @@ if build_egl and build_x11_tests endforeach endif -if build_glx +if build_glx and build_x11_tests glx_common_sources = [ 'glx_common.h', 'glx_common.c', ] glx_common_lib = static_library('glx_common', sources: glx_common_sources, |