Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / vulkan-loader
Commits:
-
5fb5ef9f
by Timo Aaltonen at 2019-03-12T16:32:03Z
-
1621d53f
by Timo Aaltonen at 2019-03-12T16:35:15Z
-
b2f52e8d
by Timo Aaltonen at 2019-03-12T16:38:19Z
-
38af2d1c
by Timo Aaltonen at 2019-03-12T16:39:35Z
3 changed files:
Changes:
| 1 |
+vulkan-loader (1.1.101.0-2) unstable; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * rules: Enable tests, but expect most of them to fail since there's
|
|
| 4 |
+ no software driver yet.
|
|
| 5 |
+ * control, rules: Drop quilt from build-depends/dh since this is a
|
|
| 6 |
+ format 3.0 pkg.
|
|
| 7 |
+ * rules: Update the clean target.
|
|
| 8 |
+ |
|
| 9 |
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 12 Mar 2019 18:38:57 +0200
|
|
| 10 |
+ |
|
| 1 | 11 |
vulkan-loader (1.1.101.0-1) unstable; urgency=medium
|
| 2 | 12 |
|
| 3 | 13 |
* New upstream release.
|
| ... | ... | @@ -4,13 +4,13 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> |
| 4 | 4 |
Uploaders: Timo Aaltonen <tjaalton@debian.org>
|
| 5 | 5 |
Build-Depends: debhelper (>= 11),
|
| 6 | 6 |
cmake,
|
| 7 |
+ googletest,
|
|
| 7 | 8 |
libwayland-dev,
|
| 8 | 9 |
libx11-dev,
|
| 9 | 10 |
libxcb1-dev,
|
| 10 | 11 |
libxrandr-dev,
|
| 11 | 12 |
pkg-config,
|
| 12 | 13 |
python3,
|
| 13 |
- quilt,
|
|
| 14 | 14 |
Standards-Version: 4.2.0
|
| 15 | 15 |
Section: libs
|
| 16 | 16 |
Homepage: https://github.com/KhronosGroup/Vulkan-Loader
|
| ... | ... | @@ -6,23 +6,30 @@ include /usr/share/dpkg/default.mk |
| 6 | 6 |
include /usr/share/dpkg/pkg-info.mk
|
| 7 | 7 |
|
| 8 | 8 |
%:
|
| 9 |
- dh $@ --with quilt --builddirectory=build/
|
|
| 9 |
+ dh $@ --builddirectory=build/
|
|
| 10 | 10 |
|
| 11 | 11 |
override_dh_clean:
|
| 12 | 12 |
dh_clean
|
| 13 | 13 |
rm -rf __pycache__ \
|
| 14 | 14 |
include \
|
| 15 |
- scripts/__pycache__
|
|
| 15 |
+ scripts/__pycache__ \
|
|
| 16 |
+ vulkan-headers/registry/__pycache__
|
|
| 17 |
+ rm -f external/googletest
|
|
| 16 | 18 |
|
| 17 | 19 |
override_dh_auto_configure:
|
| 20 |
+ ln -s /usr/src/googletest external
|
|
| 21 |
+ |
|
| 18 | 22 |
dh_auto_configure -- \
|
| 19 | 23 |
-DCMAKE_BUILD_TYPE=Release \
|
| 20 | 24 |
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
|
| 21 |
- -DBUILD_TESTS=OFF \
|
|
| 22 | 25 |
-DBUILD_WSI_MIR_SUPPORT=OFF \
|
| 23 | 26 |
-DVulkanHeaders_INCLUDE_DIR=../vulkan-headers/include \
|
| 24 | 27 |
-DVulkanRegistry_DIR=../vulkan-headers/registry
|
| 25 | 28 |
|
| 29 |
+override_dh_auto_test:
|
|
| 30 |
+ (cd build; tests/run_all_tests.sh || \
|
|
| 31 |
+ echo "NOTE: 23 tests expected to fail without a vulkan driver")
|
|
| 32 |
+ |
|
| 26 | 33 |
override_dh_auto_install:
|
| 27 | 34 |
dh_auto_install --destdir=debian/tmp
|
| 28 | 35 |
|