apitrace: Changes to 'debian'
debian/patches/02_update_gui_for_multiarch_location.diff | 31 +++++++++++++++
1 file changed, 31 insertions(+)
New commits:
commit 671c61a9c2dfb6b848de8079cacd82bdd9af705b
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Fri Oct 14 11:19:46 2011 +1100
Patch Qt GUI to pick our glxtrace install path
diff --git a/debian/patches/02_update_gui_for_multiarch_location.diff b/debian/patches/02_update_gui_for_multiarch_location.diff
new file mode 100644
index 0000000..0bce5dd
--- /dev/null
+++ b/debian/patches/02_update_gui_for_multiarch_location.diff
@@ -0,0 +1,31 @@
+Index: apitrace/gui/CMakeLists.txt
+===================================================================
+--- apitrace.orig/gui/CMakeLists.txt 2011-10-13 17:50:37.020019878 +1100
++++ apitrace/gui/CMakeLists.txt 2011-10-13 17:54:42.528023700 +1100
+@@ -47,7 +47,9 @@
+ link_directories(${LINK_DIRECTORIES} ${QJSON_LIBRARY_DIRS})
+ include_directories(${QT_INCLUDES} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+-add_definitions(-DBUILD_DIR="${CMAKE_BINARY_DIR}")
++add_definitions(-DBUILD_DIR="${CMAKE_BINARY_DIR}"
++ -DGLXTRACE_DIR="/usr/lib/${DEB_HOST_MULTIARCH}/apitrace-gl-tracer"
++ )
+
+ add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
+
+Index: apitrace/gui/traceprocess.cpp
+===================================================================
+--- apitrace.orig/gui/traceprocess.cpp 2011-10-13 17:49:09.724018520 +1100
++++ apitrace/gui/traceprocess.cpp 2011-10-13 17:55:34.432024508 +1100
+@@ -15,6 +15,11 @@
+ if (fi.exists())
+ return libPath;
+
++ libPath = QString::fromLatin1("%1/glxtrace.so").arg(GLXTRACE_DIR);
++ fi = QFileInfo(libPath);
++ if (fi.exists())
++ return libPath;
++
+ libPath = QString::fromLatin1("/usr/local/lib/glxtrace.so");
+ fi = QFileInfo(libPath);
+ if (fi.exists())
Reply to: