Attachment 187161 Details for Bug 223002 – apitrace.patch

[patch] apitrace.patch

apitrace.patch (text/plain), 7.69 KB, created by Val Packett on 2017-10-14 12:55:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2017-10-14 12:55:19 UTC

Size: 7.69 KB

patch

obsolete

>diff --git c/devel/apitrace/Makefile i/devel/apitrace/Makefile
>new file mode 100644
>index 000000000000..884b73e29e12
>--- /dev/null
>+++ i/devel/apitrace/Makefile
>@@ -0,0 +1,40 @@
>+# $FreeBSD$
>+
>+PORTNAME=		apitrace
>+DISTVERSION=		7.1-455
>+DISTVERSIONSUFFIX=	-g7c76b90
>+CATEGORIES=		devel
>+
>+MAINTAINER=	greg@unrelenting.technology
>+COMMENT=	Tools for tracing OpenGL and other graphics APIs
>+
>+LICENSE=	MIT
>+
>+LIB_DEPENDS=	libunwind.so:devel/libunwind \
>+		libpng16.so:graphics/png
>+
>+USES=		cmake:outsource compiler:c++11-lang pkgconfig python:2.7 shebangfix
>+
>+USE_GITHUB=	yes
>+USE_XORG=	x11
>+
>+SHEBANG_REGEX=	./scripts/.*\.py
>+
>+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR:STRING="${DOCSDIR}"
>+
>+OPTIONS_DEFINE=	QT5
>+OPTIONS_DEFAULT=	QT5
>+OPTIONS_SUB=		yes
>+
>+QT5_DESC=		Qt 5 frontend
>+
>+QT5_CMAKE_BOOL=	ENABLE_GUI
>+QT5_USE=		qt5=qmake_build,buildtools_build,core,gui,widgets,network
>+QT5_USES=		desktop-file-utils
>+QT5_VARS=		installs_icons=yes
>+
>+post-install-QT5-on:
>+	${INSTALL_DATA} ${FILESDIR}/qapitrace.desktop \
>+		${STAGEDIR}${PREFIX}/share/applications
>+
>+.include <bsd.port.mk>
>diff --git c/devel/apitrace/distinfo i/devel/apitrace/distinfo
>new file mode 100644
>index 000000000000..087cd913b4c9
>--- /dev/null
>+++ i/devel/apitrace/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1507984453
>+SHA256 (apitrace-apitrace-7.1-455-g7c76b90_GH0.tar.gz) = 235c5f402c1095bc7596073aa65bc4223b5fef3cc2ea54c000e92f735df5b825
>+SIZE (apitrace-apitrace-7.1-455-g7c76b90_GH0.tar.gz) = 3578137
>diff --git c/devel/apitrace/files/patch-dispatch_glproc__egl.cpp i/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
>new file mode 100644
>index 000000000000..030fda8dc2e6
>--- /dev/null
>+++ i/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
>@@ -0,0 +1,29 @@
>+--- dispatch/glproc_egl.cpp.orig	2017-10-05 14:14:11 UTC
>++++ dispatch/glproc_egl.cpp
>+@@ -89,7 +89,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;
>+             }
>+@@ -132,7 +132,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);
>+@@ -143,7 +143,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 c/devel/apitrace/files/patch-dispatch_glproc__gl.cpp i/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
>new file mode 100644
>index 000000000000..15964e9fa0c7
>--- /dev/null
>+++ i/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
>@@ -0,0 +1,11 @@
>+--- dispatch/glproc_gl.cpp.orig	2017-10-05 14:14:11 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;
>diff --git c/devel/apitrace/files/patch-retrace_CMakeLists.txt i/devel/apitrace/files/patch-retrace_CMakeLists.txt
>new file mode 100644
>index 000000000000..e9840b3c8ec0
>--- /dev/null
>+++ i/devel/apitrace/files/patch-retrace_CMakeLists.txt
>@@ -0,0 +1,18 @@
>+--- retrace/CMakeLists.txt.orig	2017-10-14 12:21:47 UTC
>++++ retrace/CMakeLists.txt
>+@@ -123,6 +123,7 @@ if (WIN32 OR APPLE OR X11_FOUND)
>+         retrace_common
>+         glretrace_common
>+         glhelpers
>++        glproc
>+         glproc_gl
>+     )
>+ 
>+@@ -169,6 +170,7 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APP
>+         retrace_common
>+         glretrace_common
>+         glhelpers
>++        glproc
>+         glproc_egl
>+         ${X11_X11_LIB}
>+         ${CMAKE_THREAD_LIBS_INIT}
>diff --git c/devel/apitrace/files/patch-thirdparty_libbacktrace_dwarf.c i/devel/apitrace/files/patch-thirdparty_libbacktrace_dwarf.c
>new file mode 100644
>index 000000000000..d272d9f4ba73
>--- /dev/null
>+++ i/devel/apitrace/files/patch-thirdparty_libbacktrace_dwarf.c
>@@ -0,0 +1,13 @@
>+--- thirdparty/libbacktrace/dwarf.c.orig	2017-10-05 14:14:11 UTC
>++++ thirdparty/libbacktrace/dwarf.c
>+@@ -1851,10 +1851,6 @@ read_line_program (struct backtrace_state *state, stru
>+ 		  }
>+ 	      }
>+ 	      break;
>+-	    case DW_LNE_set_discriminator:
>+-	      /* We don't care about discriminators.  */
>+-	      read_uleb128 (line_buf);
>+-	      break;
>+ 	    default:
>+ 	      if (!advance (line_buf, len - 1))
>+ 		return 0;
>diff --git c/devel/apitrace/files/patch-wrappers_trace.py i/devel/apitrace/files/patch-wrappers_trace.py
>new file mode 100644
>index 000000000000..94ce083b5863
>--- /dev/null
>+++ i/devel/apitrace/files/patch-wrappers_trace.py
>@@ -0,0 +1,11 @@
>+--- wrappers/trace.py.orig	2017-10-05 14:14:11 UTC
>++++ wrappers/trace.py
>+@@ -521,7 +521,7 @@ class Tracer:
>+         print '#    define alloca _alloca'
>+         print '#  endif'
>+         print '#else'
>+-        print '#  include <alloca.h> // alloca'
>++        print '#  include <stdlib.h> // alloca'
>+         print '#endif'
>+         print
>+         print
>diff --git c/devel/apitrace/files/qapitrace.desktop i/devel/apitrace/files/qapitrace.desktop
>new file mode 100644
>index 000000000000..8840b277cd4c
>--- /dev/null
>+++ i/devel/apitrace/files/qapitrace.desktop
>@@ -0,0 +1,9 @@
>+[Desktop Entry]
>+Name=QApiTrace
>+GenericName=Graphics API tracing tool
>+Comment=A set of tools to trace OpenGL and other graphics APIs
>+Exec=qapitrace
>+Terminal=false
>+Type=Application
>+Categories=Development;
>+Keywords=opengl;graphics;debugging;
>diff --git c/devel/apitrace/pkg-descr i/devel/apitrace/pkg-descr
>new file mode 100644
>index 000000000000..78be7cec8d29
>--- /dev/null
>+++ i/devel/apitrace/pkg-descr
>@@ -0,0 +1,7 @@
>+apitrace is a set of tools to:
>+- trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a file;
>+- replay OpenGL and OpenGL ES calls from a file;
>+- inspect OpenGL state at any call while retracing;
>+- visualize and edit trace files.
>+
>+WWW: https://apitrace.github.io
>diff --git c/devel/apitrace/pkg-plist i/devel/apitrace/pkg-plist
>new file mode 100644
>index 000000000000..f61d72f392f0
>--- /dev/null
>+++ i/devel/apitrace/pkg-plist
>@@ -0,0 +1,26 @@
>+bin/apitrace
>+bin/eglretrace
>+bin/glretrace
>+%%QT5%%bin/qapitrace
>+%%QT5%%share/applications/qapitrace.desktop
>+lib/apitrace/scripts/apitrace.PIXExp
>+lib/apitrace/scripts/convert.py
>+lib/apitrace/scripts/highlight.py
>+lib/apitrace/scripts/jsondiff.py
>+lib/apitrace/scripts/jsonextractimages.py
>+lib/apitrace/scripts/leaks.py
>+lib/apitrace/scripts/profileshader.py
>+lib/apitrace/scripts/retracediff.py
>+lib/apitrace/scripts/snapdiff.py
>+lib/apitrace/scripts/tracecheck.py
>+lib/apitrace/scripts/tracediff.py
>+lib/apitrace/scripts/unpickle.py
>+lib/apitrace/wrappers/egltrace.so
>+lib/apitrace/wrappers/glxtrace.so
>+%%PORTDOCS%%%%DOCSDIR%%/BUGS.markdown
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-brotli.txt
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-snappy.txt
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS.markdown
>+%%PORTDOCS%%%%DOCSDIR%%/README.markdown
>+%%PORTDOCS%%%%DOCSDIR%%/USAGE.markdown

Actions: View | Diff

Attachments on bug 223002: 187161 | 188013 | 188025