summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/ffmpeg8.wrap20
-rw-r--r--subprojects/harfbuzz.wrap4
-rw-r--r--subprojects/libass.wrap4
-rw-r--r--subprojects/libplacebo.wrap4
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build6
-rw-r--r--subprojects/packagefiles/ffmpeg/version_3.3.9.diff39
-rw-r--r--subprojects/packagefiles/ffmpeg/version_8.1.1.diff29
-rw-r--r--subprojects/packagefiles/ffmpeg/version_8.1.2.diff29
-rw-r--r--subprojects/packagefiles/shaderc/spirv_tools_build_version.diff21
-rw-r--r--subprojects/shaderc.wrap4
-rw-r--r--subprojects/stela.wrap4
11 files changed, 124 insertions, 40 deletions
diff --git a/subprojects/ffmpeg8.wrap b/subprojects/ffmpeg8.wrap
index 0845c5e..f8ee90f 100644
--- a/subprojects/ffmpeg8.wrap
+++ b/subprojects/ffmpeg8.wrap
@@ -1,13 +1,23 @@
[wrap-file]
#directory = ffmpeg-8.0.1
-directory = ffmpeg-8.1
+#directory = ffmpeg-8.1
+#directory = ffmpeg-8.1.1
+directory = ffmpeg-8.1.2
#source_url = https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.gz
-source_url = https://ffmpeg.org/releases/ffmpeg-8.1.tar.gz
+#source_url = https://ffmpeg.org/releases/ffmpeg-8.1.tar.gz
+#source_url = https://ffmpeg.org/releases/ffmpeg-8.1.1.tar.gz
+source_url = https://ffmpeg.org/releases/ffmpeg-8.1.2.tar.gz
#source_filename = ffmpeg-8.0.1.tar.gz
-source_filename = ffmpeg-8.1.tar.gz
+#source_filename = ffmpeg-8.1.tar.gz
+#source_filename = ffmpeg-8.1.1.tar.gz
+source_filename = ffmpeg-8.1.2.tar.gz
#source_hash = ed1cfade43aab7711c88937a0afc15b7b22efdc528c6ff074b4027c55a3c175c
-source_hash = b13510e7a6a4ca28fa04307f2be54ef5a31e168eb2bbe055a7f4e4d2cadd51b1
+#source_hash = b13510e7a6a4ca28fa04307f2be54ef5a31e168eb2bbe055a7f4e4d2cadd51b1
+#source_hash = 1b856f26a07082b6879f3e5300d81e8c7ce3b410ade5898b14382d90c2904634
+source_hash = 32faba5ef67340d54724941eae1425580791195312a4fd13bf6f820a2818bf22
patch_directory = ffmpeg
#diff_files = ffmpeg/version_8.0.1.diff, ffmpeg/msvc_build_conform.diff
-diff_files = ffmpeg/version_8.1.diff
+#diff_files = ffmpeg/version_8.1.diff
+#diff_files = ffmpeg/version_8.1.1.diff
+diff_files = ffmpeg/version_8.1.2.diff
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
index 55964d7..07c333c 100644
--- a/subprojects/harfbuzz.wrap
+++ b/subprojects/harfbuzz.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = harfbuzz-14.1.0
+directory = harfbuzz-14.2.1
url = https://github.com/harfbuzz/harfbuzz.git
-revision = 14.1.0
+revision = 14.2.1
depth = 1
diff --git a/subprojects/libass.wrap b/subprojects/libass.wrap
index fa50802..2b9ecdd 100644
--- a/subprojects/libass.wrap
+++ b/subprojects/libass.wrap
@@ -1,6 +1,6 @@
[wrap-git]
-directory = libass-0.17.4
+directory = libass-0.17.5
url = https://github.com/libass/libass.git
-revision = 0.17.4
+revision = 0.17.5
clone-recursive = true
depth = 1
diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap
index b0575cf..a16dd82 100644
--- a/subprojects/libplacebo.wrap
+++ b/subprojects/libplacebo.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = libplacebo-54e5275
+directory = libplacebo-05ac2cc
url = https://code.videolan.org/videolan/libplacebo.git
-revision = 54e527552fa74467bcc7692e6985d35540861d19
+revision = 05ac2cca6571c04d06369a26825d207781b73f32
clone-recursive = true
depth = 1
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 36bae60..7481dea 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -107,10 +107,10 @@ if ffmpeg_image_codecs
zlib = dependency('zlib', required: false)
if zlib.found()
extra_options += ['--enable-zlib']
- decoders += ',png,apng,mjpeg,jpeg2000,webp,gif,'
+ decoders += ',png,apng,mjpeg,jpeg2000,webp,gif,psd'
if not get_option('sink-only')
- demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,image_webp_pipe,gif'
- parsers += ',png,mjpeg,jpeg2000,webp,gif'
+ demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,image_webp_pipe,gif,image_psd_pipe'
+ parsers += ',png,mjpeg,jpeg2000,webp,gif,psd'
endif
deps += [zlib]
else
diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
index 90911d5..7e91e5d 100644
--- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
+++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
@@ -1,12 +1,12 @@
---- a/meson.build 2025-11-30 11:51:43.747121512 -0500
-+++ b/meson.build 2025-11-30 12:55:07.519116860 -0500
+--- a/meson.build 2026-07-02 16:36:02.258920727 -0400
++++ b/meson.build 2026-07-02 16:49:06.795636508 -0400
@@ -1,4 +1,4 @@
-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
+project('ffmpeg', 'c', version: '3.3.9', meson_version: '>=0.57.0')
compiler = meson.get_compiler('c')
-@@ -35,10 +35,6 @@
+@@ -40,10 +40,6 @@
extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
endif
@@ -17,27 +17,22 @@
extra_options += ['--enable-static', '--disable-shared']
if is_windows
-@@ -68,18 +64,7 @@
- decoders += ',dca,eac3'
+@@ -74,14 +70,6 @@
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
-+decoders += ',av1'
+-#endif
demuxers = ''
parsers = ''
-@@ -195,12 +180,8 @@
+@@ -197,12 +185,8 @@
# Disable unused hwaccels.
extra_options += [
@@ -50,7 +45,7 @@
'--disable-nvenc',
'--disable-vdpau',
'--disable-audiotoolbox',
-@@ -243,6 +224,15 @@
+@@ -245,6 +229,15 @@
args += ['-DCAMU_HAVE_SOXR']
endif
@@ -66,7 +61,7 @@
ext_proj = import('unstable-external_project')
proj = ext_proj.add_project('configure',
-@@ -252,7 +242,6 @@
+@@ -254,7 +247,6 @@
'--incdir=@PREFIX@/@INCLUDEDIR@',
'--enable-pic',
'--disable-all',
@@ -74,7 +69,7 @@
'--disable-everything',
'--disable-programs',
'--disable-doc',
-@@ -277,11 +266,14 @@
+@@ -279,11 +271,14 @@
'--enable-swscale',
'--disable-indevs',
'--disable-outdevs',
@@ -89,7 +84,7 @@
avutil = proj.dependency('avutil')
avformat = proj.dependency('avformat')
avcodec = proj.dependency('avcodec')
-@@ -290,14 +282,14 @@
+@@ -292,14 +287,14 @@
swscale = proj.dependency('swscale')
include = include_directories('.', 'build/')
meson.override_dependency('libavutil', declare_dependency(
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.1.diff
new file mode 100644
index 0000000..8976dd2
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.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.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.101'))
+ meson.override_dependency('libavformat', declare_dependency(
+- dependencies: [avformat], include_directories: include, version: ''))
++ dependencies: [avformat], include_directories: include, version: '62.12.101'))
+ meson.override_dependency('libavcodec', declare_dependency(
+- dependencies: [avcodec], include_directories: include, version: ''))
++ dependencies: [avcodec], include_directories: include, version: '62.28.101'))
+ meson.override_dependency('libavdevice', declare_dependency(
+- dependencies: [avdevice], include_directories: include, version: ''))
++ dependencies: [avdevice], include_directories: include, version: '62.3.101'))
+ meson.override_dependency('libswresample', declare_dependency(
+- dependencies: [swresample], include_directories: include, version: ''))
++ dependencies: [swresample], include_directories: include, version: '6.3.101'))
+ meson.override_dependency('libswscale', declare_dependency(
+- dependencies: [swscale], include_directories: include, version: ''))
++ dependencies: [swscale], include_directories: include, version: '9.5.101'))
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.2.diff b/subprojects/packagefiles/ffmpeg/version_8.1.2.diff
new file mode 100644
index 0000000..e1b52a4
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.2.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.2', 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.102'))
+ meson.override_dependency('libavformat', declare_dependency(
+- dependencies: [avformat], include_directories: include, version: ''))
++ dependencies: [avformat], include_directories: include, version: '62.12.102'))
+ meson.override_dependency('libavcodec', declare_dependency(
+- dependencies: [avcodec], include_directories: include, version: ''))
++ dependencies: [avcodec], include_directories: include, version: '62.28.102'))
+ meson.override_dependency('libavdevice', declare_dependency(
+- dependencies: [avdevice], include_directories: include, version: ''))
++ dependencies: [avdevice], include_directories: include, version: '62.3.102'))
+ meson.override_dependency('libswresample', declare_dependency(
+- dependencies: [swresample], include_directories: include, version: ''))
++ dependencies: [swresample], include_directories: include, version: '6.3.102'))
+ meson.override_dependency('libswscale', declare_dependency(
+- dependencies: [swscale], include_directories: include, version: ''))
++ dependencies: [swscale], include_directories: include, version: '9.5.102'))
diff --git a/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff b/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff
new file mode 100644
index 0000000..de50787
--- /dev/null
+++ b/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff
@@ -0,0 +1,21 @@
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 8e918de0..5dbc0dd1 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -148,6 +148,7 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC}
+ DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC_GENERATOR}
+ ${SPIRV_TOOLS_CHANGES_FILE}
+ COMMENT "Update build-version.inc in the SPIRV-Tools build directory (if necessary).")
++add_custom_target(build_version DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
+
+ list(APPEND PCH_DEPENDS
+ ${CORE_TABLES_HEADER_INC_FILE}
+@@ -334,7 +335,7 @@ function(spirv_tools_default_target_options target)
+ )
+ set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
+ spvtools_check_symbol_exports(${target})
+- add_dependencies(${target} core_tables extinst_tables)
++ add_dependencies(${target} core_tables extinst_tables build_version)
+ endfunction()
+
+ # Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc.wrap
index e724e01..f541df9 100644
--- a/subprojects/shaderc.wrap
+++ b/subprojects/shaderc.wrap
@@ -1,7 +1,7 @@
[wrap-git]
-directory = shaderc-v2026.1
+directory = shaderc-v2026.2
url = https://github.com/google/shaderc.git
-revision = v2026.1
+revision = v2026.2
depth = 1
method = cmake
patch_directory = shaderc
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index d2b9aeb..a1889c4 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = stela-0d027c4
+directory = stela-a35c47d
url = https://git.akon.city/stela.git
push-url = git@git.akon.city:stela.git
-revision = 0d027c466c199f9857b0872ed76ebab2ed501e43
+revision = a35c47d401335e81f25c2c78611dcb7785f703da
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 11:52:10 +0000