diff --git a/ci_config.json b/ci_config.json index d484797d39..956606c440 100644 --- a/ci_config.json +++ b/ci_config.json @@ -1534,6 +1534,12 @@ ], "fatal_warnings": false }, + "sol2" : { + "_comment": [ + "provided meson.build file is incompatible with WrapDB" + ], + "ignore_upstream_meson": "3.5.0" + }, "sqlpp11": { "_comment": "hard to set up PostgreSQL via choco", "build_on": { diff --git a/releases.json b/releases.json index 099dd342ed..e086c79a20 100644 --- a/releases.json +++ b/releases.json @@ -4298,6 +4298,14 @@ "1.3.2-1" ] }, + "sol2": { + "dependency_names": [ + "sol2" + ], + "versions": [ + "3.5.0-1" + ] + }, "soundtouch": { "dependency_names": [ "soundtouch" diff --git a/subprojects/packagefiles/sol2/meson.build b/subprojects/packagefiles/sol2/meson.build new file mode 100644 index 0000000000..54526fa5f3 --- /dev/null +++ b/subprojects/packagefiles/sol2/meson.build @@ -0,0 +1,28 @@ +# upstream project does, in fact, provides meson.build. However, it uses +# different lua.wrap as dependency and it is incompatible with wrap file +# already in WrapDB. So we provide some simple header-only meson.build +# dependency. It is user responsibility to link everything with appropriate +# Lua + +# Developer note: intstruction on how to update this wrap +# 1. Get new tag from upstream github and add it to sol2.wrap with correct +# sha256 hash and so on. +# 2. Upstream meson.build is unlikely to be compatible. Go to ci_config.json, +# find section for "sol2" and update "ignore_upstream_meson" +# 3. Go to releases.json and add new version to "versions" +# 4. Open sol2.wrap and update source_filename. Remember - source_filename +# is how you want to name downloaded archive. It doesn't have to match +# default name at all. +project( + 'sol2', + 'cpp', + license: 'MIT', + meson_version: '>=0.58', +) + +# Expose standard dependency. Library is header-only +sol2_dep = declare_dependency( + include_directories: include_directories('./include'), +) + +meson.override_dependency('sol2', sol2_dep) diff --git a/subprojects/sol2.wrap b/subprojects/sol2.wrap new file mode 100644 index 0000000000..ce0a60c58e --- /dev/null +++ b/subprojects/sol2.wrap @@ -0,0 +1,9 @@ +[wrap-file] +directory = sol2-3.5.0 +source_url = https://github.com/ThePhD/sol2/archive/refs/tags/v3.5.0.tar.gz +source_filename = sol2-3.5.0.tar.gz +source_hash = 86c0f6d2836b184a250fc2907091c076bf53c9603dd291eaebade36cc342e13c +patch_directory = sol2 + +[provide] +dependency_names = sol2