debian/libvulkan-dev.dirs | 2 debian/libvulkan-dev.install | 2 debian/libvulkan1.install | 2 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff | 95 +++----------- debian/patches/series | 1 debian/patches/smoke-check-for-installed-so.diff | 25 +++ debian/rules | 7 - debian/vulkan-utils.install | 1 8 files changed, 58 insertions(+), 77 deletions(-)
New commits: commit 74e842c18173ca3be7dc171a72bd01baf277fedc Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 16:30:17 2017 +0300 fix smoke on wayland diff --git a/debian/patches/smoke-check-for-installed-so.diff b/debian/patches/smoke-check-for-installed-so.diff index f87d183..bcb333e 100644 --- a/debian/patches/smoke-check-for-installed-so.diff +++ b/debian/patches/smoke-check-for-installed-so.diff @@ -1,3 +1,6 @@ +Description: Check for the installed .so and avoid dependin on -dev +Author: Timo Aaltonen <[email protected]> + --- a/demos/smoke/ShellXcb.cpp +++ b/demos/smoke/ShellXcb.cpp @@ -132,7 +132,7 @@ void ShellXcb::create_window() { @@ -9,3 +12,14 @@ void *handle, *symbol; #ifdef UNINSTALLED_LOADER +--- a/demos/smoke/ShellWayland.cpp ++++ b/demos/smoke/ShellWayland.cpp +@@ -156,7 +156,7 @@ void ShellWayland::create_window() { + } + + PFN_vkGetInstanceProcAddr ShellWayland::load_vk() { +- const char filename[] = "libvulkan.so"; ++ const char filename[] = "libvulkan.so.1"; + void *handle, *symbol; + + #ifdef UNINSTALLED_LOADER commit 0e9d5c76551191b6e982913a55109abac0afabc2 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 16:15:14 2017 +0300 move layer json files to -dev, add /etc/vulkan/*_layer.d to -dev diff --git a/debian/libvulkan-dev.dirs b/debian/libvulkan-dev.dirs new file mode 100644 index 0000000..c3a24a3 --- /dev/null +++ b/debian/libvulkan-dev.dirs @@ -0,0 +1,2 @@ +etc/vulkan/explicit_layer.d +etc/vulkan/implicit_layer.d diff --git a/debian/libvulkan-dev.install b/debian/libvulkan-dev.install index dfdc4da..8e3172c 100644 --- a/debian/libvulkan-dev.install +++ b/debian/libvulkan-dev.install @@ -1,3 +1,5 @@ usr/include/vulkan usr/lib/*/libvulkan.so usr/lib/*/libVkLayer*.so +usr/share/vulkan/explicit_layer.d +usr/share/vulkan/implicit_layer.d diff --git a/debian/libvulkan1.install b/debian/libvulkan1.install index f55d4cf..3ddde58 100644 --- a/debian/libvulkan1.install +++ b/debian/libvulkan1.install @@ -1,3 +1 @@ usr/lib/*/lib*.so.* -usr/share/vulkan/explicit_layer.d -usr/share/vulkan/implicit_layer.d diff --git a/debian/rules b/debian/rules index a066af9..7434592 100755 --- a/debian/rules +++ b/debian/rules @@ -44,9 +44,10 @@ override_dh_auto_install: mkdir -p debian/tmp/usr/include cp -rp include/vulkan debian/tmp/usr/include + mkdir -p debian/tmp/usr/share/vulkan/explicit_layer.d mkdir -p debian/tmp/usr/share/vulkan/implicit_layer.d - mv debian/tmp/etc/vulkan/explicit_layer.d \ - debian/tmp/usr/share/vulkan + mv debian/tmp/etc/vulkan/explicit_layer.d/*.json \ + debian/tmp/usr/share/vulkan/explicit_layer.d install -T build/demos/smoketest debian/tmp/usr/bin/vulkan-smoke commit 3390b3add85bc532c4d9c7b22eaa59ce29780a97 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 10 16:04:53 2017 +0300 build vulkan-smoke diff --git a/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff b/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff index c1aabca..19b3b7d 100644 --- a/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff +++ b/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff @@ -10,38 +10,10 @@ Date: Tue Feb 16 10:05:25 2016 -0500 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -61,46 +61,6 @@ - else() - endif() - --if(WIN32) -- # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory. -- # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the -- # appropriate data at build time. -- if (CMAKE_CL_64) -- set (BUILDTGT_DIR build) -- else () -- set (BUILDTGT_DIR build32) -- endif() -- -- # Use static MSVCRT libraries -- foreach(configuration in CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO -- CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO) -- if(${configuration} MATCHES "/MD") -- string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}") -- endif() -- endforeach() -- -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert -- DEPENDS cube.vert ${GLSLANG_VALIDATOR} -- ) -- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv -- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag -- DEPENDS cube.frag ${GLSLANG_VALIDATOR} -- ) -- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) -- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) +@@ -91,17 +91,6 @@ if(WIN32) + ) + file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) + file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) -else() - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv @@ -53,51 +25,28 @@ Date: Tue Feb 16 10:05:25 2016 -0500 - DEPENDS cube.frag ${GLSLANG_VALIDATOR} - ) - endif() --endif() + endif() if(WIN32) - include_directories ( -@@ -114,43 +74,6 @@ - add_executable(${API_LOWERCASE}info vulkaninfo.c) - target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) +@@ -118,8 +107,8 @@ target_link_libraries(${API_LOWERCASE}in --if(NOT WIN32) -- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) + if(NOT WIN32) + if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) - add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) - target_link_libraries(cube ${LIBRARIES}) -- endif() --else() -- if (CMAKE_CL_64) -- set (LIB_DIR "Win64") -- else() -- set (LIB_DIR "Win32") -- endif() -- -- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) -- target_link_libraries(cube ${LIBRARIES}) --endif() -- --if(NOT WIN32) -- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) ++# add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) ++# target_link_libraries(cube ${LIBRARIES}) + endif() + else() + if (CMAKE_CL_64) +@@ -134,8 +123,8 @@ endif() + + if(NOT WIN32) + if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) - add_executable(cubepp cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) - target_link_libraries(cubepp ${LIBRARIES}) -- endif() --else() -- if (CMAKE_CL_64) -- set (LIB_DIR "Win64") -- else() -- set (LIB_DIR "Win32") -- endif() -- -- add_executable(cubepp WIN32 cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) -- target_link_libraries(cubepp ${LIBRARIES}) --endif() -- --if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})) -- if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) -- add_subdirectory(smoke) -- endif() --endif() - - if(UNIX) - install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR}) ++# add_executable(cubepp cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) ++# target_link_libraries(cubepp ${LIBRARIES}) + endif() + else() + if (CMAKE_CL_64) diff --git a/debian/patches/series b/debian/patches/series index 9548ae4..b3f99cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ demos-dont-build-tri-or-cube-or-smoke.diff use-mxgot-for-mips64.patch install-vulkan-intel-header.diff +smoke-check-for-installed-so.diff diff --git a/debian/patches/smoke-check-for-installed-so.diff b/debian/patches/smoke-check-for-installed-so.diff new file mode 100644 index 0000000..f87d183 --- /dev/null +++ b/debian/patches/smoke-check-for-installed-so.diff @@ -0,0 +1,11 @@ +--- a/demos/smoke/ShellXcb.cpp ++++ b/demos/smoke/ShellXcb.cpp +@@ -132,7 +132,7 @@ void ShellXcb::create_window() { + } + + PFN_vkGetInstanceProcAddr ShellXcb::load_vk() { +- const char filename[] = "libvulkan.so"; ++ const char filename[] = "libvulkan.so.1"; + void *handle, *symbol; + + #ifdef UNINSTALLED_LOADER diff --git a/debian/rules b/debian/rules index 3839a0d..a066af9 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,8 @@ override_dh_auto_install: mv debian/tmp/etc/vulkan/explicit_layer.d \ debian/tmp/usr/share/vulkan + install -T build/demos/smoketest debian/tmp/usr/bin/vulkan-smoke + override_dh_install: dh_install --fail-missing diff --git a/debian/vulkan-utils.install b/debian/vulkan-utils.install index 4f60378..bd6d5b0 100644 --- a/debian/vulkan-utils.install +++ b/debian/vulkan-utils.install @@ -1 +1,2 @@ usr/bin/vulkaninfo +usr/bin/vulkan-smoke
