Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / spirv-headers
Commits:
-
0412459a
by Timo Aaltonen at 2022-04-07T14:56:45+03:00
-
0cae9101
by Timo Aaltonen at 2022-04-07T14:57:40+03:00
-
009d3b2b
by Timo Aaltonen at 2022-04-07T22:00:43+03:00
-
55b8de6c
by Timo Aaltonen at 2022-04-07T22:01:16+03:00
6 changed files:
- debian/changelog
- debian/patches/series
- + debian/patches/use-arch-independent.diff
- debian/rules
- debian/source/format
- debian/spirv-headers.install
Changes:
| 1 | +spirv-headers (1.6.1+1.3.204.0-4) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * use-arch-independent.diff: Create arch-independent cmake files.
|
|
| 4 | + Thanks, Andrea Pappacoda!
|
|
| 5 | + * Install cmake files again.
|
|
| 6 | + * source: Bump format to 3.0 (quilt).
|
|
| 7 | + |
|
| 8 | + -- Timo Aaltonen <tjaalton@debian.org> Thu, 07 Apr 2022 22:01:04 +0300
|
|
| 9 | + |
|
| 1 | 10 | spirv-headers (1.6.1+1.3.204.0-3) unstable; urgency=medium
|
| 2 | 11 | |
| 3 | 12 | * Drop cmake files, they are not arch-independent, and apparently
|
| 1 | -#placeholder |
|
| 1 | +use-arch-independent.diff |
| 1 | +--- a/CMakeLists.txt
|
|
| 2 | ++++ b/CMakeLists.txt
|
|
| 3 | +@@ -89,9 +89,14 @@ if (SPIRV_HEADERS_ENABLE_INSTALL)
|
|
| 4 | + set(namespace "${PROJECT_NAME}::")
|
|
| 5 | +
|
|
| 6 | + include(CMakePackageConfigHelpers)
|
|
| 7 | ++
|
|
| 8 | ++ if (NOT CMAKE_VERSION VERSION_LESS 3.14)
|
|
| 9 | ++ set(arch_independent_str ARCH_INDEPENDENT)
|
|
| 10 | ++ endif()
|
|
| 11 | + write_basic_package_version_file(
|
|
| 12 | + "${version_config}"
|
|
| 13 | + COMPATIBILITY SameMajorVersion
|
|
| 14 | ++ ${arch_independent_str}
|
|
| 15 | + )
|
|
| 16 | +
|
|
| 17 | + configure_package_config_file( |
| ... | ... | @@ -9,12 +9,6 @@ include /usr/share/dpkg/pkg-info.mk |
| 9 | 9 | override_dh_auto_install:
|
| 10 | 10 | dh_auto_install --destdir=debian/tmp
|
| 11 | 11 | |
| 12 | -override_dh_install:
|
|
| 13 | - # these are not arch-independent
|
|
| 14 | - rm -rf debian/tmp/usr/share/cmake
|
|
| 15 | - |
|
| 16 | - dh_install
|
|
| 17 | - |
|
| 18 | 12 | gentarball:
|
| 19 | 13 | git archive --format=tar upstream-unstable --prefix=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/ | \
|
| 20 | 14 | gzip -9 > \
|
| 1 | -1.0 |
|
| 1 | +3.0 (quilt) |
| 1 | 1 | usr/include
|
| 2 | +usr/share/cmake
|
|
| 2 | 3 | usr/share/pkgconfig |