From 9683959f2ee5bc57106bf3a25e6a7aa666ad947e Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:57:22 +0800 Subject: [PATCH 1/3] bestsource: Bump to R2 Update DLL path for win installer --- packages/win_installer/fragment_codecs.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/win_installer/fragment_codecs.iss b/packages/win_installer/fragment_codecs.iss index cf71a43d7..e657ed40c 100644 --- a/packages/win_installer/fragment_codecs.iss +++ b/packages/win_installer/fragment_codecs.iss @@ -7,6 +7,6 @@ DestDir: {app}; Source: {#DEPS_DIR}\AvisynthPlus64\x64\plugins\DirectShowSource. DestDir: {app}\csri; Source: {#DEPS_DIR}\VSFilter\x64\VSFilter.dll; Flags: ignoreversion; Components: main ; VapourSynth DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\L-SMASH-Works\libvslsmashsource.dll; Flags: ignoreversion; Components: vapoursynth -DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\BestSource\x64\BestSource.dll; Flags: ignoreversion; Components: vapoursynth +DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\BestSource\BestSource.dll; Flags: ignoreversion; Components: vapoursynth DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\SCXVid\libscxvid.dll; Flags: ignoreversion; Components: vapoursynth DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\WWXD\libwwxd64.dll; Flags: ignoreversion; Components: vapoursynth From 39314072f989d80acaf6240566cbc400c0cba211 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Thu, 18 Apr 2024 15:21:02 +0200 Subject: [PATCH 2/3] bestsource: Fix switched 'audio' and 'video' strings --- src/bestsource_common.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bestsource_common.cpp b/src/bestsource_common.cpp index c01097ee0..9e44daf68 100644 --- a/src/bestsource_common.cpp +++ b/src/bestsource_common.cpp @@ -68,8 +68,8 @@ std::pair SelectTrack(agi::fs::path const& filename, bool result = static_cast(TrackNumbers[0]); } else { int Choice = wxGetSingleChoiceIndex( - audio ? _("Multiple video tracks detected, please choose the one you wish to load:") : _("Multiple audio tracks detected, please choose the one you wish to load:"), - audio ? _("Choose video track") : _("Choose audio track"), + audio ? _("Multiple audio tracks detected, please choose the one you wish to load:") : _("Multiple video tracks detected, please choose the one you wish to load:"), + audio ? _("Choose audio track") : _("Choose video track"), Choices); if (Choice >= 0) From 2fdd7c70aa5149302387fba563ce31a16790c82c Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Thu, 18 Apr 2024 15:27:54 +0200 Subject: [PATCH 3/3] meson: Add freetype2 wrap This wrap file used to be part of the libass wrap but was removed there now. --- subprojects/freetype2.wrap | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 subprojects/freetype2.wrap diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap new file mode 100644 index 000000000..a803f3072 --- /dev/null +++ b/subprojects/freetype2.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = freetype2 +url = https://gitlab.freedesktop.org/freetype/freetype.git +revision = master + +[provide] +freetype = freetype_dep +freetype2 = freetype_dep