From ae8eed7a67e389301f771820d421a0fbb692ff34 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 10 Sep 2020 17:12:18 +0200
Subject: [PATCH] Add ffmpeg to nsi

---
 dist/windows/strawberry.nsi.in | 97 ++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in
index 3bc010dcd..133909111 100644
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry.nsi.in
@@ -175,6 +175,25 @@ Section "Strawberry" Strawberry
   File "strawberry-tagreader.exe"
   File "strawberry.ico"
 
+!ifdef arch_x86
+  File "libgcc_s_sjlj-1.dll"
+  File "libcrypto-1_1.dll"
+  File "libssl-1_1.dll"
+!endif
+
+!ifdef arch_x64
+  File "libgcc_s_seh-1.dll"
+  File "libcrypto-1_1-x64.dll"
+  File "libssl-1_1-x64.dll"
+!endif
+
+  File "avcodec-58.dll"
+  File "avfilter-7.dll"
+  File "avformat-58.dll"
+  File "avresample-4.dll"
+  File "avutil-56.dll"
+  File "libbrotlicommon.dll"
+  File "libbrotlidec.dll"
   File "libbz2.dll"
   File "libcdio-19.dll"
   File "libchromaprint.dll"
@@ -214,21 +233,31 @@ Section "Strawberry" Strawberry
   File "libnettle-8.dll"
   File "libogg-0.dll"
   File "libopus-0.dll"
+  File "liborc-0.4-0.dll"
   File "libpcre-1.dll"
   File "libpcre2-16-0.dll"
   File "libpng16-16.dll"
   File "libprotobuf-24.dll"
+  File "libpsl-5.dll"
   File "libsoup-2.4-1.dll"
   File "libspeex-1.dll"
   File "libsqlite3-0.dll"
+  File "libssp-0.dll"
   File "libstdc++-6.dll"
   File "libtag.dll"
+  File "libtasn1-6.dll"
   File "libunistring-2.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
   File "libwavpack-1.dll"
   File "libwinpthread-1.dll"
   File "libxml2-2.dll"
+  File "libzstd.dll"
+  File "postproc-55.dll"
+  File "swresample-3.dll"
+  File "swscale-5.dll"
+  File "zlib1.dll"
+
 !ifdef with_qt6
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
@@ -248,25 +277,6 @@ Section "Strawberry" Strawberry
   File "Qt5WinExtras.dll"
   File "libqtsparkle-qt5.dll"
 !endif
-  File "zlib1.dll"
-  File "libzstd.dll"
-  File "libtasn1-6.dll"
-  File "libbrotlicommon.dll"
-  File "libbrotlidec.dll"
-  File "libpsl-5.dll"
-  File "liborc-0.4-0.dll"
-
-!ifdef arch_x86
-  File "libgcc_s_sjlj-1.dll"
-  File "libcrypto-1_1.dll"
-  File "libssl-1_1.dll"
-!endif
-
-!ifdef arch_x64
-  File "libgcc_s_seh-1.dll"
-  File "libcrypto-1_1-x64.dll"
-  File "libssl-1_1-x64.dll"
-!endif
 
   File "killproc.exe"
 
@@ -416,6 +426,25 @@ Section "Uninstall"
   Delete "$INSTDIR\strawberry.exe"
   Delete "$INSTDIR\strawberry-tagreader.exe"
 
+!ifdef arch_x86
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\libcrypto-1_1.dll"
+  Delete "$INSTDIR\libssl-1_1.dll"
+!endif
+
+!ifdef arch_x64
+  Delete "$INSTDIR\libgcc_s_seh-1.dll"
+  Delete "$INSTDIR\libcrypto-1_1-x64.dll"
+  Delete "$INSTDIR\libssl-1_1-x64.dll"
+!endif
+
+  Delete "$INSTDIR\avcodec-58.dll"
+  Delete "$INSTDIR\avfilter-7.dll"
+  Delete "$INSTDIR\avformat-58.dll"
+  Delete "$INSTDIR\avresample-4.dll"
+  Delete "$INSTDIR\avutil-56.dll"
+  Delete "$INSTDIR\libbrotlicommon.dll"
+  Delete "$INSTDIR\libbrotlidec.dll"
   Delete "$INSTDIR\libbz2.dll"
   Delete "$INSTDIR\libcdio-19.dll"
   Delete "$INSTDIR\libchromaprint.dll"
@@ -455,21 +484,29 @@ Section "Uninstall"
   Delete "$INSTDIR\libnettle-8.dll"
   Delete "$INSTDIR\libogg-0.dll"
   Delete "$INSTDIR\libopus-0.dll"
+  Delete "$INSTDIR\liborc-0.4-0.dll"
   Delete "$INSTDIR\libpcre-1.dll"
   Delete "$INSTDIR\libpcre2-16-0.dll"
   Delete "$INSTDIR\libpng16-16.dll"
   Delete "$INSTDIR\libprotobuf-24.dll"
+  Delete "$INSTDIR\libpsl-5.dll"
+  Delete "$INSTDIR\libqtsparkle-qt5.dll"
+  Delete "$INSTDIR\libqtsparkle-qt6.dll"
   Delete "$INSTDIR\libsoup-2.4-1.dll"
   Delete "$INSTDIR\libspeex-1.dll"
   Delete "$INSTDIR\libsqlite3-0.dll"
+  Delete "$INSTDIR\libssp-0.dll"
   Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libtag.dll"
+  Delete "$INSTDIR\libtasn1-6.dll"
   Delete "$INSTDIR\libunistring-2.dll"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
   Delete "$INSTDIR\libwavpack-1.dll"
   Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\libxml2-2.dll"
+  Delete "$INSTDIR\libzstd.dll"
+  Delete "$INSTDIR\postproc-55.dll"
   Delete "$INSTDIR\Qt5Concurrent.dll"
   Delete "$INSTDIR\Qt5Core.dll"
   Delete "$INSTDIR\Qt5Gui.dll"
@@ -477,7 +514,6 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt5Sql.dll"
   Delete "$INSTDIR\Qt5Widgets.dll"
   Delete "$INSTDIR\Qt5WinExtras.dll"
-  Delete "$INSTDIR\libqtsparkle-qt5.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -485,26 +521,9 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sql.dll"
   Delete "$INSTDIR\Qt6Widgets.dll"
   Delete "$INSTDIR\Qt6WinExtras.dll"
-  Delete "$INSTDIR\libqtsparkle-qt6.dll"
+  Delete "$INSTDIR\swresample-3.dll"
+  Delete "$INSTDIR\swscale-5.dll"
   Delete "$INSTDIR\zlib1.dll"
-  Delete "$INSTDIR\libzstd.dll"
-  Delete "$INSTDIR\libtasn1-6.dll"
-  Delete "$INSTDIR\libbrotlicommon.dll"
-  Delete "$INSTDIR\libbrotlidec.dll"
-  Delete "$INSTDIR\libpsl-5.dll"
-  Delete "$INSTDIR\liborc-0.4-0.dll"
-
-!ifdef arch_x86
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libcrypto-1_1.dll"
-  Delete "$INSTDIR\libssl-1_1.dll"
-!endif
-
-!ifdef arch_x64
-  Delete "$INSTDIR\libgcc_s_seh-1.dll"
-  Delete "$INSTDIR\libcrypto-1_1-x64.dll"
-  Delete "$INSTDIR\libssl-1_1-x64.dll"
-!endif
 
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"
   Delete "$INSTDIR\platforms\qwindows.dll"