diff --git a/scripts/base.py b/scripts/base.py index 777b5d1c..ebc8e438 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -685,7 +685,7 @@ def qt_version(): qt_dir = qt_dir.split("/")[-3] return "".join(i for i in qt_dir if (i.isdigit() or i == ".")) -def check_congig_option_with_platfom(platform, option_name): +def check_config_option_with_platfom(platform, option_name): if config.check_option("config", option_name): return True if (0 == platform.find("win")) and config.check_option("config_addon_windows", option_name): diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index ddebcde5..62a86b19 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -162,7 +162,7 @@ def make(): base.qt_copy_plugin("platformthemes", root_dir) base.qt_copy_plugin("xcbglintegrations", root_dir) - if not base.check_congig_option_with_platfom(platform, "libvlc"): + if not base.check_config_option_with_platfom(platform, "libvlc"): base.qt_copy_lib("Qt5Multimedia", root_dir) base.qt_copy_lib("Qt5MultimediaWidgets", root_dir) base.qt_copy_plugin("mediaservice", root_dir) @@ -175,7 +175,7 @@ def make(): base.qt_copy_lib("Qt5X11Extras", root_dir) base.qt_copy_lib("Qt5XcbQpa", root_dir) base.qt_copy_icu(root_dir) - if not base.check_congig_option_with_platfom(platform, "libvlc"): + if not base.check_config_option_with_platfom(platform, "libvlc"): base.copy_files(base.get_env("QT_DEPLOY") + "/../lib/libqgsttools_p.so*", root_dir) if (0 == platform.find("win")): @@ -187,7 +187,7 @@ def make(): elif (0 == platform.find("linux")): base.copy_file(git_dir + "/desktop-apps/win-linux/" + apps_postfix + "/DesktopEditors", root_dir + "/DesktopEditors") - if base.check_congig_option_with_platfom(platform, "libvlc"): + if base.check_config_option_with_platfom(platform, "libvlc"): vlc_dir = git_dir + "/core/Common/3dParty/libvlc/build/" + platform + "/lib" if (0 == platform.find("win")): @@ -195,14 +195,19 @@ def make(): base.copy_files(vlc_dir + "/*.dll", root_dir) base.copy_file(vlc_dir + "/vlc-cache-gen.exe", root_dir + "/vlc-cache-gen.exe") elif (0 == platform.find("linux")): - base.copy_dir(vlc_dir + "/vlc/plugins", root_dir + "/plugins") - base.copy_file(vlc_dir + "/vlc/libcompat.a", root_dir + "/libcompat.a") - copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_pulse.so", "0.0.0") - copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_vdpau.so", "0.0.0") - copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_xcb_events.so", "0.0.0") + base.copy_dir(vlc_dir + "/vlc/plugins", root_dir + "/vlc/plugins") + copy_lib_with_links(vlc_dir + "/vlc", root_dir + "/vlc", "libvlc_pulse.so", "0.0.0") + copy_lib_with_links(vlc_dir + "/vlc", root_dir + "/vlc", "libvlc_vdpau.so", "0.0.0") + copy_lib_with_links(vlc_dir + "/vlc", root_dir + "/vlc", "libvlc_xcb_events.so", "0.0.0") copy_lib_with_links(vlc_dir, root_dir, "libvlc.so", "5.6.1") copy_lib_with_links(vlc_dir, root_dir, "libvlccore.so", "9.0.1") - base.copy_file(vlc_dir + "/vlc/vlc-cache-gen", root_dir + "/vlc-cache-gen") + base.copy_file(vlc_dir + "/vlc/vlc-cache-gen", root_dir + "/vlc/vlc-cache-gen") + # copy libva libs + copy_lib_with_links(vlc_dir, root_dir, "libva.so", "2.2100.0") + copy_lib_with_links(vlc_dir, root_dir, "libva-drm.so", "2.2100.0") + copy_lib_with_links(vlc_dir, root_dir, "libva-glx.so", "2.2100.0") + copy_lib_with_links(vlc_dir, root_dir, "libva-wayland.so", "2.2100.0") + copy_lib_with_links(vlc_dir, root_dir, "libva-x11.so", "2.2100.0") if isWindowsXP: base.copy_lib(build_libraries_path + "/mediaplayer/xp", root_dir, "videoplayer")