From a18c191f2e760ff77c6faeb2dcad4d746642d999 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 29 Aug 2018 13:05:02 +0300
Subject: [PATCH] libepoxy: bump version

---
 media-libs/libepoxy/libepoxy-1.4.3.recipe     | 83 -------------------
 ...oxy-1.5.1.recipe => libepoxy-1.5.2.recipe} |  7 +-
 .../libepoxy/patches/libepoxy-1.5.2.patchset  | 24 ++++++
 3 files changed, 28 insertions(+), 86 deletions(-)
 delete mode 100644 media-libs/libepoxy/libepoxy-1.4.3.recipe
 rename media-libs/libepoxy/{libepoxy-1.5.1.recipe => libepoxy-1.5.2.recipe} (91%)
 create mode 100644 media-libs/libepoxy/patches/libepoxy-1.5.2.patchset

diff --git a/media-libs/libepoxy/libepoxy-1.4.3.recipe b/media-libs/libepoxy/libepoxy-1.4.3.recipe
deleted file mode 100644
index 285df0972..000000000
--- a/media-libs/libepoxy/libepoxy-1.4.3.recipe
+++ /dev/null
@@ -1,83 +0,0 @@
-SUMMARY="A library for handling OpenGL function pointer management for you"
-DESCRIPTION="Epoxy is a library for handling OpenGL function pointer \
-management for you.
-It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), \
-eglGetProcAddress(), etc. from the app developer, with very little \
-knowledge needed on their part. They get to read GL specs and write \
-code using undecorated function names like glCompileShader(). \
-Don't forget to check for your extensions or versions being present \
-before you use them, just like before! We'll tell you what you forgot \
-to check for instead of just segfaulting, though."
-HOMEPAGE="https://github.com/anholt/libepoxy"
-COPYRIGHT="2017 Emmanuele Bassi"
-LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="https://github.com/anholt/libepoxy/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="7f18518ba0036f7670f837a510bb25be4b3e7fba97d75193b24f7220de55b515"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libepoxy$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libepoxy$secondaryArchSuffix = 1.4.2 compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libEGL$secondaryArchSuffix
-	lib:libGL$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libepoxy${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libepoxy$secondaryArchSuffix = 1.4.2 compat >= 1
-	"
-REQUIRES_devel="
-	libepoxy$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	setuptools_python3
-	devel:libEGL$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
-	devel:util_macros$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:meson
-	cmd:ninja
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3
-	"
-
-BUILD()
-{
-	mkdir -p _build
-
-	cd _build
-
-	meson --buildtype=release --prefix=$prefix \
-		--libdir=$libDir --includedir=$includeDir
-
-	ninja $jobargs
-}
-
-INSTALL()
-{
-	cd _build
-
-	ninja install
-
-	prepareInstalledDevelLib libepoxy
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	cd _build && ninja test
-}
diff --git a/media-libs/libepoxy/libepoxy-1.5.1.recipe b/media-libs/libepoxy/libepoxy-1.5.2.recipe
similarity index 91%
rename from media-libs/libepoxy/libepoxy-1.5.1.recipe
rename to media-libs/libepoxy/libepoxy-1.5.2.recipe
index 426d95331..29d7e5254 100644
--- a/media-libs/libepoxy/libepoxy-1.5.1.recipe
+++ b/media-libs/libepoxy/libepoxy-1.5.2.recipe
@@ -9,11 +9,12 @@ Don't forget to check for your extensions or versions being present \
 before you use them, just like before! We'll tell you what you forgot \
 to check for instead of just segfaulting, though."
 HOMEPAGE="https://github.com/anholt/libepoxy"
-COPYRIGHT="2017 Emmanuele Bassi"
+COPYRIGHT="2018 Emmanuele Bassi"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/anholt/libepoxy/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="f53a35db484341c0a77f1bb0eb04cc9389e3049d2437bcf5915a1cebd2c04ff7"
+CHECKSUM_SHA256="1ffc3ffe0567f986ff5731d4ef3a3765e0a4f9d642fffdae303362567eecd689"
+PATCHES="libepoxy-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -64,7 +65,7 @@ BUILD()
 	meson --buildtype=release --prefix=$prefix \
 		--libdir=$libDir --includedir=$includeDir
 
-	ninja $jobargs
+	ninja $jobArgs
 }
 
 INSTALL()
diff --git a/media-libs/libepoxy/patches/libepoxy-1.5.2.patchset b/media-libs/libepoxy/patches/libepoxy-1.5.2.patchset
new file mode 100644
index 000000000..df075f614
--- /dev/null
+++ b/media-libs/libepoxy/patches/libepoxy-1.5.2.patchset
@@ -0,0 +1,24 @@
+From cb1d48e07245450bae6ee286165b56d95c155983 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
+--- 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
+         abort();
+     }
+ 
++#ifndef RTLD_NOLOAD
++	#define RTLD_NOLOAD 0
++#endif
++
+ #ifdef _WIN32
+     *handle = LoadLibraryA(lib_name);
+ #else
+-- 
+2.16.4
+