diff --git a/subprojects/packagefiles/wine-9.0/include/meson.build b/subprojects/packagefiles/wine-10.0/include/meson.build similarity index 100% rename from subprojects/packagefiles/wine-9.0/include/meson.build rename to subprojects/packagefiles/wine-10.0/include/meson.build diff --git a/subprojects/packagefiles/wine-9.0/meson.build b/subprojects/packagefiles/wine-10.0/meson.build similarity index 69% rename from subprojects/packagefiles/wine-9.0/meson.build rename to subprojects/packagefiles/wine-10.0/meson.build index 050957d..b7f20b7 100644 --- a/subprojects/packagefiles/wine-9.0/meson.build +++ b/subprojects/packagefiles/wine-10.0/meson.build @@ -1,5 +1,5 @@ project('wine', 'c', - version: '9.0', + version: '10.0', default_options: ['warning_level=1']) bison = find_program('bison', native: true, @@ -14,3 +14,10 @@ if has_widl endif subdir('include') + +if has_widl + static_library('wine_test', + 'test.c', + dependencies: headers_dep, + build_by_default: false) +endif diff --git a/subprojects/packagefiles/wine-9.0/meson_options.txt b/subprojects/packagefiles/wine-10.0/meson_options.txt similarity index 53% rename from subprojects/packagefiles/wine-9.0/meson_options.txt rename to subprojects/packagefiles/wine-10.0/meson_options.txt index 9c4804b..809ad2c 100644 --- a/subprojects/packagefiles/wine-9.0/meson_options.txt +++ b/subprojects/packagefiles/wine-10.0/meson_options.txt @@ -1 +1,2 @@ option('with_widl', type: 'feature') +option('test', type: 'boolean') diff --git a/subprojects/packagefiles/wine-10.0/test.c b/subprojects/packagefiles/wine-10.0/test.c new file mode 100644 index 0000000..81d905a --- /dev/null +++ b/subprojects/packagefiles/wine-10.0/test.c @@ -0,0 +1 @@ +#include "windows.h" diff --git a/subprojects/packagefiles/wine-9.0/tools/widl/meson.build b/subprojects/packagefiles/wine-10.0/tools/widl/meson.build similarity index 91% rename from subprojects/packagefiles/wine-9.0/tools/widl/meson.build rename to subprojects/packagefiles/wine-10.0/tools/widl/meson.build index 3b0a756..e3463a0 100644 --- a/subprojects/packagefiles/wine-9.0/tools/widl/meson.build +++ b/subprojects/packagefiles/wine-10.0/tools/widl/meson.build @@ -11,9 +11,7 @@ config = configure_file( '__WINE_CONFIG_H': true, 'PACKAGE_VERSION': '"' + meson.project_version() + '"', 'INCLUDEDIR': '"/usr/include"', - 'DLLDIR': '"/usr/lib/wine"', - 'BIN_TO_INCLUDEDIR': '"../include"', - 'BIN_TO_DLLDIR': '"../lib/wine"' + 'LIBDIR': '"/usr/lib"' }) widl = executable('widl', @@ -31,6 +29,7 @@ widl = executable('widl', 'utils.c', 'widl.c', 'write_msft.c', + 'write_sltg.c', '../wrc/wpp.c', bison_gen.process('parser.y', '../wrc/ppy.y'), flex_gen.process('parser.l', '../wrc/ppl.l'), diff --git a/subprojects/wine.wrap b/subprojects/wine.wrap index eedd38d..69d15d3 100644 --- a/subprojects/wine.wrap +++ b/subprojects/wine.wrap @@ -1,7 +1,7 @@ [wrap-file] -directory = wine-9.0 -patch_directory = wine-9.0 +directory = wine-10.0 +patch_directory = wine-10.0 -source_filename = wine-9.0.tar.xz -source_url = https://dl.winehq.org/wine/source/9.0/wine-9.0.tar.xz -source_hash = 7cfd090a5395f5b76d95bb5defac8a312c8de4c070c1163b8b58da38330ca6ee +source_filename = wine-10.0.tar.xz +source_url = https://dl.winehq.org/wine/source/10.0/wine-10.0.tar.xz +source_hash = c5e0b3f5f7efafb30e9cd4d9c624b85c583171d33549d933cd3402f341ac3601