imx-gpu-apitrace: x11: make python3 compatible

When building for fslc-x11 python code generation still fails, e.g.:
| File ".../imx-gpu-apitrace/7.1.0-r0/git/wrappers/glxtrace.py", line 70
|   print '    if(_glXGetCurrentDisplay == &glXGetCurrentDisplay ){'

Convert python2 print statements to python3.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0005-scripts-Tie-a-few-more-Python-2-to-3-conversion-loos.patch b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0005-scripts-Tie-a-few-more-Python-2-to-3-conversion-loos.patch
new file mode 100644 (file)
index 0000000..6bff7e9
--- /dev/null
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace/0005-scripts-Tie-a-few-more-Python-2-to-3-conversion-loos.patch
@@ -0,0 +1,60 @@
+From 8b3afcaeebdd87962f2f3fef36973090621d116b Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 29 Mar 2020 15:38:31 +0000
+Subject: [PATCH 5/5] scripts: Tie a few more Python 2 to 3 conversion loose
+ ends.
+
+Upstream-Status: pending
+Note: code exists in NXP's fork only.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ wrappers/glxtrace.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
+index b05028e2..2472560d 100644
+--- a/wrappers/glxtrace.py
++++ b/wrappers/glxtrace.py
+@@ -67,9 +67,9 @@ class GlxTracer(GlTracer):
+             print('    gltrace::releaseContext((uintptr_t)ctx);')
+ 
+         if function.name == 'glXGetCurrentDisplay':
+-            print '    if(_glXGetCurrentDisplay == &glXGetCurrentDisplay ){'
+-            print '        _glXGetCurrentDisplay = (PFN_GLXGETCURRENTDISPLAY)_getPublicProcAddress("glXGetCurrentDisplay");'
+-            print '    }'
++            print ('    if(_glXGetCurrentDisplay == &glXGetCurrentDisplay ){')
++            print ('        _glXGetCurrentDisplay = (PFN_GLXGETCURRENTDISPLAY)_getPublicProcAddress("glXGetCurrentDisplay");')
++            print ('    }')
+ 
+         GlTracer.traceFunctionImplBody(self, function)
+ 
+@@ -184,7 +184,7 @@ if __name__ == '__main__':
+     tracer = GlxTracer()
+     tracer.traceApi(api)
+ 
+-    print r'''
++    print (r'''
+ 
+ 
+ /*
+@@ -247,8 +247,8 @@ void * dlopen(const char *filename, int flag)
+ 
+ 
+ 
+-'''
+-    print r'''
++''')
++    print (r'''
+ /*
+  * let the GPU driver know that we are in apitrace
+  */
+@@ -257,4 +257,4 @@ int APIENTRY ApiTraceEnabled(void) {
+     return 1;
+ }
+ 
+-'''
++''')
+-- 
+2.20.1
+

diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
index 0169c26f31dc7ec898b743deb6ad24546915babd..180db8d8491b0dfbb2d66c198210ededa646b519 100644 (file)
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb
@@ -10,6 +10,7 @@ SRC_URI = "\
        file://0002-specs-Tie-Python-2-3-conversion-loose-ends.patch \
        file://0003-scripts-Tie-Python-2-3-conversion-loose-ends.patch \
        file://0004-scripts-Tie-a-few-more-Python-2-to-3-conversion-loos.patch \
+       file://0005-scripts-Tie-a-few-more-Python-2-to-3-conversion-loos.patch \
 "
 SRCREV = "09579e67262af9c993dd082055a924c2c61cf34d"