diff --git a/meson.build b/meson.build index 227f2cce5..e3a982e32 100644 --- a/meson.build +++ b/meson.build @@ -196,14 +196,10 @@ if get_option('plugin_altos') endif if get_option('plugin_uefi') - fwup = dependency('fwup', version : '>= 5') + fwup = dependency('fwup', version : '>= 10') if fwup.version().version_compare('>= 11') conf.set('HAVE_FWUP_GET_ESP_MOUNTPOINT', '1') endif - if fwup.version().version_compare('>= 10') - conf.set('HAVE_FWUP_GET_BGRT_INFO', '1') - conf.set('HAVE_FWUP_CUSTOM_ESP', '1') - endif efivar = dependency('efivar') conf.set_quoted('EFIVAR_LIBRARY_VERSION', efivar.version()) conf.set_quoted('LIBFWUP_LIBRARY_VERSION', fwup.version()) diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c index c635f2885..284949d99 100644 --- a/plugins/uefi/fu-plugin-uefi.c +++ b/plugins/uefi/fu-plugin-uefi.c @@ -306,9 +306,7 @@ fu_plugin_uefi_update_splash (GError **error) fwup_resource *re = NULL; guint best_idx = G_MAXUINT; guint32 lowest_border_pixels = G_MAXUINT; -#ifdef HAVE_FWUP_GET_BGRT_INFO int rc; -#endif guint32 screen_height = 768; guint32 screen_width = 1024; g_autoptr(GBytes) image_bmp = NULL; @@ -329,7 +327,6 @@ fu_plugin_uefi_update_splash (GError **error) }; /* get the boot graphics resource table data */ -#ifdef HAVE_FWUP_GET_BGRT_INFO rc = fwup_get_ux_capsule_info (&screen_width, &screen_height); if (rc < 0) { g_set_error_literal (error, @@ -340,7 +337,6 @@ fu_plugin_uefi_update_splash (GError **error) } g_debug ("BGRT screen size %" G_GUINT32_FORMAT " x%" G_GUINT32_FORMAT, screen_width, screen_height); -#endif /* find the 'best sized' pre-generated image */ for (guint i = 0; sizes[i].width != 0; i++) { @@ -651,9 +647,7 @@ fu_plugin_uefi_set_custom_mountpoint (FuPlugin *plugin, GError **error) return FALSE; } -#ifdef HAVE_FWUP_CUSTOM_ESP fwup_set_esp_mountpoint (data->esp_path); -#endif } return TRUE; }