diff --git a/recipes-support/libepoxy/files/0001-configure.ac-don-t-rely-on-Xorg.macros.patch b/recipes-support/libepoxy/files/0001-configure.ac-don-t-rely-on-Xorg.macros.patch
new file mode 100644
index 00000000..fd23b087
--- /dev/null
+++ b/recipes-support/libepoxy/files/0001-configure.ac-don-t-rely-on-Xorg.macros.patch
@@ -0,0 +1,46 @@
+From 3f93930dc8acf938a6dc4907a082da71e3a31569 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 29 Jan 2015 13:22:58 +0100
+Subject: [PATCH 1/2] configure.ac: don't rely on Xorg.macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a52fc58..d24d4a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,15 +31,6 @@ AC_CONFIG_HEADERS([config.h])
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+ 
+-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+-m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen.
+-  Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or,
+-  depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])])
+-
+-XORG_MACROS_VERSION(1.8)
+-XORG_DEFAULT_OPTIONS
+-
+ AC_CHECK_PROGS([PYTHON], [python3 python2 python])
+ 
+ # Initialize libtool
+@@ -54,9 +45,6 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
+                            )]
+                )
+ 
+-# OS X defaults to having -Wint-conversion ("warn when passing
+-# uintptr_t to a void *") by default.  Kill that.
+-XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+ 
+ has_znow=yes
+ 
+-- 
+1.8.3.1
+
diff --git a/recipes-support/libepoxy/files/0002-take-configuration-into-consideration-when-selecting.patch b/recipes-support/libepoxy/files/0002-take-configuration-into-consideration-when-selecting.patch
new file mode 100644
index 00000000..5d721be3
--- /dev/null
+++ b/recipes-support/libepoxy/files/0002-take-configuration-into-consideration-when-selecting.patch
@@ -0,0 +1,102 @@
+From a1d0f9eae290432de4762c29d22183c524579c57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 29 Jan 2015 13:35:57 +0100
+Subject: [PATCH 2/2] take configuration into consideration when selecting
+ supported platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+doing so we can build properly on X11-less wayland environments
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac          | 14 ++++++--------
+ src/dispatch_common.h |  9 +++++----
+ 2 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d24d4a9..74dba1a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
+                            )]
+                )
+ 
++PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
++
++AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
++
+ 
+ has_znow=yes
+ 
+@@ -74,7 +78,7 @@ case $host_os in
+         ;;
+     *)
+         build_egl=yes
+-        build_glx=yes
++        build_glx=$x11
+         build_wgl=no
+         # On platforms with dlopen, we load everything dynamically and
+         # don't link against a specific window system or GL implementation.
+@@ -132,13 +136,6 @@ esac
+ 
+ AC_SUBST([VISIBILITY_CFLAGS])
+ 
+-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
+-if test x$x11 = xno -a x$build_glx = xyes; then
+-    AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
+-fi
+-
+-AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
+-
+ PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
+ 
+ AC_CONFIG_FILES([
+@@ -150,6 +147,7 @@ AC_CONFIG_FILES([
+ ])
+ AC_OUTPUT
+ 
++echo "           X11:         $x11"
+ echo "           EGL:         $build_egl"
+ echo "           GLX:         $build_glx"
+ echo "           WGL:         $build_wgl"
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index 6b8503a..82681e4 100644
+--- a/src/dispatch_common.h
++++ b/src/dispatch_common.h
+@@ -21,12 +21,13 @@
+  * IN THE SOFTWARE.
+  */
+ 
++#include <config.h>
+ #include <stdbool.h>
+ 
+ #ifdef _WIN32
+ #define PLATFORM_HAS_EGL 0
+ #define PLATFORM_HAS_GLX 0
+-#define PLATFORM_HAS_WGL 1
++#define PLATFORM_HAS_WGL BUILD_WGL
+ #define EPOXY_IMPORTEXPORT __declspec(dllexport)
+ #elif defined(__APPLE__)
+ #define PLATFORM_HAS_EGL 0
+@@ -34,13 +35,13 @@
+ #define PLATFORM_HAS_WGL 0
+ #define EPOXY_IMPORTEXPORT
+ #elif defined(ANDROID)
+-#define PLATFORM_HAS_EGL 1
++#define PLATFORM_HAS_EGL BUILD_EGL
+ #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 BUILD_EGL
++#define PLATFORM_HAS_GLX BUILD_GLX
+ #define PLATFORM_HAS_WGL 0
+ #define EPOXY_IMPORTEXPORT
+ #endif
+-- 
+1.8.3.1
+
diff --git a/recipes-support/libepoxy/libepoxy_git.bb b/recipes-support/libepoxy/libepoxy_git.bb
new file mode 100644
index 00000000..3b9ceee2
--- /dev/null
+++ b/recipes-support/libepoxy/libepoxy_git.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Epoxy is a library for handling OpenGL function pointer management"
+HOMEPAGE = "<http://github.com/anholt/libepoxy"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
+
+SRC_URI = " \
+	git://github.com/anholt/libepoxy.git;protocol=git;branch=master \
+	file://0001-configure.ac-don-t-rely-on-Xorg.macros.patch \
+	file://0002-take-configuration-into-consideration-when-selecting.patch \
+"
+SRCREV = "20062c25e7612cab023cdef44d3277ba1bd0b2de"
+PV = "1.2+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig pythonnative
+
+DEPENDS = "virtual/libgl ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)}"