View | Details | Raw Unified | Return to bug 223002 | Differences between
and this patch

Collapse All | Expand All

(-)devel/Makefile (+1 lines)
Lines 109-114 Link Here
109
    SUBDIR += aphpunit
109
    SUBDIR += aphpunit
110
    SUBDIR += api-sanity-autotest
110
    SUBDIR += api-sanity-autotest
111
    SUBDIR += apiextractor
111
    SUBDIR += apiextractor
112
    SUBDIR += apitrace
112
    SUBDIR += appstream-glib
113
    SUBDIR += appstream-glib
113
    SUBDIR += apr1
114
    SUBDIR += apr1
114
    SUBDIR += apr2
115
    SUBDIR += apr2
(-)devel/apitrace/Makefile (+36 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	apitrace
4
DISTVERSION=	7.1-455
5
DISTVERSIONSUFFIX=	-g7c76b90
6
CATEGORIES=	devel
7
8
MAINTAINER=	greg@unrelenting.technology
9
COMMENT=	Tools for tracing OpenGL and other graphics APIs
10
11
LICENSE=	MIT
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
14
LIB_DEPENDS=	libpng16.so:graphics/png
15
16
USES=		cmake:outsource compiler:c++11-lang pkgconfig python:2.7 shebangfix
17
USE_GITHUB=	yes
18
USE_XORG=	x11
19
20
SHEBANG_FILES=	scripts/*.py
21
22
OPTIONS_DEFINE=	QT5 DOCS
23
OPTIONS_DEFAULT=	QT5
24
OPTIONS_SUB=	yes
25
26
QT5_CMAKE_BOOL=	ENABLE_GUI
27
QT5_USE=	qt5=core,gui,network,widgets,buildtools_build,qmake_build
28
QT5_VARS=	installs_icons=yes
29
30
post-install:
31
	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
32
33
post-install-QT5-on:
34
	${INSTALL_DATA} ${FILESDIR}/qapitrace.desktop ${STAGEDIR}${PREFIX}/share/applications
35
36
.include <bsd.port.mk>
(-)devel/apitrace/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1507984453
2
SHA256 (apitrace-apitrace-7.1-455-g7c76b90_GH0.tar.gz) = 235c5f402c1095bc7596073aa65bc4223b5fef3cc2ea54c000e92f735df5b825
3
SIZE (apitrace-apitrace-7.1-455-g7c76b90_GH0.tar.gz) = 3578137
(-)devel/apitrace/files/patch-dispatch_glproc__egl.cpp (+29 lines)
Line 0 Link Here
1
--- dispatch/glproc_egl.cpp.orig	2017-10-13 17:18:18 UTC
2
+++ dispatch/glproc_egl.cpp
3
@@ -89,7 +89,7 @@ _getPublicProcAddress(const char *procNa
4
     if (procName[0] == 'e' && procName[1] == 'g' && procName[2] == 'l') {
5
         static void *libEGL = NULL;
6
         if (!libEGL) {
7
-            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
8
+            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY);
9
             if (!libEGL) {
10
                 return NULL;
11
             }
12
@@ -132,7 +132,7 @@ _getPublicProcAddress(const char *procNa
13
 
14
         static void *libGLESv2 = NULL;
15
         if (!libGLESv2) {
16
-            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
17
+            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY);
18
         }
19
         if (libGLESv2) {
20
             proc = dlsym(libGLESv2, procName);
21
@@ -143,7 +143,7 @@ _getPublicProcAddress(const char *procNa
22
 
23
         static void *libGLESv1 = NULL;
24
         if (!libGLESv1) {
25
-            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
26
+            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY);
27
         }
28
         if (libGLESv1) {
29
             proc = dlsym(libGLESv1, procName);
(-)devel/apitrace/files/patch-dispatch_glproc__gl.cpp (+11 lines)
Line 0 Link Here
1
--- dispatch/glproc_gl.cpp.orig	2017-10-13 17:18:18 UTC
2
+++ dispatch/glproc_gl.cpp
3
@@ -200,7 +200,7 @@ void * _libgl_sym(const char *symbol)
4
          * exposes symbols to it.
5
          */
6
 
7
-        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY | RTLD_DEEPBIND);
8
+        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
9
         if (!_libGlHandle) {
10
             os::log("apitrace: error: couldn't find libGL.so\n");
11
             return NULL;
(-)devel/apitrace/files/patch-retrace_CMakeLists.txt (+18 lines)
Line 0 Link Here
1
--- retrace/CMakeLists.txt.orig	2017-10-13 17:18:18 UTC
2
+++ retrace/CMakeLists.txt
3
@@ -123,6 +123,7 @@ if (WIN32 OR APPLE OR X11_FOUND)
4
         retrace_common
5
         glretrace_common
6
         glhelpers
7
+        glproc
8
         glproc_gl
9
     )
10
 
11
@@ -169,6 +170,7 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN
12
         retrace_common
13
         glretrace_common
14
         glhelpers
