From 4ed104f85a856a00994be7ecf2034994a9a9afba Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sat, 30 Jul 2022 06:57:23 +0000
Subject: [PATCH] testing/renderdoc: remove execinfo support

see:
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/36722
https://www.openwall.com/lists/musl/2021/07/16/1
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/22958
---
 testing/renderdoc/APKBUILD          | 13 ++++++++-----
 testing/renderdoc/musl-fix.patch    | 21 ---------------------
 testing/renderdoc/no-execinfo.patch | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 testing/renderdoc/no-execinfo.patch

diff --git a/testing/renderdoc/APKBUILD b/testing/renderdoc/APKBUILD
index 7c8dda55ac3..3a69d952691 100644
--- a/testing/renderdoc/APKBUILD
+++ b/testing/renderdoc/APKBUILD
@@ -2,19 +2,20 @@
 # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
 pkgname=renderdoc
 pkgver=1.17
-pkgrel=0
+pkgrel=1
 pkgdesc="Stand-alone graphics debugging tool for Vulkan and OpenGL"
 url="https://renderdoc.org/"
 # limited by vendored plthook version
 arch="all !s390x !ppc64le !riscv64"
 license="MIT"
 makedepends="cmake libx11-dev libxcb-dev xcb-util-keysyms-dev python3-dev
-	qt5-qtbase-dev qt5-qtsvg-dev qtchooser libexecinfo-dev wayland-dev
+	qt5-qtbase-dev qt5-qtsvg-dev wayland-dev
 	bison flex automake autoconf qt5-qtx11extras-dev"
 options="!check net" # no tests
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/baldurk/renderdoc/archive/refs/tags/v$pkgver.tar.gz
 	musl-fix.patch
+	no-execinfo.patch
 	"
 
 prepare() {
@@ -22,12 +23,13 @@ prepare() {
 }
 
 build() {
-	cmake -B build -H. \
+	cmake -B build \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DVULKAN_LAYER_FOLDER="/usr/share/vulkan/implicit_layer.d" \
 		-DENABLE_WAYLAND=ON \
-		-DBUILD_VERSION_STABLE=ON
+		-DBUILD_VERSION_STABLE=ON \
+		-DQMAKE_QT5_COMMAND="qmake-qt5"
 	cmake --build build
 }
 
@@ -37,5 +39,6 @@ package() {
 
 sha512sums="
 0f608f9bd5dfca58fd7d39529dcb49ef4df3af508cc1a90b9d327809cf47908731d0175f6b7510db6380f7e4041806d4d727005ff53ef4860f88db938ebc4c2d  renderdoc-1.17.tar.gz
-99828b704eff63d5a71143e867bbceca11606bf7f0677a30115b1432fcde0c121f1090824ac2f727e143e474b8c5ca472ba05e377e658651d723f90fd9e99e0a  musl-fix.patch
+3c3e77deac500f40c0f277c0806410124a1f086376bf78bc979b86c8f3180f0d07ec35552478cd3dec591c5163f3af50942d1f9771995afc4b7d30961d79766b  musl-fix.patch
+09f1c1230d855b388aacaca73e7ec8a4cde9abcb349af88c49d5763eff815ada10aa485b79636d06bb33b4f42f9099042dfede180538ea8549317da2e88c54f2  no-execinfo.patch
 "
diff --git a/testing/renderdoc/musl-fix.patch b/testing/renderdoc/musl-fix.patch
index 09377229644..90f6cbf2207 100644
--- a/testing/renderdoc/musl-fix.patch
+++ b/testing/renderdoc/musl-fix.patch
@@ -23,27 +23,6 @@ index 612f689d6..907e7f63e 100644
      return plthook_open_real(plthook_out, _r_debug.r_map);
  #elif defined __sun
      const char *auxv_file = "/proc/self/auxv";
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index 9174afb2a..9bb6e1d1d 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -48,12 +48,16 @@ elseif(ENABLE_GGP)
- elseif(UNIX)
-     find_package(PkgConfig REQUIRED)
-     find_package(Threads REQUIRED)
-+    find_package(Backtrace REQUIRED)
- 
-     list(APPEND RDOC_LIBRARIES
-         PRIVATE -lm
-         PRIVATE -ldl
-         PRIVATE -lrt)
- 
-+    list(APPEND RDOC_LIBRARIES
-+        PRIVATE ${Backtrace_LIBRARIES})
-+
-     if(ENABLE_XLIB)
-         find_package(X11 REQUIRED)
- 
 diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h
 index cc9a6b09e..844597450 100644
 --- a/renderdoc/os/os_specific.h
diff --git a/testing/renderdoc/no-execinfo.patch b/testing/renderdoc/no-execinfo.patch
new file mode 100644
index 00000000000..8bc2034adab
--- /dev/null
+++ b/testing/renderdoc/no-execinfo.patch
@@ -0,0 +1,21 @@
+diff --git a/renderdoc/os/posix/linux/linux_callstack.cpp b/renderdoc/os/posix/linux/linux_callstack.cpp
+index f0b44b0..558765d 100644
+--- a/renderdoc/os/posix/linux/linux_callstack.cpp
++++ b/renderdoc/os/posix/linux/linux_callstack.cpp
+@@ -27,7 +27,6 @@
+ #define _GNU_SOURCE
+ #endif
+ 
+-#include <execinfo.h>
+ #include <link.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -66,7 +65,7 @@ private:
+   {
+     void *addrs_ptr[ARRAY_COUNT(addrs)];
+ 
+-    int ret = backtrace(addrs_ptr, ARRAY_COUNT(addrs));
++    int ret = 0;
+ 
+     numLevels = 0;
+     if(ret > 0)