diff --git a/CHANGELOG.md b/CHANGELOG.md index 7669de56..0050c8a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Fixed + +- Configuring the Meson build now works correctly on Wine 8.0 final. Meson's + version comparison function considers `8.0` to be a lower version than + `8.0rc2`. + ## [5.0.3] - 2022-12-23 ### Changed diff --git a/meson.build b/meson.build index 996b3d6c..87679f76 100644 --- a/meson.build +++ b/meson.build @@ -175,8 +175,11 @@ if wine_version.returncode() == 0 # yabridge builds. If anyone's reading this because you ran into the error # below, either build with Wine 8.0-rc2+, or stick with yabridge 5.0.2 if # you're stuck with Wine 7.22. + # NOTE: Meson considers 8.0 to be below 8.0rc2, so this third check is also + # needed if wine_version.version_compare('>=7.21') and \ - wine_version.version_compare('<8.0rc2') + wine_version.version_compare('<8.0rc2') and \ + wine_version.version_compare('!=8.0') error('Building this version of yabridge against Wine ' + wine_version + 'would result in nonfunctional binaries. Either build yabridge 5.0.2 ' + 'with Wine 7.22, or switch to Wine 8.0-rc2+. Yabridge built with 8.0-rc2+ ' +