From 8cf19e3562df0b806db24d0a027e074974fa10d8 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 29 Aug 2022 13:34:24 +0000 Subject: [PATCH] Remove patch now that we have RTLD_NOLOAD. Brad sent the same diff a few days ago ok sthen@ rsadowski@ --- games/fs2open/Makefile | 1 + .../patch-code_libs_renderdoc_renderdoc_cpp | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 games/fs2open/patches/patch-code_libs_renderdoc_renderdoc_cpp diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index c139aebd47b..17306c9ee7b 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -8,6 +8,7 @@ DISTNAME = fs2open-${V} GH_ACCOUNT = scp-fs2open GH_PROJECT = fs2open.github.com GH_TAGNAME = release_${V:S/./_/g} +REVISION = 0 CATEGORIES = games diff --git a/games/fs2open/patches/patch-code_libs_renderdoc_renderdoc_cpp b/games/fs2open/patches/patch-code_libs_renderdoc_renderdoc_cpp deleted file mode 100644 index 2d0f09d5f86..00000000000 --- a/games/fs2open/patches/patch-code_libs_renderdoc_renderdoc_cpp +++ /dev/null @@ -1,14 +0,0 @@ -we don't have RTLD_NOLOAD - -Index: code/libs/renderdoc/renderdoc.cpp ---- code/libs/renderdoc/renderdoc.cpp.orig -+++ code/libs/renderdoc/renderdoc.cpp -@@ -14,7 +14,7 @@ RENDERDOC_API_1_1_1* api = nullptr; - - pRENDERDOC_GetAPI load_getAPI() { - #ifdef SCP_UNIX -- auto handle = dlopen("librenderdoc.so", RTLD_NOLOAD); -+ auto handle = dlopen("librenderdoc.so", RTLD_LAZY); - auto symbol = dlsym(handle, "RENDERDOC_GetAPI"); - - if (handle != nullptr) {