debian/control | 1
debian/patches/demos-add-install-rule.diff | 8 ++
debian/patches/demos-dont-build-tri-or-cube.diff | 39 +++++++++++++
debian/patches/loader-add-install-rule.diff | 16 +++++
debian/patches/series | 4 +
debian/patches/use-packaged-glslangvalidator.diff | 64 ----------------------
debian/rules | 9 ---
debian/vulkan-utils.install | 2
8 files changed, 68 insertions(+), 75 deletions(-)
New commits:
commit 8383c3148f7d39265fb3f5e3610211cdaf13af3c
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Feb 17 18:38:29 2016 +0200
demos: Add an install rule for vulkaninfo
diff --git a/debian/patches/demos-add-install-rule.diff
b/debian/patches/demos-add-install-rule.diff
new file mode 100644
index 0000000..c1f56e2
--- /dev/null
+++ b/debian/patches/demos-add-install-rule.diff
@@ -0,0 +1,8 @@
+Description: Add an install rule for vulkaninfo
+--- a/demos/CMakeLists.txt
++++ b/demos/CMakeLists.txt
+@@ -93,3 +93,4 @@ else()
+ add_executable(vulkaninfo WIN32 vulkaninfo.c)
+ endif()
+ target_link_libraries(vulkaninfo ${LIBRARIES})
++install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin)
diff --git a/debian/patches/series b/debian/patches/series
index a28a44f..5b2ec54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
trim-build.diff
demos-dont-build-tri-or-cube.diff
loader-add-install-rule.diff
+demos-add-install-rule.diff
diff --git a/debian/rules b/debian/rules
index 2c9e622..812c12d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,6 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install
- mkdir -p debian/tmp/usr/bin
- install build/demos/vulkaninfo debian/tmp/usr/bin
override_dh_install:
dh_install --fail-missing
commit 31a5ee3400f5a3ceb3f9e8742ae38d6491b51023
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Feb 17 18:21:45 2016 +0200
add an install rule for the loader
diff --git a/debian/patches/loader-add-install-rule.diff
b/debian/patches/loader-add-install-rule.diff
new file mode 100644
index 0000000..707a99f
--- /dev/null
+++ b/debian/patches/loader-add-install-rule.diff
@@ -0,0 +1,16 @@
+commit 68165bda903b68520c21dd132ebc23be0177b7f4
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Feb 10 15:17:06 2016 -0500
+
+ loader: Add install rule
+
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index 835c23a..d55adc7 100644
+--- a/loader/CMakeLists.txt
++++ b/loader/CMakeLists.txt
+@@ -47,4 +47,5 @@ if (NOT WIN32)
+ add_library(vulkan SHARED ${LOADER_SRCS})
+ set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.3")
+ target_link_libraries(vulkan -ldl -lpthread -lm)
++ install(TARGETS vulkan DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
diff --git a/debian/patches/series b/debian/patches/series
index e4740b4..a28a44f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
trim-build.diff
demos-dont-build-tri-or-cube.diff
+loader-add-install-rule.diff
diff --git a/debian/rules b/debian/rules
index 708b083..2c9e622 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,11 @@ override_dh_clean:
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_auto_install:
- mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+ dh_auto_install
mkdir -p debian/tmp/usr/bin
- cp -P build/loader/libvulkan*.so.*
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
install build/demos/vulkaninfo debian/tmp/usr/bin
override_dh_install:
commit e4ae60f5a97cf84268088122dc7fd532d6f03d7d
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Feb 17 18:02:41 2016 +0200
don't build cube and tri, they don't work without lunarglass anyway
diff --git a/debian/control b/debian/control
index 4afef9a..0973f27 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Timo Aaltonen <tjaal...@debian.org>
Build-Depends: debhelper (>= 9),
cmake,
- glslang-utils,
libxcb1-dev,
pkg-config,
quilt,
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/series b/debian/patches/series
index 18335dc..e4740b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-use-packaged-glslangvalidator.diff
trim-build.diff
+demos-dont-build-tri-or-cube.diff
diff --git a/debian/patches/use-packaged-glslangvalidator.diff
b/debian/patches/use-packaged-glslangvalidator.diff
deleted file mode 100644
index f09d7ac..0000000
--- a/debian/patches/use-packaged-glslangvalidator.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -28,45 +28,45 @@ if(WIN32)
- endif()
-
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
-+ COMMAND /usr/bin/glslangValidator -s -V
${PROJECT_SOURCE_DIR}/demos/tri.vert
- COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- DEPENDS tri.vert
${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS tri.vert /usr/bin/glslangValidator
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
-+ COMMAND /usr/bin/glslangValidator -s -V
${PROJECT_SOURCE_DIR}/demos/tri.frag
- COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- DEPENDS tri.frag
${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS tri.frag /usr/bin/glslangValidator
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
-+ COMMAND /usr/bin/glslangValidator -s -V
${PROJECT_SOURCE_DIR}/demos/cube.vert
- COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- DEPENDS cube.vert
${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS cube.vert /usr/bin/glslangValidator
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
-+ COMMAND /usr/bin/glslangValidator -s -V
${PROJECT_SOURCE_DIR}/demos/cube.frag
- COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- DEPENDS cube.frag
${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS cube.frag /usr/bin/glslangValidator
- )
- 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
-+ COMMAND /usr/bin/glslangValidator -s -V -o tri-vert.spv
${PROJECT_SOURCE_DIR}/demos/tri.vert
-+ DEPENDS tri.vert /usr/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
-+ COMMAND /usr/bin/glslangValidator -s -V -o tri-frag.spv
${PROJECT_SOURCE_DIR}/demos/tri.frag
-+ DEPENDS tri.frag /usr/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
-+ COMMAND /usr/bin/glslangValidator -s -V -o cube-vert.spv
${PROJECT_SOURCE_DIR}/demos/cube.vert
-+ DEPENDS cube.vert /usr/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
-+ COMMAND /usr/bin/glslangValidator -s -V -o cube-frag.spv
${PROJECT_SOURCE_DIR}/demos/cube.frag
-+ DEPENDS cube.frag /usr/bin/glslangValidator
- )
- endif()
-
diff --git a/debian/rules b/debian/rules
index 889dfaa..708b083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,6 @@ override_dh_auto_install:
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
mkdir -p debian/tmp/usr/bin
cp -P build/loader/libvulkan*.so.*
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- install -T build/demos/cube debian/tmp/usr/bin/vkcube
- install -T build/demos/tri debian/tmp/usr/bin/vktri
install build/demos/vulkaninfo debian/tmp/usr/bin
override_dh_install:
diff --git a/debian/vulkan-utils.install b/debian/vulkan-utils.install
index b53cd71..4f60378 100644
--- a/debian/vulkan-utils.install
+++ b/debian/vulkan-utils.install
@@ -1,3 +1 @@
-usr/bin/vkcube
-usr/bin/vktri
usr/bin/vulkaninfo
