From 938dd5bea7883b1fa84e21a2180de863ade87d9f Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 12:54:45 +0300
Subject: [PATCH 1/6] MP1-5262: Fix `Brotli` load error

---
 mediaportal/Setup/setup.nsi | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
index 2b380c9c137..99d70a82d7c 100644
--- a/mediaportal/Setup/setup.nsi
+++ b/mediaportal/Setup/setup.nsi
@@ -660,14 +660,22 @@ Section "MediaPortal core files (required)" SecCore
   SetOutPath "$MPdir.Base\"
   !if "${Architecture}" == "x64"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\MediaInfo.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3-x64.dll"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3-x64.dll"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3-x64.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !else
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\MediaInfo.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcrypto-3.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcurl.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !endif
   File "${git_ROOT}\Packages\MediaInfo.Wrapper.26.1.0\lib\net45\MediaInfo.Wrapper.dll"
   File "${git_ROOT}\Packages\System.ValueTuple.4.6.2\lib\net462\System.ValueTuple.dll"
@@ -1103,6 +1111,10 @@ SectionEnd
   ; NuGet binaries MediaInfo
   Delete "$MPdir.Base\MediaInfo.dll"
   Delete "$MPdir.Base\libcurl.dll"
+  Delete "$MPdir.Base\libssh2.dll"
+  Delete "$MPdir.Base\brotlicommon.dll"
+  Delete "$MPdir.Base\brotlidec.dll"
+  Delete "$MPdir.Base\brotlienc.dll"
   !if "${Architecture}" == "x64"
     Delete "$MPdir.Base\libcrypto-3-x64.dll"
     Delete "$MPdir.Base\libssl-3-x64.dll"

From 7e2c7cb4a2608f625faf899b8c2fad23091061ca Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 12:57:18 +0300
Subject: [PATCH 2/6] Update setup.nsi

---
 TvEngine3/TVLibrary/Setup/setup.nsi | 47 ++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
index ce99fe07d37..daa0294881b 100644
--- a/TvEngine3/TVLibrary/Setup/setup.nsi
+++ b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -585,15 +585,23 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   ; MediaInfo
   SetOutPath "$INSTDIR"
   !if "${Architecture}" == "x64"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\MediaInfo.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3-x64.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3-x64.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\MediaInfo.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"+
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3-x64.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3-x64.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !else
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\MediaInfo.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcrypto-3.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcurl.dll"
-    File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\MediaInfo.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !endif
   File "${git_ROOT}\Packages\MediaInfo.Wrapper.26.1.0\lib\net45\MediaInfo.Wrapper.dll"
   File "${git_ROOT}\Packages\System.ValueTuple.4.6.2\lib\net462\System.ValueTuple.dll"
@@ -835,19 +843,22 @@ ${MementoSectionEnd}
   ;Delete "$INSTDIR\Interop.SHDocVw.dll"
   Delete "$INSTDIR\ffmpeg.exe"
   Delete "$INSTDIR\TvThumbnails.dll"
-  Delete "$INSTDIR\MediaInfo.dll"
-  Delete "$INSTDIR\libcrypto-1_1.dll"
-  Delete "$INSTDIR\libcurl.dll"
-  Delete "$INSTDIR\libssl-1_1.dll"
-  Delete "$INSTDIR\MediaInfo.Wrapper.dll"
-  
+
+  ; MediaInfo
+  Delete "$MPdir.Base\MediaInfo.dll"
+  Delete "$MPdir.Base\libcurl.dll"
+  Delete "$MPdir.Base\libssh2.dll"
+  Delete "$MPdir.Base\brotlicommon.dll"
+  Delete "$MPdir.Base\brotlidec.dll"
+  Delete "$MPdir.Base\brotlienc.dll"
   !if "${Architecture}" == "x64"
-    Delete "$INSTDIR\libcrypto-3-x64.dll"
-    Delete "$INSTDIR\libssl-3-x64.dll"
+    Delete "$MPdir.Base\libcrypto-3-x64.dll"
+    Delete "$MPdir.Base\libssl-3-x64.dll"
   !else
-    Delete "$INSTDIR\libcrypto-3.dll"
-    Delete "$INSTDIR\libssl-3.dll"
+    Delete "$MPdir.Base\libcrypto-3.dll"
+    Delete "$MPdir.Base\libssl-3.dll"
   !endif
+  Delete "$INSTDIR\MediaInfo.Wrapper.dll"
 
   ; Additional assemblies
   Delete "$INSTDIR\System.Threading.Tasks.Extensions.dll"