15
+        glproc
16
         glproc_egl
17
         ${X11_X11_LIB}
18
         ${CMAKE_THREAD_LIBS_INIT}
(-)devel/apitrace/files/patch-thirdparty_libbacktrace_dwarf.c (+156 lines)
Line 0 Link Here
1
--- thirdparty/libbacktrace/dwarf.c.orig	2017-10-13 17:18:18 UTC
2
+++ thirdparty/libbacktrace/dwarf.c
3
@@ -768,21 +768,27 @@ read_attribute (enum dwarf_form form, st
4
 			       version, addrsize, dwarf_str, dwarf_str_size,
5
 			       val);
6
       }
7
+#if defined(DW_FORM_sec_offset) // not defined on 10
8
     case DW_FORM_sec_offset:
9
       val->encoding = ATTR_VAL_REF_SECTION;
10
       val->u.uint = read_offset (buf, is_dwarf64);
11
       return 1;
12
+#endif
13
+#if defined(DW_FORM_exprloc) // not defined on 10
14
     case DW_FORM_exprloc:
15
       val->encoding = ATTR_VAL_EXPR;
16
       return advance (buf, read_uleb128 (buf));
17
+#endif
18
     case DW_FORM_flag_present:
19
       val->encoding = ATTR_VAL_UINT;
20
       val->u.uint = 1;
21
       return 1;
22
+#if defined(DW_FORM_ref_sig8) // not defined on 10
23
     case DW_FORM_ref_sig8:
24
       val->encoding = ATTR_VAL_REF_TYPE;
25
       val->u.uint = read_uint64 (buf);
26
       return 1;
27
+#endif
28
     case DW_FORM_GNU_addr_index:
29
       val->encoding = ATTR_VAL_REF_SECTION;
30
       val->u.uint = read_uleb128 (buf);
31
@@ -1314,7 +1320,7 @@ find_address_ranges (struct backtrace_st
32
 		  highpc_is_relative = 1;
33
 		}
34
 	      break;
35
-
36
+#if defined(DW_AT_ranges) // not defined on 10
37
 	    case DW_AT_ranges:
38
 	      if (val.encoding == ATTR_VAL_UINT
39
 		  || val.encoding == ATTR_VAL_REF_SECTION)
40
@@ -1323,7 +1329,7 @@ find_address_ranges (struct backtrace_st
41
 		  have_ranges = 1;
42
 		}
43
 	      break;
44
-
45
+#endif
46
 	    case DW_AT_stmt_list:
