diff --git a/src/util/rust/meson.build b/src/util/rust/meson.build index e8cb269c142..8a737def019 100644 --- a/src/util/rust/meson.build +++ b/src/util/rust/meson.build @@ -25,14 +25,7 @@ dep_zerocopy = dependency('zerocopy', required: true, ) -dep_zerocopy_derive = dependency('zerocopy-derive', - version: '>= 0.8.13', - fallback: ['zerocopy-derive-0.8-rs', 'dep_zerocopy_derive'], - required: true, -) - -dep_mesa3d_util = [dep_cfg_if, dep_thiserror, dep_remain, dep_zerocopy, - dep_zerocopy_derive] +dep_mesa3d_util = [dep_cfg_if, dep_thiserror, dep_remain, dep_zerocopy] supported_systems = ['linux', 'windows', 'darwin', 'macos'] supported_host_machine = host_machine.system() in supported_systems @@ -44,19 +37,7 @@ if supported_host_machine required: true, ) - dep_bitflags = dependency('bitflags', - version: '>= 2.6.0', - fallback: ['bitflags-2-rs', 'dep_bitflags'], - required: true, - ) - - dep_errno = dependency('errno', - version: '>= 0.3.8', - fallback: ['errno-0.3-rs', 'dep_errno'], - required: true, - ) - - dep_mesa3d_util += [dep_rustix, dep_bitflags, dep_errno] + dep_mesa3d_util += [dep_rustix] endif libmesa_rust_util = static_library( diff --git a/subprojects/packagefiles/thiserror-2-rs/meson.build b/subprojects/packagefiles/thiserror-2-rs/meson.build index 8740bbf2243..d49ecd5ee7b 100644 --- a/subprojects/packagefiles/thiserror-2-rs/meson.build +++ b/subprojects/packagefiles/thiserror-2-rs/meson.build @@ -22,5 +22,5 @@ lib = static_library( ) dep_thiserror = declare_dependency( - link_with : [lib] + link_with : [lib, thiserror_impl] ) diff --git a/subprojects/packagefiles/zerocopy-0.8-rs/meson.build b/subprojects/packagefiles/zerocopy-0.8-rs/meson.build index db76c755456..2539336e3e5 100644 --- a/subprojects/packagefiles/zerocopy-0.8-rs/meson.build +++ b/subprojects/packagefiles/zerocopy-0.8-rs/meson.build @@ -21,5 +21,5 @@ lib = static_library( ) dep_zerocopy = declare_dependency( - link_with : [lib] + link_with : [lib, zerocopy_derive] )