git: a9bba31981f7 - main - devel/apitrace: enable RTLD_DEEPBIND after 620968a43a5f

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a9bba31981f7e85d07a1e8087b0fc7f824a05aca

commit a9bba31981f7e85d07a1e8087b0fc7f824a05aca
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-10-03 10:14:38 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-10-03 10:30:47 +0000

    devel/apitrace: enable RTLD_DEEPBIND after 620968a43a5f
    
    https://cgit.freebsd.org/src/commit/?id=8a423062d0595
    
    DragonFly still lacks RTLD_DEEPBIND, so use an upstream fix in order
    to detect collision and drop on the next update.
---
 devel/apitrace/Makefile                            |  4 ++-
 devel/apitrace/distinfo                            |  2 ++
 .../apitrace/files/patch-dispatch_glproc__egl.cpp  | 29 ----------------------
 devel/apitrace/files/patch-dispatch_glproc__gl.cpp | 11 --------
 4 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
index 001a9ccc5df2..880543472582 100644
--- a/devel/apitrace/Makefile
+++ b/devel/apitrace/Makefile
@@ -1,12 +1,14 @@
 PORTNAME=	apitrace
 DISTVERSION=	9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/a17r/${GH_PROJECT}/commit/
 # use system brotli: https://github.com/apitrace/apitrace/pull/610
 PATCHFILES=	cd3486343001d6a47.patch:-p1 \
 		b0f5a220c41af013d.patch:-p1
+# detect RTLD_DEEPBIND: https://github.com/apitrace/apitrace/pull/571
+PATCHFILES+=	2d31d49eac9bcc010.patch:-p1
 
 MAINTAINER=	greg at unrelenting.technology
 COMMENT=	Tools for tracing OpenGL and other graphics APIs
diff --git a/devel/apitrace/distinfo b/devel/apitrace/distinfo
index 8a5aa4abbee2..7047417ff067 100644
--- a/devel/apitrace/distinfo
+++ b/devel/apitrace/distinfo
@@ -5,3 +5,5 @@ SHA256 (cd3486343001d6a47.patch) = 2cb56f451791f2155aa5f5f12aa19eb92cb44dd00ca51
 SIZE (cd3486343001d6a47.patch) = 1840
 SHA256 (b0f5a220c41af013d.patch) = e2f46c862d97ff45b57fed043342b8875b310c5d6bb6d7d7f7122bb2f1ac5bb0
 SIZE (b0f5a220c41af013d.patch) = 2866
+SHA256 (2d31d49eac9bcc010.patch) = 315733330ab80a19b5565a439bdac8c62a80605302db03721e05c93e6ce9db52
+SIZE (2d31d49eac9bcc010.patch) = 633
diff --git a/devel/apitrace/files/patch-dispatch_glproc__egl.cpp b/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
deleted file mode 100644
index 8ac21a1e15de..000000000000
--- a/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- dispatch/glproc_egl.cpp.orig	2019-11-26 14:27:11 UTC
-+++ dispatch/glproc_egl.cpp
-@@ -93,7 +93,7 @@ _getPublicProcAddress(const char *procName)
-     if (procName[0] == 'e' && procName[1] == 'g' && procName[2] == 'l') {
-         static void *libEGL = NULL;
-         if (!libEGL) {
--            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY);
-             if (!libEGL) {
-                 return NULL;
-             }
-@@ -136,7 +136,7 @@ _getPublicProcAddress(const char *procName)
- 
-         static void *libGLESv2 = NULL;
-         if (!libGLESv2) {
--            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY);
-         }
-         if (libGLESv2) {
-             proc = dlsym(libGLESv2, procName);
-@@ -147,7 +147,7 @@ _getPublicProcAddress(const char *procName)
- 
-         static void *libGLESv1 = NULL;
-         if (!libGLESv1) {
--            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY);
-         }
-         if (libGLESv1) {
-             proc = dlsym(libGLESv1, procName);
diff --git a/devel/apitrace/files/patch-dispatch_glproc__gl.cpp b/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
deleted file mode 100644
index 412f68061b50..000000000000
--- a/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatch/glproc_gl.cpp.orig	2017-10-13 17:18:18 UTC
-+++ 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;