Skip to content

Commit

Permalink
layer: Relax Meson requirement from 1.1 to 1.0
Browse files Browse the repository at this point in the history
Meson 1.0 is an interesting target because it's the version provided by
the Debian 12 stable release, and by Valve's Steam Runtime (version 2 and
up), therefore indirectly by Proton. The only obvious use of a Meson 1.1
feature in `layer/` is the `meson.options` name, which is easily avoided.

In particular, the layer can be successfully compiled in the
Steam Runtime 3 'sniper' SDK container[1], using its backport of gcc 14:

    $ sudo vi /etc/apt/sources.list    # add the sniper_beta suite
    $ sudo apt install gcc-14-monolithic
    $ CC=gcc-14 CXX=g++-14 meson setup _build-sniper
    $ meson compile -C _build-sniper

[1] https://gitlab.steamos.cloud/steamrt/sniper/sdk

Signed-off-by: Simon McVittie <[email protected]>
  • Loading branch information
smcv authored and jp7677 committed Jan 27, 2025
1 parent d6e11b5 commit 430c503
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ When available, DXVK-NVAPI uses NVIDIA's NVML management library to query temper

Like DXVK, this library is being built as a Windows DLL using MinGW. DXVK-NVAPI requires MinGW-w64 compiler and headers version 9 or newer, the Meson build system at least version 0.58 and Python 3 (needed for a prebuild validation script). This project uses git submodules. Ensure to fetch the submodules while or after cloning the repository, e.g. with `git clone --recurse-submodules [email protected]:jp7677/dxvk-nvapi.git`.

The Vulkan Reflex layer has higher requirements: Meson 1.1 and a C++ compiler that supports C++20 standard. It is recommended (and assumed) that the layer is built as Linux-side library, and as such this compiler should target Linux and not be a cross-compiler like MinGW.
The Vulkan Reflex layer has higher requirements: Meson 1.0 and a C++ compiler that supports C++20 standard. It is recommended (and assumed) that the layer is built as Linux-side library, and as such this compiler should target Linux and not be a cross-compiler like MinGW.

Run:

Expand Down
4 changes: 2 additions & 2 deletions layer/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
['cpp'],
default_options: ['cpp_std=c++20'],
version: 'v0.8.0',
meson_version: '>= 1.1',
meson_version: '>= 1.0',
)

version = vcs_tag(
Expand Down Expand Up @@ -46,4 +46,4 @@ configure_file(
output: 'VkLayer_DXVK_NVAPI_reflex.json',
install: true,
install_dir: get_option('manifest_install_dir'),
)
)
File renamed without changes.

0 comments on commit 430c503

Please sign in to comment.