debian/changelog | 2
debian/control | 3 -
debian/copyright | 2
debian/patches/demos-add-install-rule.diff | 5 -
debian/patches/demos-dont-build-tri-or-cube.diff | 39 +++++++++++++
debian/patches/demos-read-from-installed-paths.diff | 59 --------------------
debian/patches/demos-use-prebuilt-spvs.diff | 44 --------------
debian/patches/layers-dont-set-an-rpath.diff | 2
debian/patches/series | 3 -
debian/rules | 4 -
debian/vulkan-utils.install | 5 -
debian/watch | 6 --
dev/null |binary
13 files changed, 49 insertions(+), 125 deletions(-)
New commits:
commit bb8d67ad57553cf721985d75889d5c0d7a86751c
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Mar 10 13:52:43 2016 +0200
try to use mk-origtargz
diff --git a/debian/changelog b/debian/changelog
index 06ebd71..d710023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vulkan (1.0.3.1-1) UNRELEASED; urgency=low
+vulkan (1.0.3.1+dfsg1-1) UNRELEASED; urgency=low
* Initial release (Closes: #814922)
diff --git a/debian/copyright b/debian/copyright
index 14bb325..156ce2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format:
https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Vulkan-LoaderAndValidationLayers
Source: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
+Files-Excluded: tests/gtest-* windowsruntimeinstaller
+
Files: *
Copyright: 2015-2016 Valve Corporation
2015-2016 Google, Inc
diff --git a/debian/watch b/debian/watch
index 4e4e6f8..d39766f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,4 @@
version=3
-opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \
+opts="repack,uversionmangle=s/$/+dfsg1/,filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/"
\
https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags
(?:.*?/)sdk_(\d[\d.]*)\.tar\.gz
-
-#
https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags
(?:.*?/)?v?(\d[\d.]*)\.tar\.gz
commit 16f2c88aff8954f7de0d92daa014f3b691b344e3
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Mar 10 12:59:00 2016 +0200
watch: updated
diff --git a/debian/watch b/debian/watch
index 78c30d7..4e4e6f8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
version=3
opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \
- https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags
(?:.*?/)sdk-(\d[\d.]*)\.tar\.gz
+ https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags
(?:.*?/)sdk_(\d[\d.]*)\.tar\.gz
#
https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags
(?:.*?/)?v?(\d[\d.]*)\.tar\.gz
commit f5c4a7f4e3fecf0fc1e0d3452f0f81bc331ec540
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Mar 10 12:34:57 2016 +0200
Revert "build cube & tri, and hack around so they have what they need to
work"
This reverts commit 871ea91322a66793869c3c60fd4e068c8358ff88.
the binary blobs aren't distributable
diff --git a/debian/control b/debian/control
index 015d81a..a695565 100644
--- a/debian/control
+++ b/debian/control
@@ -45,5 +45,4 @@ Section: graphics
Depends: ${shlibs:Depends}, ${misc:Depends},
libvulkan1,
Description: Miscellaneous Vulkan utilities
- This package provides a few demo programs to test Vulkan functionality,
- including vkcube, vktri and vulkaninfo.
+ This package provides utilities for Vulkan, including vulkaninfo.
diff --git a/debian/local/cube-frag.spv b/debian/local/cube-frag.spv
deleted file mode 100644
index 15db12c..0000000
Binary files a/debian/local/cube-frag.spv and /dev/null differ
diff --git a/debian/local/cube-vert.spv b/debian/local/cube-vert.spv
deleted file mode 100644
index 0e27210..0000000
Binary files a/debian/local/cube-vert.spv and /dev/null differ
diff --git a/debian/local/tri-frag.spv b/debian/local/tri-frag.spv
deleted file mode 100644
index 122c06f..0000000
Binary files a/debian/local/tri-frag.spv and /dev/null differ
diff --git a/debian/local/tri-vert.spv b/debian/local/tri-vert.spv
deleted file mode 100644
index 45ca768..0000000
Binary files a/debian/local/tri-vert.spv and /dev/null differ
diff --git a/debian/patches/demos-add-install-rule.diff
b/debian/patches/demos-add-install-rule.diff
index ce2580e..c1f56e2 100644
--- a/debian/patches/demos-add-install-rule.diff
+++ b/debian/patches/demos-add-install-rule.diff
@@ -1,11 +1,8 @@
Description: Add an install rule for vulkaninfo
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
-@@ -93,6 +93,7 @@ else()
+@@ -93,3 +93,4 @@ else()
add_executable(vulkaninfo WIN32 vulkaninfo.c)
endif()
target_link_libraries(vulkaninfo ${LIBRARIES})
+install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin)
-
- if(UNIX)
- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
diff --git a/debian/patches/demos-dont-build-tri-or-cube.diff
b/debian/patches/demos-dont-build-tri-or-cube.diff
new file mode 100644
index 0000000..f26490e
--- /dev/null
+++ b/debian/patches/demos-dont-build-tri-or-cube.diff
@@ -0,0 +1,39 @@
+commit f63cbe944107b5cd8f150ceaaec43b26099d5688
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Feb 16 10:05:25 2016 -0500
+
+ demos: Don't build tri or cube
+
+ There are more interesting demos, all we really want here is vulkaninfo.
+ This helps because we don't need to pre-build glslang/llvm/lunarglass
+ just to get the loader and layers.
+
+diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
+index ebc406b..a21760b 100644
+--- a/demos/CMakeLists.txt
++++ b/demos/CMakeLists.txt
+@@ -93,24 +93,3 @@ else()
+ add_executable(vulkaninfo WIN32 vulkaninfo.c)
+ endif()
+ target_link_libraries(vulkaninfo ${LIBRARIES})
+-
+-if(UNIX)
+- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
+-else()
+- add_executable(tri WIN32 tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
+-endif()
+-target_link_libraries(tri ${LIBRARIES})
+-
+-if(NOT WIN32)
+- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
+- target_link_libraries(cube ${LIBRARIES})
+-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()
diff --git a/debian/patches/demos-read-from-installed-paths.diff
b/debian/patches/demos-read-from-installed-paths.diff
deleted file mode 100644
index 99616d3..0000000
--- a/debian/patches/demos-read-from-installed-paths.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-commit d30409f6d173041be7730c84f4c7784dc159199f
-Author: Adam Jackson <a...@redhat.com>
-Date: Mon Feb 15 17:19:48 2016 -0500
-
- demos: Read from installed paths
-
-diff --git a/demos/cube.c b/demos/cube.c
-index f337e0f..68a2215 100644
---- a/demos/cube.c
-+++ b/demos/cube.c
-@@ -115,7 +115,7 @@ struct texture_object {
- int32_t tex_width, tex_height;
- };
-
--static char *tex_files[] = {"lunarg.ppm"};
-+static char *tex_files[] = {"/usr/share/vulkan/cube.ppm"};
-
- struct vkcube_vs_uniform {
- // Must start with MVP
-@@ -1478,7 +1478,7 @@ static VkShaderModule demo_prepare_vs(struct demo *demo)
{
- void *vertShaderCode;
- size_t size;
-
-- vertShaderCode = demo_read_spv("cube-vert.spv", &size);
-+ vertShaderCode = demo_read_spv("/usr/share/vulkan/cube-vert.spv", &size);
-
- demo->vert_shader_module =
- demo_prepare_shader_module(demo, vertShaderCode, size);
-@@ -1492,7 +1492,7 @@ static VkShaderModule demo_prepare_fs(struct demo *demo)
{
- void *fragShaderCode;
- size_t size;
-
-- fragShaderCode = demo_read_spv("cube-frag.spv", &size);
-+ fragShaderCode = demo_read_spv("/usr/share/vulkan/cube-frag.spv", &size);
-
- demo->frag_shader_module =
- demo_prepare_shader_module(demo, fragShaderCode, size);
-diff --git a/demos/tri.c b/demos/tri.c
-index 5910c37..87f2cb7 100644
---- a/demos/tri.c
-+++ b/demos/tri.c
-@@ -1229,7 +1229,7 @@ static VkShaderModule demo_prepare_vs(struct demo *demo)
{
- void *vertShaderCode;
- size_t size;
-
-- vertShaderCode = demo_read_spv("tri-vert.spv", &size);
-+ vertShaderCode = demo_read_spv("/usr/share/vulkan/tri-vert.spv", &size);
-
- demo->vert_shader_module =
- demo_prepare_shader_module(demo, vertShaderCode, size);
-@@ -1243,7 +1243,7 @@ static VkShaderModule demo_prepare_fs(struct demo *demo)
{
- void *fragShaderCode;
- size_t size;
-
-- fragShaderCode = demo_read_spv("tri-frag.spv", &size);
-+ fragShaderCode = demo_read_spv("/usr/share/vulkan/tri-frag.spv", &size);
-
- demo->frag_shader_module =
- demo_prepare_shader_module(demo, fragShaderCode, size);
diff --git a/debian/patches/demos-use-prebuilt-spvs.diff
b/debian/patches/demos-use-prebuilt-spvs.diff
deleted file mode 100644
index a5f0352..0000000
--- a/debian/patches/demos-use-prebuilt-spvs.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -50,24 +50,6 @@ if(WIN32)
- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
--else()
-- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o
tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
-- DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-- )
-- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o
tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
-- DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-- )
-- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o
cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
-- DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-- )
--
-- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o
cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
-- DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-- )
- endif()
-
- if(NOT WIN32)
-@@ -96,14 +78,14 @@ target_link_libraries(vulkaninfo ${LIBRA
- install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin)
-
- if(UNIX)
-- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
-+ add_executable(tri tri.c ${CMAKE_SOURCE_DIR}/debian/local/tri-vert.spv
${CMAKE_SOURCE_DIR}//debian/local/tri-frag.spv)
- else()
- add_executable(tri WIN32 tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
- endif()
- target_link_libraries(tri ${LIBRARIES})
-
- if(NOT WIN32)
-- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
-+ add_executable(cube cube.c ${CMAKE_SOURCE_DIR}/debian/local/cube-vert.spv
${CMAKE_SOURCE_DIR}//debian/local/cube-frag.spv)
- target_link_libraries(cube ${LIBRARIES})
- else()
- if (CMAKE_CL_64)
diff --git a/debian/patches/layers-dont-set-an-rpath.diff
b/debian/patches/layers-dont-set-an-rpath.diff
index 86cc026..5d46379 100644
--- a/debian/patches/layers-dont-set-an-rpath.diff
+++ b/debian/patches/layers-dont-set-an-rpath.diff
@@ -4,6 +4,8 @@ Date: Wed Feb 10 14:52:34 2016 -0500
layers: Don't set an rpath
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 0406a57..daa0069 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -26,9 +26,6 @@ set(LAYER_JSON_FILES
diff --git a/debian/patches/series b/debian/patches/series
index 37d55be..8561267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
trim-build.diff
+demos-dont-build-tri-or-cube.diff
loader-add-install-rule.diff
demos-add-install-rule.diff
layers-use-local-spirv-hpp.diff
layers-install-to-cmake-install-libdir.diff
layers-dont-set-an-rpath.diff
-demos-use-prebuilt-spvs.diff
-demos-read-from-installed-paths.diff
diff --git a/debian/rules b/debian/rules
index c5866a9..7dc8b5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,6 @@ override_dh_auto_install:
debian/tmp/usr/share/vulkan/explicit_layer.d/$$i \
; done
- install -T build/demos/cube debian/tmp/usr/bin/vulkancube
- install -T build/demos/tri debian/tmp/usr/bin/vulkantri
- install -T demos/lunarg.ppm debian/tmp/usr/share/vulkan/cube.ppm
-
override_dh_install:
dh_install --fail-missing
diff --git a/debian/vulkan-utils.install b/debian/vulkan-utils.install
index 0c92473..4f60378 100644
--- a/debian/vulkan-utils.install
+++ b/debian/vulkan-utils.install
@@ -1,6 +1 @@
-usr/bin/vulkancube
usr/bin/vulkaninfo
-usr/bin/vulkantri
-usr/share/vulkan/cube.ppm
-debian/local/cube-*.spv usr/share/vulkan
-debian/local/tri-*.spv usr/share/vulkan
commit 56e67dd992b8922de0768a8ef43da9ed3192393b
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Mar 10 12:34:16 2016 +0200
fix the version, 1.0.3.1 tag was finally pushed
diff --git a/debian/changelog b/debian/changelog
index 7fb5ae6..06ebd71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vulkan (1.0.3~git20160215-1) UNRELEASED; urgency=low
+vulkan (1.0.3.1-1) UNRELEASED; urgency=low
* Initial release (Closes: #814922)
