Merge branch 'master' into custom-client-no-rebuild

2026-09-19 19:01:05 +03:00 · 2026-09-02 13:46:42 +08:00
parent 8f4eb3a2b9 f28ac38ccf
commit 7192f8230e
236 changed files with 14237 additions and 9328 deletions
--- a/res/PKGBUILD
+++ b/res/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=rustdesk
-pkgver=1.4.9
+pkgver=1.5.0
 pkgrel=0
 epoch=
 pkgdesc=""
@@ -7,7 +7,7 @@ arch=('x86_64')
 url=""
 license=('AGPL-3.0')
 groups=()
-depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire')
+depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libappindicator-gtk3' 'gst-plugins-base' 'gst-plugin-pipewire')
 makedepends=()
 checkdepends=()
 optdepends=()
--- a/res/msi/Package/Components/Regs.wxs
+++ b/res/msi/Package/Components/Regs.wxs
@@ -5,6 +5,23 @@
 	<Fragment>
 		<!-- Regs for shortcuts are defined in "Fragments/ShortcutProperties.wxs" -->
 		<!-- Component that persists the property values to the registry so they are available during an upgrade/modify -->
+		<Property Id="CURRENT_SHARE_RDP" Secure="yes">
+			<RegistrySearch Id="CurrentShareRdpSearch" Root="HKLM" Key="Software\$(var.Product)\InstallState\$(var.Product)" Name="share_rdp" Type="raw" />
+		</Property>
+		<Property Id="LEGACY_SHARE_RDP" Secure="yes">
+			<RegistrySearch Id="LegacyShareRdpSearch" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Name="share_rdp" Type="raw" Bitness="always64" />
+		</Property>
+		<Property Id="LEGACY_SHARE_RDP32" Secure="yes">
+			<RegistrySearch Id="LegacyShareRdp32Search" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Name="share_rdp" Type="raw" Bitness="always32" />
+		</Property>
+		<Property Id="APP_WINDOWS_INSTALLER32" Secure="yes">
+			<RegistrySearch Id="AppWindowsInstaller32Search" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Name="WindowsInstaller" Type="raw" Bitness="always32" />
+		</Property>
+		<Property Id="SHARE_RDP" Secure="yes" />
+		<SetProperty Action="SetShareRdpFromCurrentState" Id="SHARE_RDP" Value="[CURRENT_SHARE_RDP]" After="AppSearch" Sequence="first" Condition="CURRENT_SHARE_RDP" />
+		<SetProperty Action="SetShareRdpFromLegacyState" Id="SHARE_RDP" Value="[LEGACY_SHARE_RDP]" After="SetShareRdpFromCurrentState" Sequence="first" Condition="NOT CURRENT_SHARE_RDP AND LEGACY_SHARE_RDP" />
+		<SetProperty Action="SetShareRdpFromLegacyState32" Id="SHARE_RDP" Value="[LEGACY_SHARE_RDP32]" After="SetShareRdpFromLegacyState" Sequence="first" Condition="NOT CURRENT_SHARE_RDP AND NOT LEGACY_SHARE_RDP AND LEGACY_SHARE_RDP32" />
+
 		<DirectoryRef Id="INSTALLFOLDER_INNER">
 			<Component Id="Product.Registry.InstallFolder" Guid="3196EDA7-9AEF-4705-A0C8-E3F3ECCCB153">
 				<RegistryKey Root="HKCR" Key="$(var.RegKeyRoot)">
@@ -40,17 +57,29 @@
 				</RegistryKey>
 			</Component>

-			<!--For compatibility with registry values from previous versions-->
-			<Component Id="Product.Registry.UninstallApp" Guid="FC1A3D2E-5642-FBD8-CFA6-5ECAC6DE69A8">
-				<RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" >
+			<Component Id="Product.Registry.InstallState" Guid="E310003A-C292-4851-AE20-7A9B186060CE">
+				<RegistryKey Root="HKLM" Key="Software\$(var.Product)\InstallState\$(var.Product)" ForceDeleteOnUninstall="yes">
 					<RegistryValue Type="string" Name="BuildDate" Value="$(var.BuildDate)" />
