summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/BLAKE3.wrap4
-rw-r--r--subprojects/SPIRV-Cross.wrap4
-rw-r--r--subprojects/ffmpeg8.wrap15
-rw-r--r--subprojects/freetype2.wrap4
-rw-r--r--subprojects/harfbuzz.wrap4
-rw-r--r--subprojects/libalabaster.wrap4
-rw-r--r--subprojects/libnaunet.wrap4
-rw-r--r--subprojects/libplacebo.wrap6
-rw-r--r--subprojects/miniaudio.wrap4
-rw-r--r--subprojects/packagefiles/BLAKE3/CMakeLists.txt2
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build26
-rw-r--r--subprojects/packagefiles/ffmpeg/version_8.1.diff29
-rw-r--r--subprojects/packagefiles/harfbuzz/no_bigobj_windows.diff17
-rw-r--r--subprojects/packagefiles/libplacebo/compiler_warnings.diff19
-rw-r--r--subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff6
-rw-r--r--subprojects/packagefiles/libplacebo/dependency_version_override.diff59
-rw-r--r--subprojects/shaderc.wrap4
-rw-r--r--subprojects/stela.wrap4
18 files changed, 95 insertions, 120 deletions
diff --git a/subprojects/BLAKE3.wrap b/subprojects/BLAKE3.wrap
index 8cfea07..2246292 100644
--- a/subprojects/BLAKE3.wrap
+++ b/subprojects/BLAKE3.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = BLAKE3-1.8.2
+directory = BLAKE3-1.8.3
url = https://github.com/BLAKE3-team/BLAKE3.git
-revision = 1.8.2
+revision = 1.8.3
depth = 1
patch_directory = BLAKE3
method = cmake
diff --git a/subprojects/SPIRV-Cross.wrap b/subprojects/SPIRV-Cross.wrap
index 867f649..6532667 100644
--- a/subprojects/SPIRV-Cross.wrap
+++ b/subprojects/SPIRV-Cross.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = SPIRV-Cross-4f77a07
+directory = SPIRV-Cross-7bfcf72
url = https://github.com/KhronosGroup/SPIRV-Cross.git
-revision = 4f77a07af0dcadd0f59d6eb78dc879abdd1d7400
+revision = 7bfcf72ad28d1429deddff6c71b71c81b40b7063
depth = 1
method = cmake
patch_directory = SPIRV-Cross
diff --git a/subprojects/ffmpeg8.wrap b/subprojects/ffmpeg8.wrap
index b91ff38..0845c5e 100644
--- a/subprojects/ffmpeg8.wrap
+++ b/subprojects/ffmpeg8.wrap
@@ -1,8 +1,13 @@
[wrap-file]
-directory = ffmpeg-8.0.1
-source_url = https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.gz
-source_filename = ffmpeg-8.0.1.tar.gz
-source_hash = ed1cfade43aab7711c88937a0afc15b7b22efdc528c6ff074b4027c55a3c175c
+#directory = ffmpeg-8.0.1
+directory = ffmpeg-8.1
+#source_url = https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.gz
+source_url = https://ffmpeg.org/releases/ffmpeg-8.1.tar.gz
+#source_filename = ffmpeg-8.0.1.tar.gz
+source_filename = ffmpeg-8.1.tar.gz
+#source_hash = ed1cfade43aab7711c88937a0afc15b7b22efdc528c6ff074b4027c55a3c175c
+source_hash = b13510e7a6a4ca28fa04307f2be54ef5a31e168eb2bbe055a7f4e4d2cadd51b1
patch_directory = ffmpeg
-diff_files = ffmpeg/version_8.0.1.diff, ffmpeg/msvc_build_conform.diff
+#diff_files = ffmpeg/version_8.0.1.diff, ffmpeg/msvc_build_conform.diff
+diff_files = ffmpeg/version_8.1.diff
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index 1604e96..a2d99d8 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = freetype-2.13.3
+directory = freetype-2.14.3
url = https://gitlab.freedesktop.org/freetype/freetype.git
-revision = VER-2-13-3
+revision = VER-2-14-3
depth = 1
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
index 5c92997..55964d7 100644
--- a/subprojects/harfbuzz.wrap
+++ b/subprojects/harfbuzz.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = harfbuzz-12.2.0
+directory = harfbuzz-14.1.0
url = https://github.com/harfbuzz/harfbuzz.git
-revision = 12.2.0
+revision = 14.1.0
depth = 1
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 4b277ec..7a55d18 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = libalabaster-b5b7657
+directory = libalabaster-c633226
url = https://git.akon.city/libalabaster.git
push-url = git@git.akon.city:libalabaster.git
-revision = b5b765781482a7b3ff6026ea71b4eb35a0a155d0
+revision = c633226d2b615f46ef38cc99603775dccdf96ecd
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 531910f..25cdba2 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = libnaunet-1e0f603
+directory = libnaunet-a389b8f
url = https://git.akon.city/libnaunet.git
push-url = git@git.akon.city:libnaunet.git
-revision = 1e0f60341192c79bf49e84e6b187ffb7bfded252
+revision = a389b8f2f9c55b76fe5a28c3f1fea798ed37aa98
diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap
index b84b3b6..b0575cf 100644
--- a/subprojects/libplacebo.wrap
+++ b/subprojects/libplacebo.wrap
@@ -1,11 +1,11 @@
[wrap-git]
-directory = libplacebo-53719e4
+directory = libplacebo-54e5275
url = https://code.videolan.org/videolan/libplacebo.git
-revision = 53719e45d264d90d422f51e1fa21a2957131bf1a
+revision = 54e527552fa74467bcc7692e6985d35540861d19
clone-recursive = true
depth = 1
-diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/dependency_version_override.diff, libplacebo/glClientWaitSync_0_return.diff, libplacebo/info_priv_hash.diff, libplacebo/d3d11_scaling_none.diff
+diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/glClientWaitSync_0_return.diff, libplacebo/info_priv_hash.diff, libplacebo/d3d11_scaling_none.diff
[provide]
dependency_names = libplacebo
diff --git a/subprojects/miniaudio.wrap b/subprojects/miniaudio.wrap
index 8c89803..017b566 100644
--- a/subprojects/miniaudio.wrap
+++ b/subprojects/miniaudio.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = miniaudio-0.11.23
+directory = miniaudio-0.11.25
url = https://github.com/mackron/miniaudio.git
-revision = 0.11.23
+revision = 0.11.25
depth = 1
patch_directory = miniaudio
diff_files = miniaudio/miniaudio_pulse_flush.diff, miniaudio/miniaudio_wasapi_drain_tweak.diff
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 += [
diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc.wrap
index efef095..e724e01 100644
--- a/subprojects/shaderc.wrap
+++ b/subprojects/shaderc.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = shaderc-v2025.5
+directory = shaderc-v2026.1
url = https://github.com/google/shaderc.git
-revision = v2025.5
+revision = v2026.1
depth = 1
method = cmake
patch_directory = shaderc
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index fda63dd..d2b9aeb 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = stela-22e9e4d
+directory = stela-0d027c4
url = https://git.akon.city/stela.git
push-url = git@git.akon.city:stela.git
-revision = 22e9e4d6e2c2e8e5eea065e5b7cd04fa6626559c
+revision = 0d027c466c199f9857b0872ed76ebab2ed501e43
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 20:08:30 +0000