From fdc1710847eb236b85d30994f8cee904caed4543 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 22 Jan 2024 00:50:44 +0100 Subject: [PATCH] nsi: Add adaptivedemux2 and mpeg demux/mux plugins --- .github/workflows/build.yml | 7 ++++++- dist/windows/strawberry.nsi.in | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 780b332960..fdd2db6a53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1111,7 +1111,7 @@ jobs: - name: Copy gstreamer plugins working-directory: build - run: cp /strawberry-mxe/usr/${{matrix.arch}}-w64-mingw32.shared/bin/gstreamer-1.0/{libgstaes.dll,libgstaiff.dll,libgstapetag.dll,libgstapp.dll,libgstasf.dll,libgstasfmux.dll,libgstaudioconvert.dll,libgstaudiofx.dll,libgstaudiomixer.dll,libgstaudioparsers.dll,libgstaudiorate.dll,libgstaudioresample.dll,libgstaudiotestsrc.dll,libgstautodetect.dll,libgstbs2b.dll,libgstcoreelements.dll,libgstdash.dll,libgstdirectsound.dll,libgstequalizer.dll,libgstfaac.dll,libgstfaad.dll,libgstfdkaac.dll,libgstflac.dll,libgstgio.dll,libgstgme.dll,libgsthls.dll,libgsticydemux.dll,libgstid3demux.dll,libgstid3tag.dll,libgstisomp4.dll,libgstlame.dll,libgstlibav.dll,libgstmpg123.dll,libgstmusepack.dll,libgstogg.dll,libgstopenmpt.dll,libgstopus.dll,libgstopusparse.dll,libgstpbtypes.dll,libgstplayback.dll,libgstreplaygain.dll,libgstrtp.dll,libgstrtsp.dll,libgstsoup.dll,libgstspectrum.dll,libgstspeex.dll,libgsttaglib.dll,libgsttcp.dll,libgsttwolame.dll,libgsttypefindfunctions.dll,libgstudp.dll,libgstvolume.dll,libgstvorbis.dll,libgstwasapi.dll,libgstwavenc.dll,libgstwavpack.dll,libgstwavparse.dll,libgstxingmux.dll} ${GITHUB_WORKSPACE}/build/gstreamer-plugins/ + run: cp /strawberry-mxe/usr/${{matrix.arch}}-w64-mingw32.shared/bin/gstreamer-1.0/{libgstadaptivedemux2.dll,libgstaes.dll,libgstaiff.dll,libgstapetag.dll,libgstapp.dll,libgstasf.dll,libgstasfmux.dll,libgstaudioconvert.dll,libgstaudiofx.dll,libgstaudiomixer.dll,libgstaudioparsers.dll,libgstaudiorate.dll,libgstaudioresample.dll,libgstaudiotestsrc.dll,libgstautodetect.dll,libgstbs2b.dll,libgstcoreelements.dll,libgstdash.dll,libgstdirectsound.dll,libgstequalizer.dll,libgstfaac.dll,libgstfaad.dll,libgstfdkaac.dll,libgstflac.dll,libgstgio.dll,libgstgme.dll,libgsthls.dll,libgsticydemux.dll,libgstid3demux.dll,libgstid3tag.dll,libgstisomp4.dll,libgstlame.dll,libgstmpegpsdemux.dll,libgstmpegpsmux.dll,libgstmpegtsdemux.dll,libgstmpegtsmux.dll,libgstlibav.dll,libgstmpg123.dll,libgstmusepack.dll,libgstogg.dll,libgstopenmpt.dll,libgstopus.dll,libgstopusparse.dll,libgstpbtypes.dll,libgstplayback.dll,libgstreplaygain.dll,libgstrtp.dll,libgstrtsp.dll,libgstsoup.dll,libgstspectrum.dll,libgstspeex.dll,libgsttaglib.dll,libgsttcp.dll,libgsttwolame.dll,libgsttypefindfunctions.dll,libgstudp.dll,libgstvolume.dll,libgstvorbis.dll,libgstwasapi.dll,libgstwavenc.dll,libgstwavpack.dll,libgstwavparse.dll,libgstxingmux.dll} ${GITHUB_WORKSPACE}/build/gstreamer-plugins/ - name: Copy extra binaries working-directory: build @@ -1418,6 +1418,7 @@ jobs: shell: cmd working-directory: build run: | + copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstadaptivedemux2.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstaes.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstaiff.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstapetag.dll .\gstreamer-plugins\ @@ -1449,6 +1450,10 @@ jobs: copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstid3tag.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstisomp4.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstlame.dll .\gstreamer-plugins\ + copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmpegpsdemux.dll .\gstreamer-plugins\ + copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmpegpsmux.dll .\gstreamer-plugins\ + copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmpegtsdemux.dll .\gstreamer-plugins\ + copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmpegtsmux.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstlibav.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmpg123.dll .\gstreamer-plugins\ copy ${{env.prefix_path_backslash}}\lib\gstreamer-1.0\gstmusepack.dll .\gstreamer-plugins\ diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index 1a5969c87b..2f7dd7bafd 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -627,6 +627,7 @@ Section "Gstreamer plugins" gstreamer-plugins SetOutPath "$INSTDIR\gstreamer-plugins" !ifdef mingw + File "/oname=libgstadaptivedemux2.dll" "gstreamer-plugins\libgstadaptivedemux2.dll" File "/oname=libgstaes.dll" "gstreamer-plugins\libgstaes.dll" File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll" File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll" @@ -658,6 +659,10 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=libgstid3tag.dll" "gstreamer-plugins\libgstid3tag.dll" File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll" File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll" + File "/oname=libgstmpegpsdemux.dll" "gstreamer-plugins\libgstmpegpsdemux.dll" + File "/oname=libgstmpegpsmux.dll" "gstreamer-plugins\libgstmpegpsmux.dll" + File "/oname=libgstmpegtsdemux.dll" "gstreamer-plugins\libgstmpegtsdemux.dll" + File "/oname=libgstmpegtsmux.dll" "gstreamer-plugins\libgstmpegtsmux.dll" File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll" File "/oname=libgstmpg123.dll" "gstreamer-plugins\libgstmpg123.dll" File "/oname=libgstmusepack.dll" "gstreamer-plugins\libgstmusepack.dll" @@ -688,6 +693,7 @@ Section "Gstreamer plugins" gstreamer-plugins !endif ; MinGW !ifdef msvc + File "/oname=gstadaptivedemux2.dll" "gstreamer-plugins\gstadaptivedemux2.dll" File "/oname=gstaes.dll" "gstreamer-plugins\gstaes.dll" File "/oname=gstaiff.dll" "gstreamer-plugins\gstaiff.dll" File "/oname=gstapetag.dll" "gstreamer-plugins\gstapetag.dll" @@ -719,6 +725,10 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=gstid3tag.dll" "gstreamer-plugins\gstid3tag.dll" File "/oname=gstisomp4.dll" "gstreamer-plugins\gstisomp4.dll" File "/oname=gstlame.dll" "gstreamer-plugins\gstlame.dll" + File "/oname=gstmpegpsdemux.dll" "gstreamer-plugins\gstmpegpsdemux.dll" + File "/oname=gstmpegpsmux.dll" "gstreamer-plugins\gstmpegpsmux.dll" + File "/oname=gstmpegtsdemux.dll" "gstreamer-plugins\gstmpegtsdemux.dll" + File "/oname=gstmpegtsmux.dll" "gstreamer-plugins\gstmpegtsmux.dll" File "/oname=gstlibav.dll" "gstreamer-plugins\gstlibav.dll" File "/oname=gstmpg123.dll" "gstreamer-plugins\gstmpg123.dll" File "/oname=gstmusepack.dll" "gstreamer-plugins\gstmusepack.dll" @@ -1116,6 +1126,7 @@ Section "Uninstall" ; MinGW GStreamer plugins !ifdef mingw + Delete "$INSTDIR\gstreamer-plugins\libgstadaptivedemux2.dll" Delete "$INSTDIR\gstreamer-plugins\libgstaes.dll" Delete "$INSTDIR\gstreamer-plugins\libgstaiff.dll" Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll" @@ -1147,6 +1158,10 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\libgstid3tag.dll" Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll" Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsdemux.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsmux.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsdemux.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsmux.dll" Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll" Delete "$INSTDIR\gstreamer-plugins\libgstmpg123.dll" Delete "$INSTDIR\gstreamer-plugins\libgstmusepack.dll" @@ -1179,6 +1194,7 @@ Section "Uninstall" ; MSVC GStreamer plugins !ifdef msvc + Delete "$INSTDIR\gstreamer-plugins\gstadaptivedemux2.dll" Delete "$INSTDIR\gstreamer-plugins\gstaes.dll" Delete "$INSTDIR\gstreamer-plugins\gstaiff.dll" Delete "$INSTDIR\gstreamer-plugins\gstapetag.dll" @@ -1210,6 +1226,10 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\gstid3tag.dll" Delete "$INSTDIR\gstreamer-plugins\gstisomp4.dll" Delete "$INSTDIR\gstreamer-plugins\gstlame.dll" + Delete "$INSTDIR\gstreamer-plugins\gstmpegpsdemux.dll" + Delete "$INSTDIR\gstreamer-plugins\gstmpegpsmux.dll" + Delete "$INSTDIR\gstreamer-plugins\gstmpegtsdemux.dll" + Delete "$INSTDIR\gstreamer-plugins\gstmpegtsmux.dll" Delete "$INSTDIR\gstreamer-plugins\gstlibav.dll" Delete "$INSTDIR\gstreamer-plugins\gstmpg123.dll" Delete "$INSTDIR\gstreamer-plugins\gstmusepack.dll"