From 15d2f6ef8a6eda08a7221df85d1136336d256a20 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Mon, 24 Feb 2020 21:00:14 +0100
Subject: [PATCH] main/apitrace: upgrade to 9.0 (!985)

---
 ...t-libc-that-don-t-have-RTLD_DEEPBIND.patch | 26 ++++++++++++++++++
 main/apitrace/APKBUILD                        | 27 +++++++------------
 main/apitrace/musl-fixes.patch                | 13 ---------
 3 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 main/apitrace/0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
 delete mode 100644 main/apitrace/musl-fixes.patch

diff --git a/main/apitrace/0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch b/main/apitrace/0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
new file mode 100644
index 000000000..2924e67c4
--- /dev/null
+++ b/main/apitrace/0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
@@ -0,0 +1,26 @@
+From 2d31d49eac9bcc01046e00df256a04ae13175c4e Mon Sep 17 00:00:00 2001
+From: Gleb Mazovetskiy <glex.spb@gmail.com>
+Date: Fri, 13 Dec 2019 13:39:19 +0000
+Subject: [PATCH] Support libc that don't have RTLD_DEEPBIND
+
+---
+ dispatch/glproc_gl.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dispatch/glproc_gl.cpp b/dispatch/glproc_gl.cpp
+index 5d7903a0..456fcc42 100644
+--- a/dispatch/glproc_gl.cpp
++++ b/dispatch/glproc_gl.cpp
+@@ -148,6 +148,9 @@ _getPrivateProcAddress(const char *procName)
+ 
+ #else
+ 
++#ifndef RTLD_DEEPBIND
++#define RTLD_DEEPBIND 0
++#endif
+ 
+ static inline void
+ logSymbol(const char *name, void *ptr) {
+-- 
+2.25.1
+
diff --git a/main/apitrace/APKBUILD b/main/apitrace/APKBUILD
index 6dcb982c1..e5303ee7e 100644
--- a/main/apitrace/APKBUILD
+++ b/main/apitrace/APKBUILD
@@ -1,39 +1,30 @@
 # Contributor: Bhushan Shah <bshah@kde.org>
 # Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=apitrace
-pkgver=8.0
-pkgrel=1
-_commit="81c73a74860a45cbc21da9925eb04e1edad646d5"
+pkgver=9.0
+pkgrel=0
 pkgdesc="Tools for tracing OpenGL, Direct3D, and other graphics APIs"
 arch="all"
 url="http://apitrace.github.io/"
 license="MIT"
 depends_dev="mesa-dev zlib-dev libpng-dev libx11-dev linux-headers qt5-qtbase-dev"
 makedepends="$depends_dev cmake python3"
-source="$pkgname-$_commit.tar.gz::https://github.com/apitrace/apitrace/archive/$_commit.tar.gz
-	musl-fixes.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/apitrace/apitrace/archive/$pkgver.tar.gz
+	0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch"
 subpackages="$pkgname-doc"
 options="!check" # Tests fail under QEMU
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir "$builddir"/build
-}
 
 build() {
-	cd "$builddir"/build
-	cmake "$builddir" \
+	cmake -B "$builddir"/build \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
-	make
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	DESTDIR="$pkgdir" make install
+	DESTDIR="$pkgdir" make -C build install
 }
 
-sha512sums="2c02106730e4c46c929dfa1b475691bbc72eaf232625276540ab46bbc80728f8b3d230c4297bdcbb11d8396490ed1f91ad592bb404c52fe2c63ef5840678eb32  apitrace-81c73a74860a45cbc21da9925eb04e1edad646d5.tar.gz
-a204b51654d9adc484657ec68da6f89cbcdc4dd3a810d024979dcbeacffa5867d3e5ce0b40fcdc9133b36e8927d2c7672ef5c3a40db3dee0813fe2766130e21b  musl-fixes.patch"
+sha512sums="4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c  apitrace-9.0.tar.gz
+1018d6d23946c42936c20a7ae06d9a1011ca10d31159e991564d000969783dc171cb9d71e53fe22915183624b818bf8a361fbd1a01c521b2b245341504407eac  0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch"
diff --git a/main/apitrace/musl-fixes.patch b/main/apitrace/musl-fixes.patch
deleted file mode 100644
index 62e393294..000000000
--- a/main/apitrace/musl-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dispatch/glproc_gl.cpp b/dispatch/glproc_gl.cpp
-index 5d7903a..3d963fb 100644
---- a/dispatch/glproc_gl.cpp
-+++ b/dispatch/glproc_gl.cpp
-@@ -200,7 +200,7 @@ void * _libgl_sym(const char *symbol)
-          * exposes symbols to it.
-          */
- 
--        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY | RTLD_DEEPBIND);
-+        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
-         if (!_libGlHandle) {
-             os::log("apitrace: error: couldn't find libGL.so\n");
-             return NULL;