From 7475425dcb9a96309113e498c76e58f19ca544a5 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Thu, 30 May 2024 22:31:30 +0200 Subject: [PATCH 1/3] osx: Remove bless -openfolder This was deprecated for a while now and removed on aarch64. The dmg build works without it now. --- tools/osx-dmg.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/osx-dmg.sh b/tools/osx-dmg.sh index 24a9ec64b..4c431a3c3 100755 --- a/tools/osx-dmg.sh +++ b/tools/osx-dmg.sh @@ -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}" From 0a01ecf9cef52ab05432dd04ddf99ae4a380cc9b Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:06:58 +0800 Subject: [PATCH 2/3] bestsource: Bump to R4 --- meson.build | 2 +- src/audio_provider_bestsource.cpp | 2 +- src/video_provider_bestsource.cpp | 2 +- subprojects/bestsource.wrap | 3 +- .../packagefiles/bestsource/0001.patch | 54 ------------------- 5 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 subprojects/packagefiles/bestsource/0001.patch diff --git a/meson.build b/meson.build index 2777bf4a0..f63da9986 100644 --- a/meson.build +++ b/meson.build @@ -224,7 +224,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: ['prefer_static=' + (get_option('default_library') == 'static').to_string(), 'enable_plugin=false']) deps += bs.get_variable('bestsource_dep') dep_avail += 'BestSource' needs_ffmpeg = true diff --git a/src/audio_provider_bestsource.cpp b/src/audio_provider_bestsource.cpp index 50479ec32..74c991142 100644 --- a/src/audio_provider_bestsource.cpp +++ b/src/audio_provider_bestsource.cpp @@ -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(filename.string(), static_cast(track), -1, false, 0, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) { + bs = agi::make_unique(filename.string(), static_cast(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(); }); diff --git a/src/video_provider_bestsource.cpp b/src/video_provider_bestsource.cpp index 42196dd65..efde8532a 100644 --- a/src/video_provider_bestsource.cpp +++ b/src/video_provider_bestsource.cpp @@ -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(filename.string(), "", 0, static_cast(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(filename.string(), "", 0, static_cast(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(); }); diff --git a/subprojects/bestsource.wrap b/subprojects/bestsource.wrap index a1eefcf03..d2378ea0b 100644 --- a/subprojects/bestsource.wrap +++ b/subprojects/bestsource.wrap @@ -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 diff --git a/subprojects/packagefiles/bestsource/0001.patch b/subprojects/packagefiles/bestsource/0001.patch deleted file mode 100644 index e9beef4aa..000000000 --- a/subprojects/packagefiles/bestsource/0001.patch +++ /dev/null @@ -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')) From b8f09069064daadc8dcd2ea22fe7860dc4ef07e4 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Thu, 30 May 2024 23:12:28 +0200 Subject: [PATCH 3/3] bestsource: Don't set any prefer_static argument This should no longer be needed at all --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f63da9986..650586751 100644 --- a/meson.build +++ b/meson.build @@ -224,7 +224,7 @@ needs_ffmpeg = false if get_option('bestsource').enabled() conf.set('WITH_BESTSOURCE', 1) - bs = subproject('bestsource', default_options: ['prefer_static=' + (get_option('default_library') == 'static').to_string(), 'enable_plugin=false']) + bs = subproject('bestsource', default_options: ['enable_plugin=false']) deps += bs.get_variable('bestsource_dep') dep_avail += 'BestSource' needs_ffmpeg = true