Skip to content

MP1-5262: Fix Brotli load error #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewjswan merged 6 commits into from
Jun 9, 2026
+37 −14
Merged

MP1-5262: Fix Brotli load error #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
938dd5b
MP1-5262: Fix `Brotli` load error
andrewjswan Jun 8, 2026
7e2c7cb
Update setup.nsi
andrewjswan Jun 8, 2026
9bad3e1
Update setup.nsi
andrewjswan Jun 8, 2026
e8668ed
Update setup.nsi
andrewjswan Jun 8, 2026
9ee1107
Update setup.nsi
andrewjswan Jun 8, 2026
d700627
Update setup.nsi
andrewjswan Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions TvEngine3/TVLibrary/Setup/setup.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\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"
Expand Down Expand Up @@ -835,19 +843,22 @@ ${MementoSectionEnd}
;Delete "$INSTDIR\Interop.SHDocVw.dll"
Delete "$INSTDIR\ffmpeg.exe"
Delete "$INSTDIR\TvThumbnails.dll"

; MediaInfo
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"

Delete "$INSTDIR\libssh2.dll"
Delete "$INSTDIR\brotlicommon.dll"
Delete "$INSTDIR\brotlidec.dll"
Delete "$INSTDIR\brotlienc.dll"
!if "${Architecture}" == "x64"
Delete "$INSTDIR\libcrypto-3-x64.dll"
Delete "$INSTDIR\libssl-3-x64.dll"
!else
Delete "$INSTDIR\libcrypto-3.dll"
Delete "$INSTDIR\libssl-3.dll"
!endif
Delete "$INSTDIR\MediaInfo.Wrapper.dll"

; Additional assemblies
Delete "$INSTDIR\System.Threading.Tasks.Extensions.dll"
Expand Down
16 changes: 14 additions & 2 deletions mediaportal/Setup/setup.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\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"
Expand Down Expand Up @@ -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"
Expand Down
Loading