diff --git a/.circleci/config.yml b/.circleci/config.yml index 36ecc504..d20c0394 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,7 @@ jobs: executor: e steps: - build: - build-config: -Dopengl=false -Ddbus=false -Dregex=false -Dconfig_file=false + build-config: -Dopengl=false -Ddbus=false -Dregex=false release: executor: e steps: @@ -104,7 +104,7 @@ jobs: steps: - build: cc: clang - build-config: -Dopengl=false -Ddbus=false -Dregex=false -Dconfig_file=false + build-config: -Dopengl=false -Ddbus=false -Dregex=false clang_nogl: executor: e steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d1e2ed..71150ced 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ * picom now uses some OpenGL 4.3 features. * picom now optionally depends on `rtkit` at runtime to give itself realtime scheduling priority. +* `libconfig` is now a mandatory dependency. # v11.2 (2024-Feb-13) diff --git a/README.md b/README.md index 28790eed..f8de4998 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ Assuming you already have all the usual building tools installed (e.g. gcc, pyth * xcb-present * xcb-glx * pixman +* libconfig * libdbus (optional, disable with the `-Ddbus=false` meson configure flag) -* libconfig (optional, disable with the `-Dconfig_file=false` meson configure flag) * libGL, libEGL, libepoxy (optional, disable with the `-Dopengl=false` meson configure flag) * libpcre2 (optional, disable with the `-Dregex=false` meson configure flag) * libev diff --git a/meson_options.txt b/meson_options.txt index 9c3b0da1..ead0e8ec 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,4 @@ option('sanitize', type: 'boolean', value: false, description: 'Build with sanitizers enabled (deprecated)') -option('config_file', type: 'boolean', value: true, description: 'Enable config file support') option('regex', type: 'boolean', value: true, description: 'Enable regex support in window conditions') option('vsync_drm', type: 'boolean', value: false, description: 'Enable support for using drm for vsync') diff --git a/src/config.c b/src/config.c index 8fbbbec6..2ce42247 100644 --- a/src/config.c +++ b/src/config.c @@ -887,15 +887,7 @@ char *parse_config(options_t *opt, const char *config_file, bool *shadow_enable, // clang-format on char *ret = NULL; -#ifdef CONFIG_LIBCONFIG ret = parse_config_libconfig(opt, config_file, shadow_enable, fading_enable, hasneg, winopt_mask); -#else - (void)config_file; - (void)shadow_enable; - (void)fading_enable; - (void)hasneg; - (void)winopt_mask; -#endif return ret; } diff --git a/src/config.h b/src/config.h index 904e8dc1..831f633c 100644 --- a/src/config.h +++ b/src/config.h @@ -17,9 +17,7 @@ #include "uthash_extra.h" -#ifdef CONFIG_LIBCONFIG #include -#endif #include "compiler.h" #include "kernel.h" @@ -311,7 +309,6 @@ void parse_debug_options(struct debug_options *); */ bool condlst_add(c2_lptr_t **, const char *); -#ifdef CONFIG_LIBCONFIG const char *xdg_config_home(void); char **xdg_config_dirs(void); @@ -326,7 +323,6 @@ char **xdg_config_dirs(void); char * parse_config_libconfig(options_t *, const char *config_file, bool *shadow_enable, bool *fading_enable, bool *hasneg, win_option_mask_t *winopt_mask); -#endif void set_default_winopts(options_t *, win_option_mask_t *, bool shadow_enable, bool fading_enable, bool blur_enable); diff --git a/src/inspect.h b/src/inspect.h index 28ebd7aa..eb700737 100644 --- a/src/inspect.h +++ b/src/inspect.h @@ -3,13 +3,5 @@ #pragma once #include -#include "compiler.h" -#ifdef CONFIG_LIBCONFIG int inspect_main(int argc, char **argv, const char *config_file); -#else -static inline int inspect_main(int argc attr_unused, char **argv attr_unused, - const char *config_file attr_unused) { - return 0; -} -#endif diff --git a/src/meson.build b/src/meson.build index 7b39c788..0513e096 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,7 +11,7 @@ srcs = [ files('picom.c', 'win.c', 'c2.c', 'x.c', 'config.c', 'vsync.c', 'utils. 'diagnostic.c', 'string_utils.c', 'render.c', 'kernel.c', 'log.c', 'options.c', 'event.c', 'cache.c', 'atom.c', 'file_watch.c', 'statistics.c', 'vblank.c', 'transition.c', 'wm.c', 'renderer/layout.c', 'renderer/command_builder.c', - 'renderer/renderer.c', 'renderer/damage.c') ] + 'renderer/renderer.c', 'renderer/damage.c', 'config_libconfig.c', 'inspect.c') ] picom_inc = include_directories('.') cflags = [] @@ -34,6 +34,7 @@ endforeach foreach i : required_xcb_packages base_deps += [dependency(i, version: '>=1.12.0', required: true)] endforeach +base_deps += [dependency('libconfig', version: '>=1.4', required: true)] if not cc.has_header('uthash.h') error('Dependency uthash not found') @@ -41,12 +42,6 @@ endif deps = [] -if get_option('config_file') - deps += [dependency('libconfig', version: '>=1.4', required: true)] - - cflags += ['-DCONFIG_LIBCONFIG'] - srcs += [ 'config_libconfig.c', 'inspect.c' ] -endif if get_option('regex') pcre = dependency('libpcre2-8', required: true) cflags += ['-DCONFIG_REGEX_PCRE'] @@ -97,9 +92,7 @@ if get_option('unittest') test('picom unittest', picom, args: [ '--unittest' ]) endif -if get_option('config_file') - install_symlink('picom-inspect', install_dir: 'bin', pointing_to: 'picom') -endif +install_symlink('picom-inspect', install_dir: 'bin', pointing_to: 'picom') if cc.has_argument('-fsanitize=fuzzer') c2_fuzz = executable('c2_fuzz', srcs + ['fuzzer/c2.c'], diff --git a/src/options.c b/src/options.c index 5edb48b5..1587e2aa 100644 --- a/src/options.c +++ b/src/options.c @@ -34,9 +34,7 @@ struct picom_option { // clang-format off static const struct option *longopts = NULL; static const struct picom_option picom_options[] = { -#ifdef CONFIG_LIBCONFIG {"config" , required_argument, 256, NULL , "Path to the configuration file."}, -#endif {"help" , no_argument , 'h', NULL , "Print this help message and exit."}, {"shadow-radius" , required_argument, 'r', NULL , "The blur radius for shadows. (default 12)"}, {"shadow-opacity" , required_argument, 'o', NULL , "The translucency for shadows. (default .75)"},