Merge branches 'bugfixes' and 'bestsource' into feature

This commit is contained in:
arch1t3cht 2024-05-30 23:17:17 +02:00
commit b4da179146
6 changed files with 4 additions and 63 deletions

View File

@ -249,7 +249,7 @@ needs_ffmpeg = false
if get_option('bestsource').enabled()
conf.set('WITH_BESTSOURCE', 1)
bs = subproject('bestsource', default_options: ['link_static=' + (get_option('default_library') == 'static').to_string()])
bs = subproject('bestsource', default_options: ['enable_plugin=false'])
deps += bs.get_variable('bestsource_dep')
dep_avail += 'BestSource'
needs_ffmpeg = true

View File

@ -67,7 +67,7 @@ BSAudioProvider::BSAudioProvider(agi::fs::path const& filename, agi::BackgroundR
ps->SetTitle(from_wx(_("Indexing")));
ps->SetMessage(from_wx(_("Indexing file... This will take a while!")));
try {
bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, false, 0, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, false, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
ps->SetProgress(Current, Total);
return !ps->IsCancelled();
});

View File

@ -128,7 +128,7 @@ BSVideoProvider::BSVideoProvider(agi::fs::path const& filename, std::string cons
ps->SetTitle(from_wx(_("Indexing")));
ps->SetMessage(from_wx(_("Decoding the full track to ensure perfect frame accuracy. This will take a while!")));
try {
bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), false, OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), false, OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), 1, provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
ps->SetProgress(Current, Total);
return !ps->IsCancelled();
});

View File

@ -1,8 +1,7 @@
[wrap-git]
url = https://github.com/vapoursynth/bestsource
revision = 9d7e218588867bf2b1334e5382b0f4d1b6a45aa1
revision = R4
clone-recursive = true
diff_files = bestsource/0001.patch
[provide]
bestsource = bestsource_dep

View File

@ -1,54 +0,0 @@
diff --git a/meson.build b/meson.build
index f7bdbda..3351e53 100644
--- a/meson.build
+++ b/meson.build
@@ -1,21 +1,15 @@
project('BestSource', 'cpp',
- default_options: ['buildtype=release', 'b_lto=true', 'b_ndebug=if-release', 'cpp_std=c++17'],
+ default_options: ['buildtype=release', 'b_ndebug=if-release', 'cpp_std=c++17'],
license: 'MIT',
meson_version: '>=0.53.0',
- version: '.'.join([
- run_command('grep', 'BEST_SOURCE_VERSION_MAJOR', 'src/version.h', check: true).stdout().strip().split()[2],
- run_command('grep', 'BEST_SOURCE_VERSION_MINOR', 'src/version.h', check: true).stdout().strip().split()[2]
- ])
)
link_static = get_option('link_static')
sources = [
'src/audiosource.cpp',
- 'src/avisynth.cpp',
'src/bsshared.cpp',
'src/tracklist.cpp',
- 'src/vapoursynth.cpp',
'src/videosource.cpp'
]
@@ -46,10 +40,7 @@ if host_machine.cpu_family().startswith('x86')
)
endif
-vapoursynth_dep = dependency('vapoursynth', version: '>=55').partial_dependency(compile_args: true, includes: true)
-
deps = [
- vapoursynth_dep,
dependency('libavcodec', version: '>=60.31.0', static: link_static),
dependency('libavformat', version: '>=60.16.0', static: link_static),
dependency('libavutil', version: '>=58.29.0', static: link_static),
@@ -65,12 +56,12 @@ elif is_gnu_linker
link_args += ['-Wl,-Bsymbolic']
endif
-shared_module('bestsource', sources,
+bs_lib = static_library('bestsource', sources,
cpp_args: ['-D_FILE_OFFSET_BITS=64'],
dependencies: deps,
gnu_symbol_visibility: 'hidden',
- install: true,
- install_dir: vapoursynth_dep.get_variable(pkgconfig: 'libdir') / 'vapoursynth',
link_args: link_args,
link_with: libs
)
+
+bestsource_dep = declare_dependency(link_with: bs_lib, include_directories: include_directories('src'))

View File

@ -57,10 +57,6 @@ echo "---- Mounting image ----"
DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify -noautoopen "${DMG_RW_PATH}" |awk '/GUID_partition_scheme/ {print $1}'`
echo "Device name: ${DEV_NAME}"
echo
echo "---- Setting bless -openfolder ----"
bless -openfolder "/Volumes/${PKG_NAME_VOLUME}"
echo
echo "---- Setting root icon using SetFile ----"
SetFile -a C "/Volumes/${PKG_NAME_VOLUME}"