summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2025-03-03 12:53:14 -0500
committerAndrew Opalach <andrew@akon.city> 2025-03-03 12:53:14 -0500
commit1224a43bbde9ef2297c7ee638b1928a07488cc3d (patch)
tree8cfb0ffe2f35c9c12bc20ab65185f08946eda243 /subprojects
parent000ce1f671d1f05b76202fd128e272e4ac9da683 (diff)
downloadcamu-1224a43bbde9ef2297c7ee638b1928a07488cc3d.tar.gz
camu-1224a43bbde9ef2297c7ee638b1928a07488cc3d.tar.bz2
camu-1224a43bbde9ef2297c7ee638b1928a07488cc3d.zip
Fix vcr memory leak, subtitle upload/render sync
- Some sink behavior fixes. - Fix clock sync when seeking. - Add relative seek bind. Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/ffmpeg.wrap12
-rw-r--r--subprojects/libalabaster.wrap2
-rw-r--r--subprojects/libnaunet.wrap2
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build18
-rw-r--r--subprojects/stela.wrap2
5 files changed, 23 insertions, 13 deletions
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap
index 602ebad..e6f7abf 100644
--- a/subprojects/ffmpeg.wrap
+++ b/subprojects/ffmpeg.wrap
@@ -1,26 +1,30 @@
[wrap-file]
-directory = ffmpeg-7.1
+directory = ffmpeg-7.1.1
+#directory = ffmpeg-7.1
#directory = ffmpeg-5.1.6
#directory = ffmpeg-7.0.2
#directory = ffmpeg-7.0.1
#directory = ffmpeg-7.0
#directory = ffmpeg-6.1.1
#directory = ffmpeg-5.1.4
-source_url = https://ffmpeg.org/releases/ffmpeg-7.1.tar.gz
+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
#source_url = https://ffmpeg.org/releases/ffmpeg-7.0.2.tar.gz
#source_url = https://ffmpeg.org/releases/ffmpeg-7.0.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_filename = ffmpeg-7.1.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
#source_filename = ffmpeg-7.0.2.tar.gz
#source_filename = ffmpeg-7.0.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_hash = 42a7dc0d1583885d1b8f6559fa7ce28f97acafea6803de6a8f73e3ba229348bd
+source_hash = 9a6e57a446b671012612aaeb9df5126794d5ac8f2015ca220934f99a6a4e0601
+#source_hash = 42a7dc0d1583885d1b8f6559fa7ce28f97acafea6803de6a8f73e3ba229348bd
#source_hash = 2a963f9f627dc55cac7ce4d2bb2e063ce52c8ab57185d2b592a631c36be56fda
#source_hash = 1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054
#source_hash = e273eae00b4f833595654c1ee2b2349240e0332f9dbf3c4cadd39df9819ff052
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 5977202..adaec6a 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libalabaster
-revision = 5f80381cc8d2875d27d14288b6f11c31a72fb3cf
+revision = 31715673a5b98991ef276decbd90f026559eaf4b
depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 0fb98e4..a869e82 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libnaunet
-revision = c4023623b89d7518c92f675f44355f5ae1196264
+revision = ce102493f377d0452e44c3a4bb6e6e15ab0c819d
depth = 1
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 04533f8..8aa2f02 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -1,4 +1,4 @@
-project('ffmpeg', 'c', version: '7.1', meson_version: '>=0.57.0')
+project('ffmpeg', 'c', version: '7.1.1', meson_version: '>=0.57.0')
ffmpeg_version_string = meson.project_version()
@@ -6,8 +6,8 @@ compiler = meson.get_compiler('c')
cpu = target_machine.cpu_family()
is_64bit = (cpu == 'x86_64' or cpu == 'aarch64')
-is_debug = get_option('buildtype').startswith('debug')
-is_minsize = get_option('buildtype') == 'minsize'
+is_debug = get_option('debug')
+is_minsize = get_option('optimization') == 's'
is_linux = host_machine.system() == 'linux'
is_windows = host_machine.system() == 'windows'
is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl'
@@ -20,10 +20,16 @@ if not is_debug
extra_options += ['--disable-debug']
endif
+if is_minsize
+ extra_options += ['--enable-small']
+endif
+
extra_options += ['--cc=' + compiler.cmd_array()[0]]
extra_options += ['--arch=' + cpu]
-extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
-extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
+if meson.is_cross_build()
+ extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
+ extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
+endif
if cpu == 'x86_64' or cpu == 'x86'
extra_options += ['--enable-x86asm']
@@ -90,7 +96,7 @@ endif
protocols = 'file,cache'
-if not is_android
+if is_linux or is_mingw
extra_options += ['--enable-libsoxr']
endif
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index b164d5f..004179f 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/stela
-revision = 1993433dc36dfae6a6c4b32f613e64ba213fdc23
+revision = 95e41dbad47f6c5d3868143b46938ec25582b6f1
depth = 1