diff -Nru libepoxy-1.5.9/debian/changelog libepoxy-1.5.10/debian/changelog
--- libepoxy-1.5.9/debian/changelog	2022-03-24 12:11:40.000000000 +0000
+++ libepoxy-1.5.10/debian/changelog	2022-04-02 03:37:55.000000000 +0000
@@ -1,8 +1,8 @@
-libepoxy (1.5.9-2build1) jammy; urgency=high
+libepoxy (1.5.10-1) unstable; urgency=medium
 
-  * No change rebuild for ppc64el baseline bump.
+  * New upstream release.
 
- -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 24 Mar 2022 13:11:40 +0100
+ -- Timo Aaltonen <tjaalton@debian.org>  Sat, 02 Apr 2022 06:37:55 +0300
 
 libepoxy (1.5.9-2) unstable; urgency=medium
 
diff -Nru libepoxy-1.5.9/debian/control libepoxy-1.5.10/debian/control
--- libepoxy-1.5.9/debian/control	2022-03-24 12:11:40.000000000 +0000
+++ libepoxy-1.5.10/debian/control	2022-04-02 03:34:46.000000000 +0000
@@ -1,7 +1,6 @@
 Source: libepoxy
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Build-Depends: debhelper-compat (= 13),
                meson (>= 0.48.0),
                pkg-config,
diff -Nru libepoxy-1.5.9/meson.build libepoxy-1.5.10/meson.build
--- libepoxy-1.5.9/meson.build	2021-07-12 15:53:46.000000000 +0000
+++ libepoxy-1.5.10/meson.build	2022-02-17 12:56:12.000000000 +0000
@@ -1,4 +1,4 @@
-project('libepoxy', 'c', version: '1.5.9',
+project('libepoxy', 'c', version: '1.5.10',
         default_options: [
           'buildtype=debugoptimized',
           'c_std=gnu99',
@@ -95,6 +95,7 @@
     '-we4053', # an expression of type void was used as an operand
     '-we4071', # no function prototype given
     '-we4819', # the file contains a character that cannot be represented in the current code page
+    '/utf-8', # Set the input and exec encoding to utf-8, like is the default with GCC
   ]
 elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
   test_cflags = [
@@ -165,9 +166,11 @@
 dl_dep = cc.find_library('dl', required: false)
 gl_dep = dependency('gl', required: false)
 egl_dep = dependency('egl', required: false)
+elg_headers_dep = egl_dep.partial_dependency(compile_args: true, includes: true)
 
 # Optional dependencies for tests
 x11_dep = dependency('x11', required: false)
+x11_headers_dep = x11_dep.partial_dependency(compile_args: true, includes: true)
 
 # GLES v2 and v1 may have pkg-config files, courtesy of downstream
 # packagers; let's check those first, and fall back to find_library()
diff -Nru libepoxy-1.5.9/src/dispatch_common.c libepoxy-1.5.10/src/dispatch_common.c
--- libepoxy-1.5.9/src/dispatch_common.c	2021-07-12 15:53:46.000000000 +0000
+++ libepoxy-1.5.10/src/dispatch_common.c	2022-02-17 12:56:12.000000000 +0000
@@ -683,7 +683,11 @@
 #endif
 
     if (!api.gl_handle) {
+#if defined(OPENGL_LIB)
         fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB);
+#else
+        fprintf(stderr, "Couldn't open %s\n", GLX_LIB);
+#endif
         abort();
     }
 
diff -Nru libepoxy-1.5.9/src/meson.build libepoxy-1.5.10/src/meson.build
--- libepoxy-1.5.9/src/meson.build	2021-07-12 15:53:46.000000000 +0000
+++ libepoxy-1.5.10/src/meson.build	2022-02-17 12:56:12.000000000 +0000
@@ -59,6 +59,12 @@
 if host_system == 'windows'
   epoxy_deps += [ opengl32_dep, gdi32_dep ]
 endif
+if enable_x11
+  epoxy_deps += [ x11_headers_dep, ]
+endif
+if build_egl
+  epoxy_deps += [ elg_headers_dep, ]
+endif
 
 libepoxy = library(
   'epoxy',