From 9bad3e1e1a1f01051a1f912dd0d686745e26b93f Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 13:14:12 +0300
Subject: [PATCH 3/6] Update setup.nsi

---
 TvEngine3/TVLibrary/Setup/setup.nsi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
index daa0294881b..ec53d7a665d 100644
--- a/TvEngine3/TVLibrary/Setup/setup.nsi
+++ b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -845,18 +845,18 @@ ${MementoSectionEnd}
   Delete "$INSTDIR\TvThumbnails.dll"
 
   ; MediaInfo
-  Delete "$MPdir.Base\MediaInfo.dll"
-  Delete "$MPdir.Base\libcurl.dll"
-  Delete "$MPdir.Base\libssh2.dll"
-  Delete "$MPdir.Base\brotlicommon.dll"
-  Delete "$MPdir.Base\brotlidec.dll"
-  Delete "$MPdir.Base\brotlienc.dll"
+  Delete "$INSTDIR\MediaInfo.dll"
+  Delete "$INSTDIR\libcurl.dll"
+  Delete "$INSTDIR\libssh2.dll"
+  Delete "$INSTDIR\brotlicommon.dll"
+  Delete "$INSTDIR\brotlidec.dll"
+  Delete "$INSTDIR\brotlienc.dll"
   !if "${Architecture}" == "x64"
-    Delete "$MPdir.Base\libcrypto-3-x64.dll"
-    Delete "$MPdir.Base\libssl-3-x64.dll"
+    Delete "$INSTDIR\libcrypto-3-x64.dll"
+    Delete "$INSTDIR\libssl-3-x64.dll"
   !else
-    Delete "$MPdir.Base\libcrypto-3.dll"
-    Delete "$MPdir.Base\libssl-3.dll"
+    Delete "$INSTDIR\libcrypto-3.dll"
+    Delete "$INSTDIR\libssl-3.dll"
   !endif
   Delete "$INSTDIR\MediaInfo.Wrapper.dll"
 

From e8668ed0e67fbcfeafebb34a54bd4385a916dbc1 Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 13:40:47 +0300
Subject: [PATCH 4/6] Update setup.nsi

---
 mediaportal/Setup/setup.nsi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
index 99d70a82d7c..af718cdc0c6 100644
--- a/mediaportal/Setup/setup.nsi
+++ b/mediaportal/Setup/setup.nsi
@@ -669,13 +669,13 @@ Section "MediaPortal core files (required)" SecCore
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !else
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\MediaInfo.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcurl.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcrypto-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlienc.dll"  
   !endif
   File "${git_ROOT}\Packages\MediaInfo.Wrapper.26.1.0\lib\net45\MediaInfo.Wrapper.dll"
   File "${git_ROOT}\Packages\System.ValueTuple.4.6.2\lib\net462\System.ValueTuple.dll"

From 9ee11070b3b52000a063f1f9fbeb824832609303 Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 13:41:34 +0300
Subject: [PATCH 5/6] Update setup.nsi

---
 TvEngine3/TVLibrary/Setup/setup.nsi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
index ec53d7a665d..8dee71ff673 100644
--- a/TvEngine3/TVLibrary/Setup/setup.nsi
+++ b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -595,13 +595,13 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
   !else
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\MediaInfo.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlicommon.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlidec.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\brotlienc.dll"  
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcurl.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssh2.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libcrypto-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\libssl-3.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlicommon.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlidec.dll"
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x86\brotlienc.dll"  
   !endif
   File "${git_ROOT}\Packages\MediaInfo.Wrapper.26.1.0\lib\net45\MediaInfo.Wrapper.dll"
   File "${git_ROOT}\Packages\System.ValueTuple.4.6.2\lib\net462\System.ValueTuple.dll"

From d7006272a7231c96ef21d612df79aec65f46a76b Mon Sep 17 00:00:00 2001
From: "Andrew J.Swan" <ajs.blackhole@gmail.com>
Date: Mon, 8 Jun 2026 14:06:41 +0300
Subject: [PATCH 6/6] Update setup.nsi

---
 TvEngine3/TVLibrary/Setup/setup.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
index 8dee71ff673..90ecf824951 100644
--- a/TvEngine3/TVLibrary/Setup/setup.nsi
+++ b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -586,7 +586,7 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   SetOutPath "$INSTDIR"
   !if "${Architecture}" == "x64"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\MediaInfo.dll"
-  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"+
+  File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcurl.dll"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssh2.dll"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libcrypto-3-x64.dll"
   File "${git_ROOT}\Packages\MediaInfo.Native.26.1.0\build\native\x64\libssl-3-x64.dll"