-					<RegistryValue Type="string" Name="share_rdp" Value="" />
-
-					<!--$ArpStart$-->
-					<!--$ArpEnd$-->
+					<RegistryValue Type="string" Name="share_rdp" Value="[SHARE_RDP]" />
+					<RegistryValue Type="string" Name="InstallLocation" Value="[INSTALLFOLDER_INNER]" />
+					<RegistryValue Type="integer" Name="WindowsInstaller" Value="1" />
+					<RegistryValue Type="string" Name="MsiProductCode" Value="[ProductCode]" KeyPath="yes" />
+					<!--$InstallStateStart$-->
+					<!--$InstallStateEnd$-->
 				</RegistryKey>
 			</Component>
+
 		</DirectoryRef>

+		<StandardDirectory Id="CommonAppDataFolder">
+			<Component Id="Product.Registry.RemoveLegacyUninstall64" Guid="7524B741-94C2-4C50-A151-DDB37860DC20" Bitness="always64" KeyPath="yes" Condition="APP_WINDOWS_INSTALLER=&quot;#1&quot;">
+				<RemoveRegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Action="removeOnInstall" />
+			</Component>
+
+			<Component Id="Product.Registry.RemoveLegacyUninstall32" Guid="CB50B9AA-B83A-4AC2-BB27-81358F0E74E6" Bitness="always32" KeyPath="yes" Condition="APP_WINDOWS_INSTALLER32=&quot;#1&quot;">
+				<RemoveRegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Action="removeOnInstall" />
+			</Component>
+		</StandardDirectory>
+
 	</Fragment>
 </Wix>
--- a/res/msi/Package/Fragments/AddRemoveProperties.wxs
+++ b/res/msi/Package/Fragments/AddRemoveProperties.wxs
@@ -27,10 +27,12 @@
 		<!--$ArpStart$-->
 		<!--$ArpEnd$-->

+		<SetProperty Action="SetArpInstallLocation" Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER_INNER]" After="CostFinalize" Sequence="execute" />
+
 		<!--$CustomClientPropsStart$-->
 		<!--$CustomClientPropsEnd$-->

-		<Property Id="APP_WINDOWS_INSTALLER">
+		<Property Id="APP_WINDOWS_INSTALLER" Secure="yes">
 			<RegistrySearch Id="AppWindowsInstallerFolderSearch" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Product)" Name="WindowsInstaller" Type="raw" />
 		</Property>
 	</Fragment>
--- a/res/msi/Package/Language/Package.en-us.wxl
+++ b/res/msi/Package/Language/Package.en-us.wxl
@@ -21,8 +21,6 @@ This file contains the declaration of all the localizable strings.
 	<!-- Client related strings -->
 	<String Id="F_Client" Value="Client" />
 	<String Id="F_Client_Desc" Value="The user interface. Plays media files." />
-	<String Id="F_Client_Plugins" Value="Plugins" />
-	<String Id="F_Client_Plugins_Desc" Value="Plugins for the client." />
 	<String Id="F_LAVFilters" Value="LAV Filters" />
 	<String Id="F_LAVFilters_Desc" Value="Recommended directshow filters for best audio and video playback experience." />

@@ -35,8 +33,6 @@ This file contains the declaration of all the localizable strings.
 	<!-- Server related strings -->
 	<String Id="F_Server" Value="Server" />
 	<String Id="F_Server_Desc" Value="The server part of RustDesk. Provides the MediaLibrary and other services." />
-	<String Id="F_Server_Plugins" Value="Plugins" />
-	<String Id="F_Server_Plugins_Desc" Value="Plugins for the server." />

 	<String Id="Service_DisplayName" Value="RustDesk Service" />
 	<String Id="Service_Description" Value="This service runs the RustDesk Server." />
--- a/res/msi/Package/Package.wxs
+++ b/res/msi/Package/Package.wxs
@@ -20,6 +20,7 @@
 		     msi is built without template mode and keeps a single cabinet. -->
 		<!--$Media2End$-->
 		<Icon Id="AppIcon" SourceFile="Resources\icon.ico" />
+		<CustomAction Id="BlockSelfInstalledApp" Error="!(loc.AnotherAppDialogDescription)" />

 		<!-- User Interface -->
 		<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
@@ -28,10 +29,11 @@
 		<UIRef Id="WixUI_ErrorProgressText" />

 		<InstallUISequence>
-			<Show Dialog="UI_AnotherAppDialog" Before="WelcomeDlg" Condition="Not installed AND APP_WINDOWS_INSTALLER=&quot;#0&quot;"/>
+			<Show Dialog="UI_AnotherAppDialog" Before="WelcomeDlg" Condition="NOT Installed AND (APP_WINDOWS_INSTALLER=&quot;#0&quot; OR APP_WINDOWS_INSTALLER32=&quot;#0&quot;)"/>
 		</InstallUISequence>

 		<InstallExecuteSequence>
+			<Custom Action="BlockSelfInstalledApp" After="AppSearch" Condition="NOT Installed AND (APP_WINDOWS_INSTALLER=&quot;#0&quot; OR APP_WINDOWS_INSTALLER32=&quot;#0&quot;)" />
 			<InstallExecute After="RemoveExistingProducts" />

 			<!--Only do InstallValidate if is not Uninstall-->
@@ -51,7 +53,9 @@
 			<ComponentRef Id="Product.Registry.CommandPlay" />
 			<ComponentRef Id="Product.Registry.URLProtocol" />
 			<ComponentRef Id="Product.Registry.Command" />
-			<ComponentRef Id="Product.Registry.UninstallApp" />
+			<ComponentRef Id="Product.Registry.InstallState" />
+			<ComponentRef Id="Product.Registry.RemoveLegacyUninstall64" />
+			<ComponentRef Id="Product.Registry.RemoveLegacyUninstall32" />
 			<ComponentRef Id="App.StartMenu" />
 			<ComponentRef Id="Product.Registry.PersistedStartMenuShortcutProperties1" />
 			<ComponentRef Id="Product.Registry.PersistedStartMenuShortcutProperties0" />
--- a/res/msi/preprocess.py
+++ b/res/msi/preprocess.py
@@ -11,6 +11,7 @@ import re
 import platform
 from pathlib import Path
 import shutil
+from xml.sax.saxutils import quoteattr

 g_indent_unit = "\t"
 g_version = ""
@@ -53,14 +54,14 @@ def make_parser():
    parser.add_argument(
        "--arp",
        action="store_true",
-        help="Is ARPSYSTEMCOMPONENT",
+        help="Deprecated; native MSI ARP registration is always used.",
        default=False,
    )
    parser.add_argument(
        "--custom-arp",
        type=str,
        default="{}",
-        help='Custom arp properties, e.g. \'["Comments": {"msi": "ARPCOMMENTS", "v": "Remote control application."}]\'',
+        help='Custom arp properties, e.g. \'{"Comments": {"msi": "ARPCOMMENTS", "v": "Remote control application."}}\'',
    )
    parser.add_argument(
        "-c", "--custom", action="store_true", help="Is custom client", default=False
@@ -336,25 +337,19 @@ def gen_custom_dialog_bitmaps():
    )


-def gen_custom_ARPSYSTEMCOMPONENT_False(args):
+def gen_native_arp_properties():
    def func(lines, index_start):
        indent = g_indent_unit * 2

        lines_new = []
-        lines_new.append(
-            f"{indent}<!--https://learn.microsoft.com/en-us/windows/win32/msi/arpsystemcomponent?redirectedfrom=MSDN-->\n"
-        )
-        lines_new.append(
-            f'{indent}<!--<Property Id="ARPSYSTEMCOMPONENT" Value="1" />-->\n\n'
-        )
-
        lines_new.append(
            f"{indent}<!--https://learn.microsoft.com/en-us/windows/win32/msi/property-reference-->\n"
        )
        for _, v in g_arpsystemcomponent.items():
            if "msi" in v and "v" in v:
                lines_new.append(
-                    f'{indent}<Property Id="{v["msi"]}" Value="{v["v"]}" />\n'
+                    f'{indent}<Property Id={quoteattr(str(v["msi"]))} '
+                    f'Value={quoteattr(str(v["v"]))} />\n'
                )

        for i, line in enumerate(lines_new):
@@ -369,94 +364,16 @@ def gen_custom_ARPSYSTEMCOMPONENT_False(args):
    )


-def get_folder_size(folder_path):
-    total_size = 0
-
-    folder = Path(folder_path)
-    for file in folder.glob("**/*"):
-        if file.is_file():
-            total_size += file.stat().st_size
-
-    return total_size
-
-
-def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir):
+def gen_install_state_values():
    def func(lines, index_start):
        indent = g_indent_unit * 5
-
        lines_new = []
-        lines_new.append(
-            f"{indent}<!--https://learn.microsoft.com/en-us/windows/win32/msi/property-reference-->\n"
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="DisplayName" Value="{args.app_name}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="DisplayIcon" Value="[INSTALLFOLDER_INNER]{args.app_name}.exe" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="DisplayVersion" Value="{g_version}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="Publisher" Value="{args.manufacturer}" />\n'
-        )
-        installDate = datetime.datetime.now().strftime("%Y%m%d")
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="InstallDate" Value="{installDate}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="InstallLocation" Value="[INSTALLFOLDER_INNER]" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="InstallSource" Value="[InstallSource]" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="Language" Value="[ProductLanguage]" />\n'
-        )
-
-        # EstimatedSize in uninstall registry must be in KB.
-        estimated_size_bytes = get_folder_size(dist_dir)
-        estimated_size = max(1, (estimated_size_bytes + 1023) // 1024)
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="EstimatedSize" Value="{estimated_size}" />\n'
-        )
-
-        lines_new.append(
-            f'{indent}<RegistryValue Type="expandable" Name="ModifyPath" Value="MsiExec.exe /X [ProductCode]" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Id="NoModify" Value="1" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="expandable" Name="UninstallString" Value="MsiExec.exe /X [ProductCode]" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="expandable" Name="QuietUninstallString" Value="MsiExec.exe /qn /X [ProductCode]" />\n'
-        )
-
-        vs = g_version.split(".")
-        major, minor, build = vs[0], vs[1], vs[2]
-        lines_new.append(
-            f'{indent}<RegistryValue Type="string" Name="Version" Value="{g_version}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="VersionMajor" Value="{major}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="VersionMinor" Value="{minor}" />\n'
-        )
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="VersionBuild" Value="{build}" />\n'
-        )
-
-        lines_new.append(
-            f'{indent}<RegistryValue Type="integer" Name="WindowsInstaller" Value="1" />\n'
-        )
-        for k, v in g_arpsystemcomponent.items():
-            if "v" in v:
-                t = v["t"] if "t" in v is None else "string"
+        for name, value in g_arpsystemcomponent.items():
+            if "msi" not in value and "v" in value:
+                value_type = value.get("t", "string")
                lines_new.append(
-                    f'{indent}<RegistryValue Type="{t}" Name="{k}" Value="{v["v"]}" />\n'
+                    f'{indent}<RegistryValue Type={quoteattr(str(value_type))} '
+                    f'Name={quoteattr(str(name))} Value={quoteattr(str(value["v"]))} />\n'
                )

        for i, line in enumerate(lines_new):
@@ -465,24 +382,35 @@ def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir):

    return gen_content_between_tags(
        "Package/Components/Regs.wxs",
-        "<!--$ArpStart$-->",
-        "<!--$ArpEnd$-->",
+        "<!--$InstallStateStart$-->",
+        "<!--$InstallStateEnd$-->",
        func,
    )


-def gen_custom_ARPSYSTEMCOMPONENT(args, dist_dir):
+def gen_custom_ARPSYSTEMCOMPONENT(args, _dist_dir):
    try:
-        custom_arp = json.loads(args.custom_arp)
-        g_arpsystemcomponent.update(custom_arp)
-    except json.JSONDecodeError as e:
+        custom_arp = dict(json.loads(args.custom_arp))
+    except (json.JSONDecodeError, TypeError, ValueError) as e:
        print(f"Failed to decode custom arp: {e}")
        return False

-    if args.arp:
-        return gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir)
-    else:
-        return gen_custom_ARPSYSTEMCOMPONENT_False(args)
+    if any(not isinstance(value, dict) for value in custom_arp.values()):
+        print("Custom arp entries must be objects.")
+        return False
+
+    if any(
+        isinstance(value, dict) and value.get("msi") == "ARPSYSTEMCOMPONENT"
+        for value in custom_arp.values()
+    ):
+        print("ARPSYSTEMCOMPONENT is not allowed; native MSI ARP registration must remain visible.")
+        return False
+
+    g_arpsystemcomponent.update(custom_arp)
+
+    if not gen_native_arp_properties():
+        return False
+    return gen_install_state_values()

 def gen_conn_type(args):
    def func(lines, index_start):
--- a/res/pam.d/rustdesk.debian
+++ b/res/pam.d/rustdesk.debian
@@ -1,5 +0,0 @@
-#%PAM-1.0
-@include common-auth
-@include common-account
-@include common-session
-@include common-password
--- a/res/pam.d/rustdesk.suse
+++ b/res/pam.d/rustdesk.suse
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth        include     common-auth
-account     include     common-account
-session     include     common-session
-password    include     common-password
--- a/res/rpm-flutter-suse.spec
+++ b/res/rpm-flutter-suse.spec
@@ -1,11 +1,11 @@
 Name:       rustdesk
-Version:    1.4.9
+Version:    1.5.0
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
 URL:        https://rustdesk.com
 Vendor:     rustdesk <info@rustdesk.com>
-Requires:   gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire
+Requires:   gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 gstreamer-plugins-base gstreamer-plugin-pipewire
 Recommends: libayatana-appindicator3-1 xdotool
 Provides:   libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libfile_selector_linux_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit)

--- a/res/rpm-flutter.spec
+++ b/res/rpm-flutter.spec
@@ -1,11 +1,11 @@
 Name:       rustdesk
-Version:    1.4.9
+Version:    1.5.0
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
 URL:        https://rustdesk.com
 Vendor:     rustdesk <info@rustdesk.com>
-Requires:   gtk3 libxcb libXfixes alsa-lib libva pam gstreamer1-plugins-base
+Requires:   gtk3 libxcb libXfixes alsa-lib libva gstreamer1-plugins-base
 Recommends: libayatana-appindicator-gtk3 libxdo
 Provides:   libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libfile_selector_linux_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit)

--- a/res/rpm-suse.spec
+++ b/res/rpm-suse.spec
@@ -3,7 +3,7 @@ Version:    1.1.9
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
-Requires:   gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire
+Requires:   gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 gstreamer-plugins-base gstreamer-plugin-pipewire
 Recommends: libayatana-appindicator3-1 xdotool

 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/
--- a/res/rpm.spec
+++ b/res/rpm.spec
@@ -1,11 +1,11 @@
 Name:       rustdesk
-Version:    1.4.9
+Version:    1.5.0
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
 URL:        https://rustdesk.com
 Vendor:     rustdesk <info@rustdesk.com>
-Requires:   gtk3 libxcb libXfixes alsa-lib libva2 pam gstreamer1-plugins-base
+Requires:   gtk3 libxcb libXfixes alsa-lib libva2 gstreamer1-plugins-base
 Recommends: libayatana-appindicator-gtk3 libxdo

 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/
--- a/res/startwm.sh
+++ b/res/startwm.sh
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is derived from https://github.com/neutrinolabs/xrdp/sesman/startwm.sh.
-
-#
-# This script is an example. You might need to edit this script
-# depending on your distro if it doesn't work for you.
-#
-# Uncomment the following line for debug:
-# exec xterm
-
-
-# Execution sequence for interactive login shell - pseudocode
-#
-# IF /etc/profile is readable THEN
-#     execute ~/.bash_profile
-# END IF
-# IF ~/.bash_profile is readable THEN
-#     execute ~/.bash_profile
-# ELSE
-#     IF ~/.bash_login is readable THEN
-#         execute ~/.bash_login
-#     ELSE
-#         IF ~/.profile is readable THEN
-#             execute ~/.profile
-#         END IF
-#     END IF
-# END IF
-pre_start()
-{
-  if [ -r /etc/profile ]; then
-    . /etc/profile
-  fi
-  if [ -r ~/.bash_profile ]; then
-    . ~/.bash_profile
-  else
-    if [ -r ~/.bash_login ]; then
-      . ~/.bash_login
-    else
-      if [ -r ~/.profile ]; then
-        . ~/.profile
-      fi
-    fi
-  fi
-  return 0
-}
-
-# When logging out from the interactive shell, the execution sequence is:
-#
-# IF ~/.bash_logout exists THEN
-#     execute ~/.bash_logout
-# END IF
-post_start()
-{
-  if [ -r ~/.bash_logout ]; then
-    . ~/.bash_logout
-  fi
-  return 0
-}
-
-#start the window manager
-wm_start()
-{
-  if [ -r /etc/default/locale ]; then
-    . /etc/default/locale
-    export LANG LANGUAGE
-  fi
-
-  # debian
-  if [ -r /etc/X11/Xsession ]; then
-    pre_start
-    . /etc/X11/Xsession
-    post_start
-    exit 0
-  fi
-
-  # alpine
-  # Don't use /etc/X11/xinit/Xsession - it doesn't work
-  if [ -f /etc/alpine-release ]; then
-    if [ -f /etc/X11/xinit/xinitrc ]; then
-        pre_start
-        /etc/X11/xinit/xinitrc
-        post_start
-    else
-        echo "** xinit package isn't installed" >&2
-        exit 1
-    fi
-  fi
-
-  # el
-  if [ -r /etc/X11/xinit/Xsession ]; then
-    pre_start
-    . /etc/X11/xinit/Xsession
-    post_start
-    exit 0
-  fi
-
-  # suse
-  if [ -r /etc/X11/xdm/Xsession ]; then
-    # since the following script run a user login shell,
-    # do not execute the pseudo login shell scripts
-    . /etc/X11/xdm/Xsession
-    exit 0
-  elif [ -r /usr/etc/X11/xdm/Xsession ]; then
-    . /usr/etc/X11/xdm/Xsession
-    exit 0
-  fi
-
-  pre_start
-  xterm
-  post_start
-}
-
-#. /etc/environment
-#export PATH=$PATH
-#export LANG=$LANG
-
-# change PATH to be what your environment needs usually what is in
-# /etc/environment
-#PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
-#export PATH=$PATH
-
-# for PATH and LANG from /etc/environment
-# pam will auto process the environment file if /etc/pam.d/xrdp-sesman
-# includes
-# auth       required     pam_env.so readenv=1
-
-wm_start
-
-exit 1
--- a/res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff
+++ b/res/vcpkg/aom/aom-uninitialized-pointer-3.9.1.diff
@@ -0,0 +1,13 @@
+diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
+index aaef2c310..5500ad4a3 100644
+--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
+@@ -309,6 +309,8 @@ if(MSVC)
+ 
+   # Disable MSVC warnings that suggest making code non-portable.
+   add_compiler_flag_if_supported("/wd4996")
+  # Disable MSVC warnings for potentially uninitialized local pointer variable.
+  add_compiler_flag_if_supported("/wd4703")
+   if(ENABLE_WERROR)
+     add_compiler_flag_if_supported("/WX")
+   endif()
--- a/res/vcpkg/aom/aom-uninitialized-pointer.diff
+++ b/res/vcpkg/aom/aom-uninitialized-pointer.diff
@@ -1,7 +1,7 @@
-diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
+diff --git a/cmake/aom_configure.cmake b/cmake/aom_configure.cmake
 index aaef2c310..5500ad4a3 100644
