Smaller stuff that went uncommitted

Signed-off-by: Andrew Opalach <andrew@akon.city>

7 files changed, 64 insertions, 94 deletions

diff --git a/subprojects/packagefiles/BLAKE3/CMakeLists.txt b/subprojects/packagefiles/BLAKE3/CMakeLists.txt
index 75b4aea..b32c9e3 100644
--- a/subprojects/packagefiles/BLAKE3/CMakeLists.txt
+++ b/subprojects/packagefiles/BLAKE3/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.9...3.18 FATAL_ERROR)
 add_subdirectory(c)
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index f813c8f..36bae60 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -6,6 +6,7 @@ cpu = target_machine.cpu_family()
 is_64bit = (cpu == 'x86_64' or cpu == 'aarch64')
 is_debug = get_option('debug')
 is_minsize = get_option('optimization') == 's'
+is_lto = get_option('b_lto')
 is_linux = host_machine.system() == 'linux'
 is_windows = host_machine.system() == 'windows'
 is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl'
@@ -25,11 +26,15 @@ if is_minsize
   extra_options += ['--enable-small']
 endif
 
+if is_lto
+  extra_options += ['--enable-lto']
+endif
+
 extra_options += ['--arch=' + cpu]
 extra_options += ['--cc=' + compiler.cmd_array()[0]]
 if meson.is_cross_build()
   if is_msvc
-    extra_options += ['--ld=' + compiler.get_linker_id()]
+    extra_options += ['--ld=' + meson.get_external_property('ld')]
   endif
   extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
   extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
@@ -67,19 +72,16 @@ decoders += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le'
 #decoders += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar'
 decoders += ',dca,eac3'
 decoders += ',pcm_dvd,mpegvideo,mpeg2video'
+decoders += ',av1'
 #decoders += ',ass,srt'
-if get_option('codec-hwaccels').length() == 0
-  if not is_msvc
-    libdav1d = dependency('dav1d', required: false)
-    if libdav1d.found()
-      decoders += ',libdav1d'
-      extra_options += ['--enable-libdav1d']
-      deps += [libdav1d]
-    endif
+#if get_option('codec-hwaccels').length() == 0
+  libdav1d = dependency('dav1d', required: false)
+  if libdav1d.found()
+    decoders += ',libdav1d'
+    extra_options += ['--enable-libdav1d']
+    deps += [libdav1d]
   endif
