[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#927858: unblock: vulkan-loader/1.1.101.0-2

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package vulkan-loader

This was supposed to get in testing before the freeze, but apparently the cutoff date was practically a few days earlier than the announced freeze date.

The full diff is too big to paste, but the packaging changes are here:

diff -Nru vulkan-loader-1.1.97/debian/changelog vulkan-loader-1.1.101.0/debian/changelog
--- vulkan-loader-1.1.97/debian/changelog       2019-01-23 14:22:30.000000000 +0200
+++ vulkan-loader-1.1.101.0/debian/changelog    2019-03-12 18:38:57.000000000 +0200
@@ -1,3 +1,21 @@
+vulkan-loader (1.1.101.0-2) unstable; urgency=medium
+
+  * rules: Enable tests, but expect most of them to fail since there's
+    no software driver yet.
+  * control, rules: Drop quilt from build-depends/dh since this is a
+    format 3.0 pkg.
+  * rules: Update the clean target.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 12 Mar 2019 18:38:57 +0200
+
+vulkan-loader (1.1.101.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * sync_headers.sh, watch: Revert back to using tags which upstream has
+    validated as release tags.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 07 Mar 2019 15:43:23 +0200
+
 vulkan-loader (1.1.97-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru vulkan-loader-1.1.97/debian/control vulkan-loader-1.1.101.0/debian/control
--- vulkan-loader-1.1.97/debian/control 2019-01-13 16:24:11.000000000 +0200
+++ vulkan-loader-1.1.101.0/debian/control      2019-03-12 18:32:23.000000000 +0200
@@ -4,13 +4,13 @@
 Uploaders: Timo Aaltonen <tjaalton@debian.org>
 Build-Depends: debhelper (>= 11),
  cmake,
+ googletest,
  libwayland-dev,
  libx11-dev,
  libxcb1-dev,
  libxrandr-dev,
  pkg-config,
  python3,
- quilt,
 Standards-Version: 4.2.0
 Section: libs
 Homepage: https://github.com/KhronosGroup/Vulkan-Loader
diff -Nru vulkan-loader-1.1.97/debian/rules vulkan-loader-1.1.101.0/debian/rules
--- vulkan-loader-1.1.97/debian/rules   2019-01-13 16:39:54.000000000 +0200
+++ vulkan-loader-1.1.101.0/debian/rules        2019-03-12 18:35:21.000000000 +0200
@@ -6,23 +6,30 @@
 include /usr/share/dpkg/pkg-info.mk
 
 %:
-       dh $@ --with quilt --builddirectory=build/
+       dh $@ --builddirectory=build/
 
 override_dh_clean:
        dh_clean
        rm -rf __pycache__ \
                include \
-               scripts/__pycache__
+               scripts/__pycache__ \
+               vulkan-headers/registry/__pycache__
+       rm -f external/googletest
 
 override_dh_auto_configure:
+       ln -s /usr/src/googletest external
+
        dh_auto_configure -- \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-       -DBUILD_TESTS=OFF \
        -DBUILD_WSI_MIR_SUPPORT=OFF \
        -DVulkanHeaders_INCLUDE_DIR=../vulkan-headers/include \
        -DVulkanRegistry_DIR=../vulkan-headers/registry
 
+override_dh_auto_test:
+       (cd build; tests/run_all_tests.sh || \
+               echo "NOTE: 23 tests expected to fail without a vulkan driver")
+
 override_dh_auto_install:
        dh_auto_install --destdir=debian/tmp
 
diff -Nru vulkan-loader-1.1.97/debian/sync_headers.sh vulkan-loader-1.1.101.0/debian/sync_headers.sh
--- vulkan-loader-1.1.97/debian/sync_headers.sh 2019-01-13 16:30:05.000000000 +0200
+++ vulkan-loader-1.1.101.0/debian/sync_headers.sh      2019-03-07 15:40:23.000000000 +0200
@@ -7,7 +7,7 @@
 git rm -rf vulkan-headers
 
 git clone $REPO vulkan-headers
-(cd vulkan-headers; git reset --hard v$VERSION; cd ..)
+(cd vulkan-headers; git reset --hard sdk-$VERSION; cd ..)
 rm -rf vulkan-headers/.git
 
 git add -f vulkan-headers
diff -Nru vulkan-loader-1.1.97/debian/watch vulkan-loader-1.1.101.0/debian/watch
--- vulkan-loader-1.1.97/debian/watch   2019-01-13 16:31:53.000000000 +0200
+++ vulkan-loader-1.1.101.0/debian/watch        2019-03-07 15:39:40.000000000 +0200
@@ -1,4 +1,4 @@
 version=3
 
 opts="repack,filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-loader-$1.tar.gz/" \
- https://github.com/KhronosGroup/Vulkan-Loader/tags (?:.*?/)v(\d[\d.]*)\.tar\.gz
+ https://github.com/KhronosGroup/Vulkan-Loader/tags (?:.*?/)sdk[_-](\d[\d.]*)\.tar\.gz


unblock vulkan-loader/1.1.101.0-2

-- System Information:
Debian Release: buster/sid
  APT prefers disco-updates
  APT policy: (500, 'disco-updates'), (500, 'disco-security'), (500, 'disco')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.0.0-7-generic (SMP w/8 CPU cores)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8), LANGUAGE=fi:en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: