diff --git a/METADATA b/METADATA
index 3e3ad4f..5da25d0 100644
--- a/METADATA
+++ b/METADATA
@@ -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 @@
   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,