summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buffer/meson.build2
-rw-r--r--src/codec/meson.build14
-rw-r--r--src/liana/meson.build8
-rw-r--r--src/mixer/meson.build3
-rwxr-xr-xsrc/portal/cpy/build.sh1
-rw-r--r--src/portal/meson.build6
-rw-r--r--subprojects/BLAKE3.wrap2
-rw-r--r--subprojects/libass.wrap2
-rw-r--r--subprojects/libcdio-paranoia.wrap2
-rw-r--r--subprojects/libplacebo.wrap4
-rw-r--r--subprojects/packagefiles/libass/meson.build2
-rw-r--r--subprojects/packagefiles/libcdio-paranoia/meson.build2
-rw-r--r--subprojects/packagefiles/stb/meson.build2
-rw-r--r--subprojects/packagefiles/wuffs/meson.build2
-rw-r--r--subprojects/shaderc.wrap2
-rw-r--r--subprojects/stb.wrap2
-rw-r--r--subprojects/wuffs.wrap2
17 files changed, 30 insertions, 28 deletions
diff --git a/src/buffer/meson.build b/src/buffer/meson.build
index a2def3e..a3538f1 100644
--- a/src/buffer/meson.build
+++ b/src/buffer/meson.build
@@ -1,7 +1,7 @@
-no_video = meson.is_subproject()
buffer_src = ['audio.c', 'clock.c', 'peak_buffer.c']
buffer_deps = [common_deps]
buffer_args = []
+no_video = meson.is_subproject()
if not no_video
buffer_src += ['video.c']
else
diff --git a/src/codec/meson.build b/src/codec/meson.build
index 7a01040..d27099a 100644
--- a/src/codec/meson.build
+++ b/src/codec/meson.build
@@ -9,15 +9,15 @@ if get_option('codecs').contains('ffmpeg')
'ffmpeg/scaler.c',
'ffmpeg/encoder.c',
]
+ if not get_option('sink-only')
+ ffmpeg_src += [
+ 'ffmpeg/demuxer.c',
+ 'ffmpeg/avio.c'
+ ]
+ endif
ffmpeg_inc = []
ffmpeg_deps = []
ffmpeg_args = []
-if not get_option('sink-only')
- ffmpeg_src += [
- 'ffmpeg/demuxer.c',
- 'ffmpeg/avio.c'
- ]
-endif
libavutil = dependency('libavutil', required: false)
libavformat = dependency('libavformat', required: false)
@@ -49,7 +49,7 @@ endif
ffmpeg_deps += [libavutil, libavformat, libavcodec, libswresample, libswscale]
ffmpeg_args += ['-DCAMU_HAVE_FFMPEG']
ffmpeg_codec = declare_dependency(sources: ffmpeg_src, dependencies: ffmpeg_deps,
- include_directories: ffmpeg_inc, compile_args: ffmpeg_args)
+ include_directories: ffmpeg_inc, compile_args: ffmpeg_args)
codec_deps += [ffmpeg_codec]
endif
endif
diff --git a/src/liana/meson.build b/src/liana/meson.build
index da53214..32e6a00 100644
--- a/src/liana/meson.build
+++ b/src/liana/meson.build
@@ -19,7 +19,7 @@ if cache_have_cdio
liana_args += ['-DLIANA_HAVE_CDIO']
endif
-liana_server = declare_dependency(sources: liana_server_src, dependencies: liana_deps,
- compile_args: [liana_args, '-DLIANA_SERVER'])
-liana_client = declare_dependency(sources: liana_client_src, dependencies: liana_deps,
- compile_args: [liana_args, '-DLIANA_CLIENT'])
+liana_server = declare_dependency(sources: liana_server_src,
+ dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_SERVER'])
+liana_client = declare_dependency(sources: liana_client_src,
+ dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_CLIENT'])
diff --git a/src/mixer/meson.build b/src/mixer/meson.build
index be5894f..f3ea6c7 100644
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@@ -29,5 +29,4 @@ else
mixer_src += ['audio_null.c']
endif
-mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps,
- compile_args: mixer_args)
+mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps, compile_args: mixer_args)
diff --git a/src/portal/cpy/build.sh b/src/portal/cpy/build.sh
index 15ff4f5..5e5fb10 100755
--- a/src/portal/cpy/build.sh
+++ b/src/portal/cpy/build.sh
@@ -1,3 +1,4 @@
#! /usr/bin/env sh
+cd $1
export PYTHONDONTWRITEBYTECODE=1
python3 setup.py build_ext -i
diff --git a/src/portal/meson.build b/src/portal/meson.build
index c3bbeb4..7cf31a7 100644
--- a/src/portal/meson.build
+++ b/src/portal/meson.build
@@ -7,8 +7,10 @@ portal_src = [
portal_deps = []
portal_args = ['-DCAMU_HAVE_PORTAL']
+cpy_dir = join_paths(meson.current_source_dir(), 'cpy')
+run_command(join_paths(cpy_dir, 'build.sh'), cpy_dir)
+
python3_embed = import('python').find_installation('python3.12').dependency(embed: true)
portal_deps += [python3_embed]
-portal = declare_dependency(sources: portal_src, dependencies: portal_deps,
- compile_args: portal_args)
+portal = declare_dependency(sources: portal_src, dependencies: portal_deps, compile_args: portal_args)
diff --git a/subprojects/BLAKE3.wrap b/subprojects/BLAKE3.wrap
index e8048cc..92a75d0 100644
--- a/subprojects/BLAKE3.wrap
+++ b/subprojects/BLAKE3.wrap
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/BLAKE3-team/BLAKE3.git
-revision = 1.5.1
+revision = 1.5.4
depth = 1
patch_directory = BLAKE3
method = cmake
diff --git a/subprojects/libass.wrap b/subprojects/libass.wrap
index 8bf38e4..a253fd8 100644
--- a/subprojects/libass.wrap
+++ b/subprojects/libass.wrap
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/libass/libass.git
-revision = 0.17.1
+revision = 0.17.3
clone-recursive = true
depth = 1
patch_directory = libass
diff --git a/subprojects/libcdio-paranoia.wrap b/subprojects/libcdio-paranoia.wrap
index 3ff07e8..f1ed23c 100644
--- a/subprojects/libcdio-paranoia.wrap
+++ b/subprojects/libcdio-paranoia.wrap
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/rocky/libcdio-paranoia.git
-revision = 36534131998286bb41072e5b666f174d69d9281b
+revision = 28ad7d06c503989f4738bcc9d44b2a035f162d24
depth = 1
patch_directory = libcdio-paranoia
diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap
index 962682a..9eb608c 100644
--- a/subprojects/libplacebo.wrap
+++ b/subprojects/libplacebo.wrap
@@ -1,10 +1,10 @@
[wrap-git]
url = https://code.videolan.org/videolan/libplacebo.git
-revision = 7b29435072143ee8b7e131947e055d3780ae4e47
+revision = 118d8106640796d3f2ceb55f8634a32a58a47aa2
clone-recursive = true
depth = 1
-diff_files = libplacebo/stretch.diff, libplacebo/no_dlltool.diff
+diff_files = libplacebo/cache_ref_rect.diff, libplacebo/fix_rotate.diff, libplacebo/no_dlltool_no_shaderc_version.diff
[provide]
dependency_names = libplacebo
diff --git a/subprojects/packagefiles/libass/meson.build b/subprojects/packagefiles/libass/meson.build
index b31d5ed..915a942 100644
--- a/subprojects/packagefiles/libass/meson.build
+++ b/subprojects/packagefiles/libass/meson.build
@@ -1,4 +1,4 @@
-project('libass', 'c', meson_version : '>=0.57.0')
+project('libass', 'c', version: '0.17.3', meson_version : '>=0.57.0')
ext_proj = import('unstable-external_project')
diff --git a/subprojects/packagefiles/libcdio-paranoia/meson.build b/subprojects/packagefiles/libcdio-paranoia/meson.build
index 45b2c12..42818f6 100644
--- a/subprojects/packagefiles/libcdio-paranoia/meson.build
+++ b/subprojects/packagefiles/libcdio-paranoia/meson.build
@@ -1,4 +1,4 @@
-project('libcdio-paranoia', 'c', version: 'git-3653413', meson_version: '>=0.57.0')
+project('libcdio-paranoia', 'c', version: 'git-28ad7d0', meson_version: '>=0.57.0')
ext_proj = import('unstable-external_project')
diff --git a/subprojects/packagefiles/stb/meson.build b/subprojects/packagefiles/stb/meson.build
index 6feb1a1..783ed0f 100644
--- a/subprojects/packagefiles/stb/meson.build
+++ b/subprojects/packagefiles/stb/meson.build
@@ -1,2 +1,2 @@
-project('stb', 'c', version: 'git-f4a71b1')
+project('stb', 'c', version: 'git-2e2bef4')
stb = declare_dependency(include_directories: include_directories('.'))
diff --git a/subprojects/packagefiles/wuffs/meson.build b/subprojects/packagefiles/wuffs/meson.build
index 20fb32b..dafc5b2 100644
--- a/subprojects/packagefiles/wuffs/meson.build
+++ b/subprojects/packagefiles/wuffs/meson.build
@@ -1,2 +1,2 @@
-project('wuff', 'c', version: 'git-748e44f')
+project('wuff', 'c', version: 'git-7bd37b9')
wuffs = declare_dependency(include_directories: include_directories('./release/c'))
diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc.wrap
index fb5c1ee..752f8e2 100644
--- a/subprojects/shaderc.wrap
+++ b/subprojects/shaderc.wrap
@@ -1,5 +1,5 @@
[wrap-git]
url = https://github.com/google/shaderc.git
-revision = 5d0f6ed6e46d3c0ccd23151c6a1486c2ec90c037
+revision = ddac450a36a3be28a2c2173f26703249dd83cfdf
depth = 1
method = cmake
diff --git a/subprojects/stb.wrap b/subprojects/stb.wrap
index d14fad7..df087b8 100644
--- a/subprojects/stb.wrap
+++ b/subprojects/stb.wrap
@@ -1,5 +1,5 @@
[wrap-git]
url = https://github.com/nothings/stb.git
-revision = 013ac3beddff3dbffafd5177e7972067cd2b5083
+revision = 2e2bef463a5b53ddf8bb788e25da6b8506314c08
depth = 1
patch_directory = stb
diff --git a/subprojects/wuffs.wrap b/subprojects/wuffs.wrap
index 6d0e0cc..165ae9e 100644
--- a/subprojects/wuffs.wrap
+++ b/subprojects/wuffs.wrap
@@ -1,5 +1,5 @@
[wrap-git]
url = https://github.com/google/wuffs.git
-revision = 748e44fe711f1392c2503f4d8d4aafe0beaf9b1b
+revision = 7bd37b9bc168f59c220995c152e68ff012a9935a
depth = 1
patch_directory = wuffs