debian/changelog | 8 ++++++++
debian/patches/disable-mir.diff | 11 -----------
debian/patches/series | 2 --
debian/patches/trim-build.diff | 16 ----------------
debian/rules | 7 ++++++-
5 files changed, 14 insertions(+), 30 deletions(-)
New commits:
commit a32242cc7643375fd5b03e16ce63bb6c4c890469
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Sun Apr 9 11:27:08 2017 +0300
rules: Set build type to 'Release'.
diff --git a/debian/changelog b/debian/changelog
index b938069..059a7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vulkan (1.0.42.0+dfsg1-2) UNRELEASED; urgency=medium
* trim-build.diff, disable-mir.diff, rules: Use clang build options
instead of patching CMakeFile.txt.
+ * rules: Set build type to 'Release'.
-- Timo Aaltonen <tjaal...@debian.org> Sun, 09 Apr 2017 11:19:11 +0300
diff --git a/debian/rules b/debian/rules
index cebe717..47f9bb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ override_dh_clean:
override_dh_auto_configure:
dh_auto_configure -- \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian \
-DBUILD_LAYERS=OFF \
commit a91de39eba0680db8568729422d30f15a0ac8500
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Sun Apr 9 11:19:22 2017 +0300
trim-build.diff, disable-mir.diff, rules: Use clang build options instead
of patching CMakeFile.txt.
diff --git a/debian/changelog b/debian/changelog
index 6dcb551..b938069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vulkan (1.0.42.0+dfsg1-2) UNRELEASED; urgency=medium
+
+ * trim-build.diff, disable-mir.diff, rules: Use clang build options
+ instead of patching CMakeFile.txt.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Sun, 09 Apr 2017 11:19:11 +0300
+
vulkan (1.0.42.0+dfsg1-1) experimental; urgency=medium
* New upstream release. (Closes: #857185)
diff --git a/debian/patches/disable-mir.diff b/debian/patches/disable-mir.diff
deleted file mode 100644
index a47ca7e..0000000
--- a/debian/patches/disable-mir.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
- option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
- option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
-- option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" ON)
-+ option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" OFF)
- set(DEMOS_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for demos
(XCB, XLIB, WAYLAND, MIR, DISPLAY)")
-
- if (BUILD_WSI_XCB_SUPPORT)
diff --git a/debian/patches/series b/debian/patches/series
index a86f6e7..9548ae4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-trim-build.diff
demos-dont-build-tri-or-cube-or-smoke.diff
use-mxgot-for-mips64.patch
install-vulkan-intel-header.diff
-disable-mir.diff
diff --git a/debian/patches/trim-build.diff b/debian/patches/trim-build.diff
deleted file mode 100644
index 40dfafd..0000000
--- a/debian/patches/trim-build.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,10 +110,10 @@ else()
- endif()
-
- option(BUILD_LOADER "Build loader" ON)
--option(BUILD_TESTS "Build tests" ON)
--option(BUILD_LAYERS "Build layers" ON)
-+option(BUILD_TESTS "Build tests" OFF)
-+option(BUILD_LAYERS "Build layers" OFF)
- option(BUILD_DEMOS "Build demos" ON)
--option(BUILD_VKJSON "Build vkjson" ON)
-+option(BUILD_VKJSON "Build vkjson" OFF)
- option(CUSTOM_GLSLANG_BIN_ROOT "Use the user defined GLSLANG_BINARY_ROOT" OFF)
- option(CUSTOM_SPIRV_TOOLS_BIN_ROOT "Use the user defined
SPIRV_TOOLS_BINARY_ROOT" OFF)
-
diff --git a/debian/rules b/debian/rules
index 25809ca..cebe717 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,11 @@ override_dh_clean:
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
- -DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian
+ -DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian \
+ -DBUILD_LAYERS=OFF \
+ -DBUILD_TESTS=OFF \
+ -DBUILD_VKJSON=OFF \
+ -DBUILD_WSI_MIR_SUPPORT=OFF
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
