diff options
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/ffmpeg.wrap | 8 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 19 | ||||
| -rw-r--r-- | subprojects/shaderc/meson.build | 2 | ||||
| -rw-r--r-- | subprojects/zlib.wrap | 5 |
4 files changed, 20 insertions, 14 deletions
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap index 071be8b..76dcda1 100644 --- a/subprojects/ffmpeg.wrap +++ b/subprojects/ffmpeg.wrap @@ -1,6 +1,6 @@ [wrap-file] -directory = ffmpeg-6.1 -source_url = https://www.ffmpeg.org/releases/ffmpeg-6.1.tar.gz -source_filename = ffmpeg-6.1.tar.gz -source_hash = 938dd778baa04d353163ca5cb06c909c918850055f549205b29b1224e45a5316 +directory = ffmpeg-6.1.1 +source_url = https://www.ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz +source_filename = ffmpeg-6.1.1.tar.gz +source_hash = b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb patch_directory = ffmpeg diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 2faa65e..c4ab72d 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '6.1', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '6.1.1', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') @@ -16,6 +16,8 @@ if not is_debug endif extra_options += ['--cc=' + compiler.cmd_array()[0]] +extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] +extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')] if is_windows if is_64bit @@ -40,13 +42,11 @@ demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,matroska,mo parsers = 'mjpeg,jpeg2000' #parsers += ',mpegaudio,mpegvideo,dvd_nav' -if not is_windows or is_mingw - #extra_options += ['--enable-zlib', '--enable-libsoxr'] - extra_options += ['--enable-zlib'] - decoders += ',png' - demuxers += ',image_png_pipe' - parsers += ',png' -endif +#extra_options += ['--enable-zlib', '--enable-libsoxr'] +extra_options += ['--enable-zlib'] +decoders += ',png' +demuxers += ',image_png_pipe' +parsers += ',png' bsfs = 'extract_extradata,mp3_header_decompress' @@ -81,6 +81,7 @@ proj = ext_proj.add_project('configure', '--disable-alsa', '--disable-xlib', '--disable-vulkan', + '--enable-nonfree', '--enable-runtime-cpudetect', '--enable-asm', '--enable-inline-asm', @@ -105,5 +106,5 @@ avcodec = proj.dependency('avcodec') swresample = proj.dependency('swresample') swscale = proj.dependency('swscale') -libdir = meson.project_build_root() + '/dist/usr/locallib' inc = include_directories('.') +libdir = meson.project_build_root() + '/dist/usr/locallib' diff --git a/subprojects/shaderc/meson.build b/subprojects/shaderc/meson.build index 7543f54..ce02aa8 100644 --- a/subprojects/shaderc/meson.build +++ b/subprojects/shaderc/meson.build @@ -1,4 +1,4 @@ -project('shaderc', 'cpp', version: '2023.7') +project('shaderc', 'cpp', version: '2023.8') compiler = meson.get_compiler('c') diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap new file mode 100644 index 0000000..2a4215f --- /dev/null +++ b/subprojects/zlib.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/madler/zlib.git +revision = 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 +depth = 1 +method = cmake |