aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhsan Hussain <ahsan_hussain@mentor.com>2017-09-19 14:28:38 +0500
committerAhsan Hussain <ahsan_hussain@mentor.com>2017-09-19 15:46:13 +0500
commit1406dd8aa53dd03c4352d815a5eed2f3c996c20d (patch)
tree15267acc941c21e13935201aea1b369b9d2cb7e6
parent7c8c37ab2fa136876914a69cc8b7a5a43c622c86 (diff)
downloadmeta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.tar.gz
meta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.tar.bz2
meta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.zip
vulkan-tools: Enable vktraceviewer, iff Qt layers are enabled
This tool was not enabled and would cause configuration issue when Qt layers are configured in the build. Signed-off-by: Ahsan Hussain <ahsan_hussain@mentor.com>
-rw-r--r--common/recipes-graphics/lunarg-sdk/vulkan-tools_%.bbappend13
-rw-r--r--meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch35
-rw-r--r--meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb4
-rw-r--r--meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0009-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch35
-rw-r--r--meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.46.bb4
5 files changed, 89 insertions, 2 deletions
diff --git a/common/recipes-graphics/lunarg-sdk/vulkan-tools_%.bbappend b/common/recipes-graphics/lunarg-sdk/vulkan-tools_%.bbappend
new file mode 100644
index 00000000..1d45a1ad
--- /dev/null
+++ b/common/recipes-graphics/lunarg-sdk/vulkan-tools_%.bbappend
@@ -0,0 +1,13 @@
+QTBITS ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'cmake_qt5', '',d)}"
+
+inherit ${QTBITS}
+
+DEPENDS += "${@base_conditional('QTBITS', '', '', 'libxcb', d)}"
+RDEPENDS_${PN}_append = " ${@base_conditional('QTBITS', '', '', 'qtsvg', d)}"
+
+do_install_append() {
+ if [ "${QTBITS}" != "" ]
+ then
+ install ${B}/vktrace/vktraceviewer ${D}${bindir}
+ fi
+}
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch
new file mode 100644
index 00000000..d665785d
--- /dev/null
+++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch
@@ -0,0 +1,35 @@
+From 233ba185542405bc38ecb01d1dd90881056291cf Mon Sep 17 00:00:00 2001
+From: Ahsan Hussain <ahsan_hussain@mentor.com>
+Date: Tue, 19 Sep 2017 13:59:27 +0500
+Subject: [PATCH 1/1] CMakeLists: add include paths for xcb and Xlib
+
+---
+ vktrace/src/vktrace_viewer/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/vktrace/src/vktrace_viewer/CMakeLists.txt b/vktrace/src/vktrace_viewer/CMakeLists.txt
+index dfe2a48..7fbfa12 100644
+--- a/vktrace/src/vktrace_viewer/CMakeLists.txt
++++ b/vktrace/src/vktrace_viewer/CMakeLists.txt
+@@ -22,6 +22,9 @@ else()
+ find_package(Threads REQUIRED)
+ find_package(X11 REQUIRED)
+
++find_path(XCB_INCLUDE_DIR xcb/xcb.h DOC "Path to xcb/xcb.h")
++find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h")
++
+ require_pthreads()
+
+ include_directories(
+@@ -33,6 +36,8 @@ include_directories(
+ ${SRC_DIR}/vktrace_viewer
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${Qt5Widgets_INCLUDE_DIRS}
++ ${X11_XLIB_INCLUDE_DIR}
++ ${XCB_INCLUDE_DIR}
+ )
+
+ set(SRC_LIST
+--
+2.11.1
+
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb
index c7e65dfe..b5c0b85c 100644
--- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb
+++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb
@@ -22,7 +22,9 @@ SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \
file://0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch \
file://0002-obey-CMAKE_INSTALL_LIBDIR.patch \
file://0003-vktrace-do-not-link-to-internal-loader.patch\
- file://0004-json-correct-layer-lib-paths.patch"
+ file://0004-json-correct-layer-lib-paths.patch \
+ file://0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch \
+"
EXTRA_OECMAKE = " \
-DBUILD_LOADER=0 \
diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0009-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0009-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch
new file mode 100644
index 00000000..b1b86573
--- /dev/null
+++ b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0009-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch
@@ -0,0 +1,35 @@
+From 801aa0aad1f62fb41d8f28d3f2e0bf836d9aeec7 Mon Sep 17 00:00:00 2001
+From: Ahsan Hussain <ahsan_hussain@mentor.com>
+Date: Mon, 18 Sep 2017 14:16:13 +0500
+Subject: [PATCH 1/1] CMakeLists: add include paths for xcb and Xlib
+
+---
+ vktrace/vktrace_viewer/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/vktrace/vktrace_viewer/CMakeLists.txt b/vktrace/vktrace_viewer/CMakeLists.txt
+index 7127c7f..3a203ad 100644
+--- a/vktrace/vktrace_viewer/CMakeLists.txt
++++ b/vktrace/vktrace_viewer/CMakeLists.txt
+@@ -41,6 +41,9 @@ endif()
+
+ find_package(Qt5 COMPONENTS Widgets Gui Core Svg QUIET)
+
++find_path(XCB_INCLUDE_DIR xcb/xcb.h DOC "Path to xcb/xcb.h")
++find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h")
++
+ if(NOT Qt5_FOUND)
+ # After Qt5.6 is installed, you may need to add the following to the cmake command line:
+ # -DCMAKE_PREFIX_PATH=C:\\Qt\\5.6\\msvc2015_64\\
+@@ -60,6 +63,8 @@ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${Qt5Widgets_INCLUDE_DIRS}
++ ${X11_XLIB_INCLUDE_DIR}
++ ${XCB_INCLUDE_DIR}
+ )
+
+ set(SRC_LIST
+--
+2.11.1
+
diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.46.bb b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.46.bb
index b8609424..192a6cca 100644
--- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.46.bb
+++ b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.46.bb
@@ -26,7 +26,9 @@ SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \
file://0005-vktrace_layer-force-linker-flags.patch \
file://0006-CMakeList-only-search-for-jsoncpp-when-needed.patch \
file://0007-layersvt-obey-CMAKE_INSTALL_LIBDIR.patch \
- file://0008-CMakeLists-only-deploy-headers-when-needed.patch"
+ file://0008-CMakeLists-only-deploy-headers-when-needed.patch \
+ file://0009-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch \
+"
EXTRA_OECMAKE = " \
-DBUILD_LOADER=0 \