diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-12-24 14:52:51 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-12-24 14:52:51 -0500 |
| commit | 5206f05fdf77bb65c125ddb133cf46a59608c671 (patch) | |
| tree | 69707685b0245f1db508a6bce98d8ab5399a932c /subprojects | |
| parent | 3d55d2722a3129449ab1418e73abd97caa7fd2ae (diff) | |
| download | camu-5206f05fdf77bb65c125ddb133cf46a59608c671.tar.gz camu-5206f05fdf77bb65c125ddb133cf46a59608c671.tar.bz2 camu-5206f05fdf77bb65c125ddb133cf46a59608c671.zip | |
Bring in line with dependency changes
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/libakiyo.wrap | 4 | ||||
| -rw-r--r-- | subprojects/libnaunet.wrap | 4 | ||||
| -rw-r--r-- | subprojects/miniaudio.wrap | 2 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/subprojects/libakiyo.wrap b/subprojects/libakiyo.wrap deleted file mode 100644 index 38cd4f7..0000000 --- a/subprojects/libakiyo.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -url = https://git.akon.city/libakiyo -revision = dcc43df0a40cbb2126505396cac4db26008d49b1 -depth = 1 diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap new file mode 100644 index 0000000..6db8ca9 --- /dev/null +++ b/subprojects/libnaunet.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://git.akon.city/libnaunet +revision = 822e754cafdc5a32c80c97ca015cd6f9008329c3 +depth = 1 diff --git a/subprojects/miniaudio.wrap b/subprojects/miniaudio.wrap index fb397b9..c4cb007 100644 --- a/subprojects/miniaudio.wrap +++ b/subprojects/miniaudio.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/mackron/miniaudio.git -revision = 12a8d4e4911c5ab4f4c089b4d039433975ed8a66 +revision = 6a8a756b88feccfdf6c73345b44017b0d690d849 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 4ab44f7..7e84085 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -39,16 +39,16 @@ endif #'--extra-ldflags=-L/home/pizza/c/camu/build6/subprojects/libalabaster -l:libalabaster.a', #'--malloc-prefix=al_', -decoders = 'flac,mp3,mp3float,aac,opus,alac,mjpeg,jpeg2000,h264,hevc,vp9' +decoders = 'flac,mp3,mp3float,aac,opus,alac,mjpeg,jpeg2000,gif,h264,hevc,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' -demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,matroska,mov' +demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,gif,matroska,mov' #demuxers += ',mpegts,mpegtsraw,mpegps,mpegvideo' #demuxers += ',ass,srt' -parsers = 'mjpeg,jpeg2000' +parsers = 'aac,opus,mjpeg,jpeg2000,vp9,vp8' #parsers += ',mpegaudio,mpegvideo,dvd_nav' #extra_options += ['--enable-zlib', '--enable-libsoxr'] |