-else
-  decoders += ',av1'
-endif
+#endif
 
 demuxers = ''
 parsers = ''
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.diff
new file mode 100644
index 0000000..9b87011
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.diff
@@ -0,0 +1,29 @@
+--- a/meson.build	2025-08-23 18:44:34.634014892 -0400
++++ b/meson.build	2025-08-25 15:33:36.209533531 -0400
+@@ -1,4 +1,4 @@
+-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
++project('ffmpeg', 'c', version: '8.1', meson_version: '>=0.57.0')
+ 
+ compiler = meson.get_compiler('c')
+ 
+@@ -268,14 +268,14 @@
+ swscale = proj.dependency('swscale')
+ include = include_directories('.', 'build/')
+ meson.override_dependency('libavutil', declare_dependency(
+-  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: ''))
++  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '60.26.100'))
+ meson.override_dependency('libavformat', declare_dependency(
+-  dependencies: [avformat], include_directories: include, version: ''))
++  dependencies: [avformat], include_directories: include, version: '62.12.100'))
+ meson.override_dependency('libavcodec', declare_dependency(
+-  dependencies: [avcodec], include_directories: include, version: ''))
++  dependencies: [avcodec], include_directories: include, version: '62.28.100'))
+ meson.override_dependency('libavdevice', declare_dependency(
+-  dependencies: [avdevice], include_directories: include, version: ''))
++  dependencies: [avdevice], include_directories: include, version: '62.3.100'))
+ meson.override_dependency('libswresample', declare_dependency(
+-  dependencies: [swresample], include_directories: include, version: ''))
++  dependencies: [swresample], include_directories: include, version: '6.3.100'))
+ meson.override_dependency('libswscale', declare_dependency(
+-  dependencies: [swscale], include_directories: include, version: ''))
++  dependencies: [swscale], include_directories: include, version: '9.5.100'))
diff --git a/subprojects/packagefiles/harfbuzz/no_bigobj_windows.diff b/subprojects/packagefiles/harfbuzz/no_bigobj_windows.diff
new file mode 100644
index 0000000..89c4b38
--- /dev/null
+++ b/subprojects/packagefiles/harfbuzz/no_bigobj_windows.diff
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 1ce5f01..249c1d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -80,9 +80,9 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') !=
+ endif
+ 
+ if host_machine.system() == 'windows'
+-  add_project_arguments(cpp.get_supported_arguments([
+-    '-Wa,-mbig-obj'
+-  ]), language : 'cpp')
++  #add_project_arguments(cpp.get_supported_arguments([
++  #  '-Wa,-mbig-obj'
++  #]), language : 'cpp')
+ endif
+ 
+ check_headers = [
diff --git a/subprojects/packagefiles/libplacebo/compiler_warnings.diff b/subprojects/packagefiles/libplacebo/compiler_warnings.diff
deleted file mode 100644
index f3ec3af..0000000
--- a/subprojects/packagefiles/libplacebo/compiler_warnings.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/include/libplacebo/utils/libav_internal.h b/src/include/libplacebo/utils/libav_internal.h
-index 06b151b..67ac387 100644
---- a/src/include/libplacebo/utils/libav_internal.h
-+++ b/src/include/libplacebo/utils/libav_internal.h
-@@ -59,11 +59,14 @@ PL_LIBAV_API enum pl_color_system pl_system_from_av(enum AVColorSpace spc)
-     case AVCOL_SPC_SMPTE170M:           return PL_COLOR_SYSTEM_BT_601;
-     case AVCOL_SPC_SMPTE240M:           return PL_COLOR_SYSTEM_SMPTE_240M;
-     case AVCOL_SPC_YCGCO:               return PL_COLOR_SYSTEM_YCGCO;
-+    case AVCOL_SPC_YCGCO_RE:            return PL_COLOR_SYSTEM_UNKNOWN; // missing
-+    case AVCOL_SPC_YCGCO_RO:            return PL_COLOR_SYSTEM_UNKNOWN; // missing
-     case AVCOL_SPC_BT2020_NCL:          return PL_COLOR_SYSTEM_BT_2020_NC;
-     case AVCOL_SPC_BT2020_CL:           return PL_COLOR_SYSTEM_BT_2020_C;
-     case AVCOL_SPC_SMPTE2085:           return PL_COLOR_SYSTEM_UNKNOWN; // missing
-     case AVCOL_SPC_CHROMA_DERIVED_NCL:  return PL_COLOR_SYSTEM_UNKNOWN; // missing
-     case AVCOL_SPC_CHROMA_DERIVED_CL:   return PL_COLOR_SYSTEM_UNKNOWN; // missing
-+    case AVCOL_SPC_IPT_C2:              return PL_COLOR_SYSTEM_UNKNOWN; // missing
-     // Note: this colorspace is confused between PQ and HLG, which libav*
-     // requires inferring from other sources, but libplacebo makes explicit.
-     // Default to PQ as it's the more common scenario.
diff --git a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff
index ba59ad8..e859a21 100644
--- a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff
+++ b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff
@@ -1,13 +1,13 @@
 diff --git a/src/d3d11/swapchain.c b/src/d3d11/swapchain.c
-index 8a53632..bbe5182 100644
+index dd3c0cc..ed151bf 100644
 --- a/src/d3d11/swapchain.c
 +++ b/src/d3d11/swapchain.c
-@@ -456,7 +456,8 @@ static HRESULT create_swapchain_1_2(struct d3d11_ctx *ctx,
+@@ -466,7 +466,8 @@ static HRESULT create_swapchain_1_2(struct d3d11_ctx *ctx,
          .Format = format,
          .SampleDesc.Count = 1,
          .BufferUsage = DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT,
 -        .Flags = params->flags,
-+        .Scaling = DXGI_SCALING_NONE,
++        .Scaling = flip ? DXGI_SCALING_NONE : DXGI_SCALING_STRETCH,
 +        .Flags = params->flags
      };
  
diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff
deleted file mode 100644
index 1ee6169..0000000
--- a/subprojects/packagefiles/libplacebo/dependency_version_override.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build
-index d4c4b44..ef96256 100644
---- a/src/d3d11/meson.build
-+++ b/src/d3d11/meson.build
-@@ -5,7 +5,7 @@ d3d11_headers_extra = [ # needed internally
-   cc.check_header('dxgi1_6.h', required: d3d11),
- ]
- d3d11_deps = [
--  dependency('spirv-cross-c-shared', version: '>=0.29.0', required: d3d11),
-+  dependency('spirv-cross-c-shared', required: d3d11),
-   cc.find_library('version', required: d3d11),
- ]
- 
-diff --git a/src/glsl/meson.build b/src/glsl/meson.build
-index b1f4c8d..9b3a5bb 100644
---- a/src/glsl/meson.build
-+++ b/src/glsl/meson.build
-@@ -1,5 +1,5 @@
- # shaderc
--shaderc = dependency('shaderc', version: '>=2019.1', required: get_option('shaderc'))
-+shaderc = dependency('shaderc', required: get_option('shaderc'))
- components.set('shaderc', shaderc.found())
- if shaderc.found()
-   build_deps += shaderc
-@@ -29,8 +29,9 @@ if glslang_req.auto() and shaderc.found()
- 
- elif not glslang_req.disabled()
- 
-+  prefer_static = get_option('prefer_static')
-   glslang_deps = [
--    cxx.find_library('glslang-default-resource-limits', required: false)
-+    dependency('glslang-default-resource-limits', static: prefer_static)
-   ]
- 
-   # meson doesn't respect generator expressions in INTERFACE_LINK_LIBRARIES
-@@ -38,13 +39,12 @@ elif not glslang_req.disabled()
-   # TODO: Use the following once it's fixed
-   # glslang = dependency('glslang', method: 'cmake', modules: ['glslang::SPIRV'])
- 
--  prefer_static = get_option('prefer_static')
-   found_lib = false
-   foreach arg : [[prefer_static, false], [not prefer_static, glslang_req]]
-     static   = arg[0]
-     required = arg[1]
- 
--    spirv = cxx.find_library('SPIRV', required: required, static: static)
-+    spirv = dependency('SPIRV', static: static)
- 
-     if not spirv.found()
-       continue
-@@ -54,7 +54,7 @@ elif not glslang_req.disabled()
- 
-     # Glslang 15.0.0 moved some code around, add also linking to glslang, while
-     # this is not needed for older versions, it will still work.
--    glslang_deps += cxx.find_library('glslang', required: required, static: static)
-+    glslang_deps += dependency('glslang', static: static)
- 
-     if static
-       glslang_deps += [