summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/SPIRV-Cross.wrap4
-rw-r--r--subprojects/ffmpeg.wrap8
-rw-r--r--subprojects/libalabaster.wrap2
-rw-r--r--subprojects/libnaunet.wrap2
-rw-r--r--subprojects/libplacebo.wrap6
-rw-r--r--subprojects/miniaudio.wrap4
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build2
-rw-r--r--subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff14
-rw-r--r--subprojects/packagefiles/libplacebo/dependency_version_override.diff24
-rw-r--r--subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff58
-rw-r--r--subprojects/stela.wrap2
11 files changed, 57 insertions, 69 deletions
diff --git a/subprojects/SPIRV-Cross.wrap b/subprojects/SPIRV-Cross.wrap
index c6ff02b..58f9d79 100644
--- a/subprojects/SPIRV-Cross.wrap
+++ b/subprojects/SPIRV-Cross.wrap
@@ -1,6 +1,6 @@
[wrap-git]
-directory = SPIRV-Cross-2c32b6b
+directory = SPIRV-Cross-1823c11
url = https://github.com/KhronosGroup/SPIRV-Cross.git
-revision = 2c32b6bf86f3c4a5539aa1f0bacbd59fe61759cf
+revision = 1823c119c4d7311469199c1afecf2e255e26eb16
depth = 1
method = cmake
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap
index e6f7abf..fdd551c 100644
--- a/subprojects/ffmpeg.wrap
+++ b/subprojects/ffmpeg.wrap
@@ -7,6 +7,8 @@ directory = ffmpeg-7.1.1
#directory = ffmpeg-7.0
#directory = ffmpeg-6.1.1
#directory = ffmpeg-5.1.4
+#directory = ffmpeg-4.4.5
+
source_url = https://ffmpeg.org/releases/ffmpeg-7.1.1.tar.gz
#source_url = https://ffmpeg.org/releases/ffmpeg-7.1.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-5.1.6.tar.gz
@@ -15,6 +17,8 @@ source_url = https://ffmpeg.org/releases/ffmpeg-7.1.1.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-7.0.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-5.1.4.tar.gz
+#source_url = https://www.ffmpeg.org/releases/ffmpeg-4.4.5.tar.gz
+
source_filename = ffmpeg-7.1.1.tar.gz
#source_filename = ffmpeg-7.1.tar.gz
#source_filename = ffmpeg-5.1.6.tar.gz
@@ -23,6 +27,8 @@ source_filename = ffmpeg-7.1.1.tar.gz
#source_filename = ffmpeg-7.0.tar.gz
#source_filename = ffmpeg-6.1.1.tar.gz
#source_filename = ffmpeg-5.1.4.tar.gz
+#source_filename = ffmpeg-4.4.5.tar.gz
+
source_hash = 9a6e57a446b671012612aaeb9df5126794d5ac8f2015ca220934f99a6a4e0601
#source_hash = 42a7dc0d1583885d1b8f6559fa7ce28f97acafea6803de6a8f73e3ba229348bd
#source_hash = 2a963f9f627dc55cac7ce4d2bb2e063ce52c8ab57185d2b592a631c36be56fda
@@ -31,4 +37,6 @@ source_hash = 9a6e57a446b671012612aaeb9df5126794d5ac8f2015ca220934f99a6a4e0601
#source_hash = 943a2a28044947c17a905c39075494b0da46ec0795224c2c61eff986518321eb
#source_hash = b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb
#source_hash = ad1d83e0f022ba405928ea4985c9cab978c4698bb7937738a1085808c3eb78b4
+#source_hash = 77e0eedd8ebeafde5807011e700fdea82b306b9f76fe469b4abc5dfefd9579bd
+
patch_directory = ffmpeg
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index adaec6a..014f5ab 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libalabaster
-revision = 31715673a5b98991ef276decbd90f026559eaf4b
+revision = cf45d71c49a7e7364b315dcc45fe7eac060590df
depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index a869e82..609cb77 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libnaunet
-revision = ce102493f377d0452e44c3a4bb6e6e15ab0c819d
+revision = b4e45dd89e6dd53d8cb940e5609b812e19ade913
depth = 1
diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap
index 23885d4..594c0d2 100644
--- a/subprojects/libplacebo.wrap
+++ b/subprojects/libplacebo.wrap
@@ -1,11 +1,11 @@
[wrap-git]
-directory = libplacebo-056b852
+directory = libplacebo-300ebb1
url = https://code.videolan.org/videolan/libplacebo.git
-revision = 056b852018db04aa2ebc0982e27713afcea8106b
+revision = 300ebb182f90036e4b635ad7db0f425f0e57653a
clone-recursive = true
depth = 1
-diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/no_dlltool_no_shaderc_version.diff, libplacebo/compiler_warnings.diff, libplacebo/glClientWaitSync_0_return.diff, libplacebo/info_priv_hash.diff
+diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/dependency_version_override.diff, libplacebo/compiler_warnings.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 2483267..f643ff8 100644
--- a/subprojects/miniaudio.wrap
+++ b/subprojects/miniaudio.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = miniaudio-445cdcb
+directory = miniaudio-484a564
url = https://github.com/mackron/miniaudio.git
-revision = 445cdcb82bb948e0d78e8a7c11aa28a2b4d1b198
+revision = 484a56499d3e03a5f6fa8702bdc5a8ab0817c7ac
depth = 1
patch_directory = miniaudio
diff_files = miniaudio/miniaudio_pulse_flush.diff, miniaudio/miniaudio_alsa_compile.diff
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 8aa2f02..f50f30f 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -58,7 +58,7 @@ decoders += ',dca'
#decoders += ',pcm_dvd,mpegvideo,mpeg2video'
#decoders += ',ass,srt'
-demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,gif,matroska,mov'
+demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,gif,matroska,mov,avi'
#demuxers += ',mpegts,mpegtsraw,mpegps,mpegvideo'
#demuxers += ',ass,srt'
diff --git a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff
new file mode 100644
index 0000000..ba59ad8
--- /dev/null
+++ b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff
@@ -0,0 +1,14 @@
+diff --git a/src/d3d11/swapchain.c b/src/d3d11/swapchain.c
+index 8a53632..bbe5182 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,
+ .Format = format,
+ .SampleDesc.Count = 1,
+ .BufferUsage = DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT,
+- .Flags = params->flags,
++ .Scaling = DXGI_SCALING_NONE,
++ .Flags = params->flags
+ };
+
+ if (ID3D11Device_GetFeatureLevel(ctx->dev) >= D3D_FEATURE_LEVEL_11_0)
diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff
new file mode 100644
index 0000000..f9a0688
--- /dev/null
+++ b/subprojects/packagefiles/libplacebo/dependency_version_override.diff
@@ -0,0 +1,24 @@
+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 8fb5e69..4adfa18 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
diff --git a/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff b/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff
deleted file mode 100644
index a579431..0000000
--- a/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/glsl/meson.build b/src/glsl/meson.build
-index 5a88196..d6bb430 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
-diff --git a/src/meson.build b/src/meson.build
-index 6162f8f..f93eb4c 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -18,24 +18,24 @@ link_args = []
- link_depends = []
-
- # Looks like meson in certain configuration returns ' ' instead of empty string
--mingw32 = cc.get_define('__MINGW32__').strip()
--if host_machine.system() == 'windows' and mingw32 != '' and host_machine.cpu() in ['aarch64', 'arm', 'x86_64']
-- # MinGW-w64 math functions are significantly slower than the UCRT ones.
-- # In particular powf is over 7 times slower than UCRT counterpart.
-- # MinGW-w64 explicitly excludes some math functions from their ucrtbase def
-- # file and replaces with own versions. To workaround the issue, generate the
-- # import library and link it with UCRT versions of math functions.
-- dlltool = find_program('llvm-dlltool', 'dlltool')
-- ucrt_math = custom_target('ucrt_math.lib',
-- output : ['ucrt_math.lib'],
-- input : 'ucrt_math.def',
-- command : [dlltool, '-d', '@INPUT@', '-l', '@OUTPUT@'])
-- link_args += ucrt_math.full_path()
-- link_depends += ucrt_math
-- # MinGW-w64 inlines functions like powf, rewriting them to pow. We want to use
-- # the powf specialization from UCRT, so disable inlining.
-- add_project_arguments(['-D__CRT__NO_INLINE'], language: ['c', 'cpp'])
--endif
-+#mingw32 = cc.get_define('__MINGW32__').strip()
-+#if host_machine.system() == 'windows' and mingw32 != '' and host_machine.cpu() in ['aarch64', 'arm', 'x86_64']
-+# # MinGW-w64 math functions are significantly slower than the UCRT ones.
-+# # In particular powf is over 7 times slower than UCRT counterpart.
-+# # MinGW-w64 explicitly excludes some math functions from their ucrtbase def
-+# # file and replaces with own versions. To workaround the issue, generate the
-+# # import library and link it with UCRT versions of math functions.
-+# dlltool = find_program('llvm-dlltool', 'dlltool')
-+# ucrt_math = custom_target('ucrt_math.lib',
-+# output : ['ucrt_math.lib'],
-+# input : 'ucrt_math.def',
-+# command : [dlltool, '-d', '@INPUT@', '-l', '@OUTPUT@'])
-+# link_args += ucrt_math.full_path()
-+# link_depends += ucrt_math
-+# # MinGW-w64 inlines functions like powf, rewriting them to pow. We want to use
-+# # the powf specialization from UCRT, so disable inlining.
-+# add_project_arguments(['-D__CRT__NO_INLINE'], language: ['c', 'cpp'])
-+#endif
-
- # Work around missing atomics on some (obscure) platforms
- atomic_test = '''
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index 004179f..3d8c7ad 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/stela
-revision = 95e41dbad47f6c5d3868143b46938ec25582b6f1
+revision = d7f90f660e2a944cd60f3c72906e2c7cd0ab4203
depth = 1
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 20:44:52 +0000