From c82bdb6405a6f065a84352d0d7fcafd61001d8fb Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 19 Mar 2022 18:56:26 +0100 Subject: [PATCH] Add musepack, bs2b, faac and faad to nsi for msvc --- .github/workflows/ccpp.yml | 8 ++++++++ dist/windows/strawberry.nsi.in | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8695ab317..ac0ee4e84 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1759,10 +1759,13 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstaudioresample.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstaudiotestsrc.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstautodetect.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstbs2b.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstcoreelements.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstdash.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstdirectsound.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstequalizer.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfaac.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfaad.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfdkaac.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstflac.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstgio.dll .\gstreamer-plugins\ @@ -1771,6 +1774,7 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstisomp4.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstlame.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstmpg123.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstmusepack.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstogg.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstopus.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstopusparse.dll .\gstreamer-plugins\ @@ -2006,10 +2010,13 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstaudioresample.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstaudiotestsrc.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstautodetect.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstbs2b.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstcoreelements.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstdash.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstdirectsound.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstequalizer.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfaac.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfaad.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstfdkaac.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstflac.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstgio.dll .\gstreamer-plugins\ @@ -2018,6 +2025,7 @@ jobs: copy c:\msvc_x86_64\lib\gstreamer-1.0\gstisomp4.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstlame.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstmpg123.dll .\gstreamer-plugins\ + copy c:\msvc_x86_64\lib\gstreamer-1.0\gstmusepack.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstogg.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstopus.dll .\gstreamer-plugins\ copy c:\msvc_x86_64\lib\gstreamer-1.0\gstopusparse.dll .\gstreamer-plugins\ diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index 86ce2cc49..deee00abe 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -351,12 +351,14 @@ Section "Strawberry" Strawberry File "gstvideo-1.0-0.dll" File "gstwinrt-1.0-0.dll" File "intl-8.dll" + File "libbs2b.dll" File "libiconv.dll" File "liblzma.dll" File "libmp3lame.dll" File "libpng16.dll" File "libprotobuf.dll" File "libxml2.dll" + File "mpcdec.dll" File "mpg123.dll" File "ogg.dll" File "opus.dll" @@ -527,10 +529,13 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=gstaudioresample.dll" "gstreamer-plugins\gstaudioresample.dll" File "/oname=gstaudiotestsrc.dll" "gstreamer-plugins\gstaudiotestsrc.dll" File "/oname=gstautodetect.dll" "gstreamer-plugins\gstautodetect.dll" + File "/oname=gstbs2b.dll" "gstreamer-plugins\gstbs2b.dll" File "/oname=gstcoreelements.dll" "gstreamer-plugins\gstcoreelements.dll" File "/oname=gstdash.dll" "gstreamer-plugins\gstdash.dll" File "/oname=gstdirectsound.dll" "gstreamer-plugins\gstdirectsound.dll" File "/oname=gstequalizer.dll" "gstreamer-plugins\gstequalizer.dll" + File "/oname=gstfaac.dll" "gstreamer-plugins\gstfaac.dll" + File "/oname=gstfaad.dll" "gstreamer-plugins\gstfaad.dll" File "/oname=gstfdkaac.dll" "gstreamer-plugins\gstfdkaac.dll" File "/oname=gstflac.dll" "gstreamer-plugins\gstflac.dll" File "/oname=gstgio.dll" "gstreamer-plugins\gstgio.dll" @@ -539,6 +544,7 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=gstisomp4.dll" "gstreamer-plugins\gstisomp4.dll" File "/oname=gstlame.dll" "gstreamer-plugins\gstlame.dll" File "/oname=gstmpg123.dll" "gstreamer-plugins\gstmpg123.dll" + File "/oname=gstmusepack.dll" "gstreamer-plugins\gstmusepack.dll" File "/oname=gstogg.dll" "gstreamer-plugins\gstogg.dll" File "/oname=gstopus.dll" "gstreamer-plugins\gstopus.dll" File "/oname=gstopusparse.dll" "gstreamer-plugins\gstopusparse.dll" @@ -756,12 +762,14 @@ Section "Uninstall" Delete "$INSTDIR\gstvideo-1.0-0.dll" Delete "$INSTDIR\gstwinrt-1.0-0.dll" Delete "$INSTDIR\intl-8.dll" + Delete "$INSTDIR\libbs2b.dll" Delete "$INSTDIR\libiconv.dll" Delete "$INSTDIR\liblzma.dll" Delete "$INSTDIR\libmp3lame.dll" Delete "$INSTDIR\libpng16.dll" Delete "$INSTDIR\libprotobuf.dll" Delete "$INSTDIR\libxml2.dll" + Delete "$INSTDIR\mpcdec.dll" Delete "$INSTDIR\mpg123.dll" Delete "$INSTDIR\ogg.dll" Delete "$INSTDIR\opus.dll" @@ -880,10 +888,13 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\gstaudioresample.dll" Delete "$INSTDIR\gstreamer-plugins\gstaudiotestsrc.dll" Delete "$INSTDIR\gstreamer-plugins\gstautodetect.dll" + Delete "$INSTDIR\gstreamer-plugins\gstbs2b.dll" Delete "$INSTDIR\gstreamer-plugins\gstcoreelements.dll" Delete "$INSTDIR\gstreamer-plugins\gstdash.dll" Delete "$INSTDIR\gstreamer-plugins\gstdirectsound.dll" Delete "$INSTDIR\gstreamer-plugins\gstequalizer.dll" + Delete "$INSTDIR\gstreamer-plugins\gstfaac.dll" + Delete "$INSTDIR\gstreamer-plugins\gstfaad.dll" Delete "$INSTDIR\gstreamer-plugins\gstfdkaac.dll" Delete "$INSTDIR\gstreamer-plugins\gstflac.dll" Delete "$INSTDIR\gstreamer-plugins\gstgio.dll" @@ -892,6 +903,7 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\gstisomp4.dll" Delete "$INSTDIR\gstreamer-plugins\gstlame.dll" Delete "$INSTDIR\gstreamer-plugins\gstmpg123.dll" + Delete "$INSTDIR\gstreamer-plugins\gstmusepack.dll" Delete "$INSTDIR\gstreamer-plugins\gstogg.dll" Delete "$INSTDIR\gstreamer-plugins\gstopus.dll" Delete "$INSTDIR\gstreamer-plugins\gstopusparse.dll"