From 73843cb54d5c5bb4831d1ffd304507813f3f918d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 8 Mar 2022 21:53:10 +0100 Subject: [PATCH] Switch back to libsoup 2 in nsi libsoup 3.0 currently has issues with gstreamer --- .github/workflows/ccpp.yml | 2 +- dist/windows/strawberry.nsi.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e6c658dca..8ebe3ac65 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1616,7 +1616,7 @@ jobs: - name: Copy extra binaries working-directory: build - run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/{sqlite3.exe,gst-launch-1.0.exe,gst-discoverer-1.0.exe,libsoup-3.0-0.dll} . + run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/{sqlite3.exe,gst-launch-1.0.exe,gst-discoverer-1.0.exe,libsoup-2.4-1.dll,libnghttp2.dll} . - name: Copy dependencies working-directory: build diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index 000705944..d5a5edff2 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -270,7 +270,7 @@ Section "Strawberry" Strawberry File "libprotobuf-30.dll" File "libpsl-5.dll" File "libqtsparkle-qt6.dll" - File "libsoup-3.0-0.dll" + File "libsoup-2.4-1.dll" File "libsqlite3-0.dll" File "libssp-0.dll" File "libstdc++-6.dll" @@ -668,7 +668,7 @@ Section "Uninstall" Delete "$INSTDIR\libprotobuf-30.dll" Delete "$INSTDIR\libpsl-5.dll" Delete "$INSTDIR\libqtsparkle-qt6.dll" - Delete "$INSTDIR\libsoup-3.0-0.dll" + Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\libsqlite3-0.dll" Delete "$INSTDIR\libssp-0.dll" Delete "$INSTDIR\libstdc++-6.dll"