summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/libalabaster.wrap2
-rw-r--r--subprojects/libnaunet.wrap2
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build26
-rw-r--r--subprojects/stela.wrap2
4 files changed, 23 insertions, 9 deletions
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 49f70eb..d155d8a 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libalabaster
-revision = bb4d5418f2173bf9a2fa1c0be31c3eb9f2025a21
+revision = 9532606e6bc39ffe5128cec60a762545e4550052
depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 833aff8..7b6cfae 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/libnaunet
-revision = be4eb3831a2e5b44fb6e4c2d077e3c07edf6b776
+revision = 8b5c569b53f9287e8b6c84e4402ec6f796e4cb6b
depth = 1
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 7e84085..2a9cd33 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -34,12 +34,13 @@ if is_windows
if is_msvc
extra_options += ['--toolchain=msvc']
endif
+ extra_options += ['--enable-w32threads']
endif
-#'--extra-ldflags=-L/home/pizza/c/camu/build6/subprojects/libalabaster -l:libalabaster.a',
+#'--extra-ldflags=-Lbuild/subprojects/libalabaster -l:libalabaster.a',
#'--malloc-prefix=al_',
-decoders = 'flac,mp3,mp3float,aac,opus,alac,mjpeg,jpeg2000,gif,h264,hevc,vp9,vp8'
+decoders = 'flac,mp3,mp3float,aac,opus,alac,mjpeg,jpeg2000,gif,h264,hevc,av1,vp9,vp8'
decoders += ',pcm_f32be,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_f32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar'
#decoders += ',pcm_dvd,mpegvideo,mpeg2video'
#decoders += ',ass,srt'
@@ -48,7 +49,7 @@ demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,gif,matrosk
#demuxers += ',mpegts,mpegtsraw,mpegps,mpegvideo'
#demuxers += ',ass,srt'
-parsers = 'aac,opus,mjpeg,jpeg2000,vp9,vp8'
+parsers = 'aac,opus,mjpeg,jpeg2000,h264,hevc,av1,vp9,vp8'
#parsers += ',mpegaudio,mpegvideo,dvd_nav'
#extra_options += ['--enable-zlib', '--enable-libsoxr']
@@ -59,6 +60,19 @@ parsers += ',png'
bsfs = 'extract_extradata,mp3_header_decompress'
+hwaccels = ''
+if is_windows
+ extra_options += ['--enable-vulkan']
+ hwaccels += 'h264_vulkan,hevc_vulkan,av1_vulkan'
+ #extra_options += ['--enable-d3d11va', '--enable-d3d12va', '--enable-dxva2']
+ #hwaccels += 'h264_dxva2,'
+else
+ extra_options += ['--disable-vulkan']
+endif
+extra_options += ['--disable-vdpau', '--disable-vaapi']
+
+protocols = 'file,cache'
+
ext_proj = import('unstable-external_project')
proj = ext_proj.add_project('configure',
@@ -79,8 +93,6 @@ proj = ext_proj.add_project('configure',
'--disable-manpages',
'--disable-podpages',
'--disable-txtpages',
- '--disable-vdpau',
- '--disable-vaapi',
'--disable-bzlib',
'--disable-error-resilience',
'--disable-iconv',
@@ -92,9 +104,9 @@ proj = ext_proj.add_project('configure',
'--disable-faan',
'--disable-alsa',
'--disable-xlib',
- '--disable-vulkan',
'--enable-gpl',
'--enable-version3',
+ '--disable-nonfree',
'--enable-runtime-cpudetect',
'--enable-asm',
'--enable-inline-asm',
@@ -109,6 +121,8 @@ proj = ext_proj.add_project('configure',
'--enable-decoder=' + decoders,
'--enable-parser=' + parsers,
'--enable-bsf=' + bsfs,
+ '--enable-hwaccel=' + hwaccels,
+ '--enable-protocol=' + protocols,
extra_options,
],
cross_configure_options: ['--enable-cross-compile'],
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index adb6090..698b2fc 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,4 @@
[wrap-git]
url = https://git.akon.city/stela
-revision = d8538d6616258e4920ba301edd2c86d4edc437c4
+revision = 7b94b4baafa46357ebc6beba36d90ee5afe5091b
depth = 1