From ecc8a45ef03dac7884d3c08296ed0c202ec7f852 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 18 Jan 2022 19:12:44 -0500
Subject: [PATCH] libepoxy: Add hack workaround for #6514.

---
 media-libs/libepoxy/libepoxy-1.5.8.recipe     |  2 +-
 .../libepoxy/patches/libepoxy-1.5.8.patchset  | 31 ++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/media-libs/libepoxy/libepoxy-1.5.8.recipe b/media-libs/libepoxy/libepoxy-1.5.8.recipe
index 277885ce8..b678c9a20 100644
--- a/media-libs/libepoxy/libepoxy-1.5.8.recipe
+++ b/media-libs/libepoxy/libepoxy-1.5.8.recipe
@@ -11,7 +11,7 @@ to check for instead of just segfaulting, though."
 HOMEPAGE="https://github.com/anholt/libepoxy"
 COPYRIGHT="2018-2021 Emmanuele Bassi"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/anholt/libepoxy/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="0cd80cb040b75cbe77fadd45c48282ebab82d845c597ce11ee5e8cb9c1efeabb"
 PATCHES="libepoxy-$portVersion.patchset"
diff --git a/media-libs/libepoxy/patches/libepoxy-1.5.8.patchset b/media-libs/libepoxy/patches/libepoxy-1.5.8.patchset
index df075f614..f976e3372 100644
--- a/media-libs/libepoxy/patches/libepoxy-1.5.8.patchset
+++ b/media-libs/libepoxy/patches/libepoxy-1.5.8.patchset
@@ -1,14 +1,14 @@
-From cb1d48e07245450bae6ee286165b56d95c155983 Mon Sep 17 00:00:00 2001
+From 465a0bb243524efda0a5357dc268a1c9a7b38dca Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 29 Aug 2018 12:58:03 +0300
 Subject: define RTLD_NOLOAD
 
 
 diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index e2bb186..726d916 100644
+index 9977a02..e8f17b4 100644
 --- a/src/dispatch_common.c
 +++ b/src/dispatch_common.c
-@@ -302,6 +302,10 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
+@@ -300,6 +300,10 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
          abort();
      }
  
@@ -20,5 +20,28 @@ index e2bb186..726d916 100644
      *handle = LoadLibraryA(lib_name);
  #else
 -- 
-2.16.4
+2.30.2
+
+
+From dc0ef4892bff31c3b7e450de478111cf657046bf Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Tue, 18 Jan 2022 19:07:22 -0500
+Subject: (HACK) Haiku does not have a gl.pc.
+
+
+diff --git a/src/meson.build b/src/meson.build
+index 37e28f0..b5e456d 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -93,7 +93,7 @@ libepoxy_dep = declare_dependency(
+ # pkg-config file, for consumers of Epoxy
+ gl_reqs = []
+ if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
+-  gl_reqs += 'gl'
++#  gl_reqs += 'gl'
+ endif
+ if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
+   gl_reqs += 'egl'
+-- 
+2.30.2