From 47e528618f785a44fd2f9e7f8850138b300da2a3 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 15 Nov 2024 07:53:11 +0100 Subject: [PATCH] meson: disable some modules only built for desktop on UWP --- modules/access/meson.build | 5 +++-- modules/codec/meson.build | 3 ++- modules/control/meson.build | 2 +- modules/services_discovery/meson.build | 2 +- modules/video_splitter/meson.build | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/access/meson.build b/modules/access/meson.build index 039463e6cf..8cb7f67815 100644 --- a/modules/access/meson.build +++ b/modules/access/meson.build @@ -106,6 +106,7 @@ vlc_modules += { 'dependencies' : [ksuser_lib], 'enabled' : get_option('wasapi') .require(host_system == 'windows', error_message: 'WASAPI requires Windows') + .disable_auto_if(have_win_store) .allowed() and ksuser_lib.found() } @@ -327,7 +328,7 @@ if host_system == 'linux' endif endif -if host_system == 'windows' +if host_system == 'windows' and have_win_desktop strmiids_lib = cc.find_library('strmiids', required: true) vlc_modules += { 'name' : 'dtv', @@ -410,7 +411,7 @@ vlc_modules += { } # Windows UNC -if host_system == 'windows' +if host_system == 'windows' and not have_win_store mpr_lib = cc.find_library('mpr', required: true) netapi32_lib = cc.find_library('netapi32', required: true) diff --git a/modules/codec/meson.build b/modules/codec/meson.build index be7c65183c..7174517729 100644 --- a/modules/codec/meson.build +++ b/modules/codec/meson.build @@ -693,7 +693,8 @@ if host_system == 'windows' ), 'dependencies': [ cc.find_library('uuid'), - ] + ], + 'enabled' : have_win_desktop, } endif diff --git a/modules/control/meson.build b/modules/control/meson.build index 9ef4f96fb8..f0716dedbe 100644 --- a/modules/control/meson.build +++ b/modules/control/meson.build @@ -79,7 +79,7 @@ if dbus_dep.found() } endif -if host_system == 'windows' +if host_system == 'windows' and have_win_desktop # NT service control vlc_modules += { diff --git a/modules/services_discovery/meson.build b/modules/services_discovery/meson.build index ea2687e5b2..b48ece1872 100644 --- a/modules/services_discovery/meson.build +++ b/modules/services_discovery/meson.build @@ -84,7 +84,7 @@ if xcb_dep.found() endif # Windows drive discovery -if host_system == 'windows' +if host_system == 'windows' and have_win_desktop vlc_modules += { 'name' : 'windrive', 'sources' : files('windrive.c') diff --git a/modules/video_splitter/meson.build b/modules/video_splitter/meson.build index 008d12cd68..b15741dd37 100644 --- a/modules/video_splitter/meson.build +++ b/modules/video_splitter/meson.build @@ -16,7 +16,7 @@ if xcb_dep.found() and xcb_randr_dep.found() 'sources' : files('panoramix.c'), 'dependencies' : [xcb_dep, xcb_randr_dep] } -elif host_system == 'windows' +elif host_system == 'windows' and have_win_desktop vlc_modules += { 'name' : 'panoramix', 'sources' : files('panoramix.c')