From cebe940c12a142f3da82f202e3eaee2d30560e69 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 17 Aug 2018 19:11:21 +0530 Subject: [PATCH] meson: Rename caca option to libcaca All options must match the plugin directory name. --- ext/libcaca/meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/libcaca/meson.build b/ext/libcaca/meson.build index dbcb8ea..6086626 100644 --- a/ext/libcaca/meson.build +++ b/ext/libcaca/meson.build @@ -1,4 +1,4 @@ -libcaca_dep = dependency('caca', required : get_option('caca')) +libcaca_dep = dependency('caca', required : get_option('libcaca')) if libcaca_dep.found() library('gstcacasink', 'gstcacasink.c', diff --git a/meson_options.txt b/meson_options.txt index e41c244..0d7a4bb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,7 +46,6 @@ option('y4m', type : 'feature', value : 'auto') # Feature options for plugins with external deps option('aalib', type : 'feature', value : 'auto', description : 'aalib text console video sink plugin') option('bz2', type : 'feature', value : 'auto', description : 'libbz2 support in the matroska plugin') -option('caca', type : 'feature', value : 'auto', description : 'libcaca text console video sink plugin') option('cairo', type : 'feature', value : 'auto', description : 'Cairo overlay plugin') option('directsound', type : 'feature', value : 'auto', description : 'Directsound audio source/sink plugin') option('dv', type : 'feature', value : 'auto', description : 'Digital video decoder and demuxer plugin') @@ -57,6 +56,7 @@ option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink option('jack', type : 'feature', value : 'auto', description : 'JACK audio source/sink plugin') option('jpeg', type : 'feature', value : 'auto', description : 'JPEG image codec plugin') option('lame', type : 'feature', value : 'auto', description : 'LAME mp3 audio encoder plugin') +option('libcaca', type : 'feature', value : 'auto', description : 'libcaca text console video sink plugin') option('mpg123', type : 'feature', value : 'auto', description : 'mpg123 mp3 audio decoder plugin') option('oss', type : 'feature', value : 'auto', description : 'OSS audio source/sink plugin') option('oss4', type : 'feature', value : 'auto', description : 'OSSv4 audio source/sink plugin') -- 2.7.4