47
 	      if (abbrev->tag == DW_TAG_compile_unit
48
 		  && (val.encoding == ATTR_VAL_UINT
49
@@ -1851,10 +1857,6 @@ read_line_program (struct backtrace_stat
50
 		  }
51
 	      }
52
 	      break;
53
-	    case DW_LNE_set_discriminator:
54
-	      /* We don't care about discriminators.  */
55
-	      read_uleb128 (line_buf);
56
-	      break;
57
 	    default:
58
 	      if (!advance (line_buf, len - 1))
59
 		return 0;
60
@@ -2108,16 +2110,24 @@ read_referenced_name (struct dwarf_data 
61
 	  if (val.encoding == ATTR_VAL_STRING)
62
 	    ret = val.u.string;
63
 	  break;
64
-
65
+#if defined(DW_AT_linkage_name)
66
 	case DW_AT_linkage_name:
67
+#endif
68
+#if defined(DW_AT_MIPS_linkage_name)
69
 	case DW_AT_MIPS_linkage_name:
70
+#endif
71
+#if defined(DW_AT_linkage_name) || defined(DW_AT_MIPS_linkage_name)
72
 	  if (val.encoding == ATTR_VAL_STRING)
73
 	    return val.u.string;
74
 	  break;
75
-
76
+#endif
77
 	case DW_AT_specification:
78
 	  if (abbrev->attrs[i].form == DW_FORM_ref_addr
79
+#if defined(DW_FORM_ref_sig8) // not defined on 10
80
 	      || abbrev->attrs[i].form == DW_FORM_ref_sig8)
81
+#else
82
+	      || 0) // not defined
83
+#endif
84
 	    {
85
 	      /* This refers to a specification defined in some other
86
 		 compilation unit.  We can handle this case if we
87
@@ -2325,6 +2335,7 @@ read_function_entry (struct backtrace_st
88
 	    {
89
 	      switch (abbrev->attrs[i].name)
90
 		{
91
+#if defined(DW_AT_call_file)
92
 		case DW_AT_call_file:
93
 		  if (val.encoding == ATTR_VAL_UINT)
94
 		    {
95
@@ -2344,16 +2355,21 @@ read_function_entry (struct backtrace_st
96
 			}
97
 		    }
98
 		  break;
99
-
100
+#endif
101
+#if defined(DW_AT_call_line)
102
 		case DW_AT_call_line:
103
 		  if (val.encoding == ATTR_VAL_UINT)
104
 		    function->caller_lineno = val.u.uint;
105
 		  break;
106
-
107
+#endif
108
 		case DW_AT_abstract_origin:
109
 		case DW_AT_specification:
110
 		  if (abbrev->attrs[i].form == DW_FORM_ref_addr
111
+#if defined(DW_FORM_ref_sig8) // not defined on 10
112
 		      || abbrev->attrs[i].form == DW_FORM_ref_sig8)
113
+#else
114
+		      || 0) // not defined
115
+#endif
116
 		    {
117
 		      /* This refers to an abstract origin defined in
118
 			 some other compilation unit.  We can handle
119
@@ -2383,13 +2399,17 @@ read_function_entry (struct backtrace_st
120
 			function->name = val.u.string;
121
 		    }
122
 		  break;
123
-
124
+#if defined(DW_AT_linkage_name)
125
 		case DW_AT_linkage_name:
126
+#endif
127
+#if defined(DW_AT_MIPS_linkage_name)
128
 		case DW_AT_MIPS_linkage_name:
129
+#endif
130
+#if defined(DW_AT_linkage_name) || defined(DW_AT_MIPS_linkage_name)
131
 		  if (val.encoding == ATTR_VAL_STRING)
132
 		    function->name = val.u.string;
133
 		  break;
134
-
135
+#endif
136
 		case DW_AT_low_pc:
137
 		  if (val.encoding == ATTR_VAL_ADDRESS)
138
 		    {
139
@@ -2411,7 +2431,7 @@ read_function_entry (struct backtrace_st
140
 		      highpc_is_relative = 1;
141
 		    }
142
 		  break;
143
-
144
+#if defined(DW_AT_ranges) // not defined on 10
145
 		case DW_AT_ranges:
146
 		  if (val.encoding == ATTR_VAL_UINT
147
 		      || val.encoding == ATTR_VAL_REF_SECTION)
148
@@ -2420,7 +2440,7 @@ read_function_entry (struct backtrace_st
149
 		      have_ranges = 1;
150
 		    }
151
 		  break;
152
-
153
+#endif
154
 		default:
155
 		  break;
156
 		}
(-)devel/apitrace/files/patch-wrappers_trace.py (+11 lines)
Line 0 Link Here
1
--- wrappers/trace.py.orig	2017-10-13 17:18:18 UTC
2
+++ wrappers/trace.py
3
@@ -521,7 +521,7 @@ class Tracer:
4
         print '#    define alloca _alloca'
5
         print '#  endif'
6
         print '#else'
7
-        print '#  include <alloca.h> // alloca'
8
+        print '#  include <stdlib.h> // alloca'
9
         print '#endif'
10
         print
11
         print
(-)devel/apitrace/files/qapitrace.desktop (+9 lines)
Line 0 Link Here
1
[Desktop Entry]
2
Name=QApiTrace
3
GenericName=Graphics API tracing tool
4
Comment=A set of tools to trace OpenGL and other graphics APIs
5
Exec=qapitrace
6
Terminal=false
7
Type=Application
8
Categories=Development;
9
Keywords=opengl;graphics;debugging;
(-)devel/apitrace/pkg-descr (+7 lines)
Line 0 Link Here
1
apitrace is a set of tools to:
2
- trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a file
3
- replay OpenGL and OpenGL ES calls from a file
4
- inspect OpenGL state at any call while retracing
5
- visualize and edit trace files
6
7
WWW: https://apitrace.github.io
(-)devel/apitrace/pkg-plist (+25 lines)
Line 0 Link Here
1
bin/apitrace
2
bin/eglretrace
3
bin/glretrace
4
%%QT5%%bin/qapitrace
5
%%QT5%%share/applications/qapitrace.desktop
6
lib/apitrace/scripts/apitrace.PIXExp
7
lib/apitrace/scripts/convert.py
8
lib/apitrace/scripts/highlight.py
9
lib/apitrace/scripts/jsondiff.py
10
lib/apitrace/scripts/jsonextractimages.py
11
lib/apitrace/scripts/leaks.py
12
lib/apitrace/scripts/profileshader.py
13
lib/apitrace/scripts/retracediff.py
14
lib/apitrace/scripts/snapdiff.py
15
lib/apitrace/scripts/tracecheck.py
16
lib/apitrace/scripts/tracediff.py
17
lib/apitrace/scripts/unpickle.py
18
lib/apitrace/wrappers/egltrace.so
19
lib/apitrace/wrappers/glxtrace.so
20
%%PORTDOCS%%%%DOCSDIR%%/BUGS.markdown
21
%%PORTDOCS%%%%DOCSDIR%%/LICENSE-brotli.txt
22
%%PORTDOCS%%%%DOCSDIR%%/LICENSE-snappy.txt
23
%%PORTDOCS%%%%DOCSDIR%%/NEWS.markdown
24
%%PORTDOCS%%%%DOCSDIR%%/README.markdown
25
%%PORTDOCS%%%%DOCSDIR%%/USAGE.markdown

Return to bug 223002