--- a/build/cmake/aom_configure.cmake
-+++ b/build/cmake/aom_configure.cmake
+--- a/cmake/aom_configure.cmake
+++ b/cmake/aom_configure.cmake
@@ -309,6 +309,8 @@ if(MSVC)
 
   # Disable MSVC warnings that suggest making code non-portable.
--- a/res/vcpkg/aom/portfile.cmake
+++ b/res/vcpkg/aom/portfile.cmake
@@ -9,25 +9,24 @@ get_filename_component(PERL_PATH ${PERL} DIRECTORY)
 vcpkg_add_to_path(${PERL_PATH})

 if(DEFINED ENV{USE_AOM_391})
+    set(AOM_CONFIG_PATH "lib/cmake/aom")
    vcpkg_from_git(
        OUT_SOURCE_PATH SOURCE_PATH
        URL "https://aomedia.googlesource.com/aom"
        REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # 3.9.1
        PATCHES
-            aom-uninitialized-pointer.diff
+            aom-uninitialized-pointer-3.9.1.diff
            aom-avx2.diff
            aom-install.diff
    )
 else()
+    set(AOM_CONFIG_PATH "lib/cmake/AOM")
    vcpkg_from_git(
        OUT_SOURCE_PATH SOURCE_PATH
        URL "https://aomedia.googlesource.com/aom"
-        REF 10aece4157eb79315da205f39e19bf6ab3ee30d0 # 3.12.1
+        REF 03087864cf4bea6abb0d28f95cf7843511413d8f # 3.14.1
        PATCHES
            aom-uninitialized-pointer.diff
-            # aom-avx2.diff
-            # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream
-            aom-install.diff
    )
 endif()

@@ -67,7 +66,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
 endif()

 # Move cmake configs
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH ${AOM_CONFIG_PATH})

 # Remove duplicate files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
--- a/res/vcpkg/aom/vcpkg.json
+++ b/res/vcpkg/aom/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "aom",
-  "version-semver": "3.12.1",
+  "version-semver": "3.14.1",
  "port-version": 0,
  "description": "AV1 codec library",
  "homepage": "https://aomedia.googlesource.com/aom",
--- a/res/xorg.conf
+++ b/res/xorg.conf
@@ -1,30 +0,0 @@
-Section "Monitor"
-    Identifier "Dummy Monitor"
- 
-    # Default HorizSync 31.50 - 48.00 kHz
-    HorizSync 5.0 - 150.0
-    # Default VertRefresh 50.00 - 70.00 Hz
-    VertRefresh 5.0 - 100.0
- 
-    # Taken from https://www.xpra.org/xorg.conf
-    Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
-    Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
-EndSection
- 
-Section "Device"
-    Identifier "Dummy VideoCard"
-    Driver "dummy"
-    # Default VideoRam 4096
-    # (1920 * 1080 * 4) / 1024 = 8100
-    VideoRam 8100
-EndSection
- 
-Section "Screen"
-    Identifier "Dummy Screen"
-    Device "Dummy VideoCard"
-    Monitor "Dummy Monitor"
-    SubSectionSub "Display"
-        Depth 24
-        Modes "1920x1080" "1280x720"
-    EndSubSection
-EndSection