Drop Cheese dependency
Cheese is not ready for GTK4, and probably won't ever be, so just drop the dependency. We'll reimplement webcam support using PipeWire later.
This commit is contained in:
parent
5303a977b1
commit
5ca53a0a78
5 changed files with 0 additions and 29 deletions
12
meson.build
12
meson.build
|
@ -171,17 +171,6 @@ config_h.set10('HAVE_CUPS_HTTPCONNECT2',
|
|||
cc.has_function('httpConnect2', dependencies: cups_dep),
|
||||
description: 'Define if httpConnect2() is available in CUPS')
|
||||
|
||||
# Optional dependency for the user accounts panel
|
||||
enable_cheese = get_option('cheese')
|
||||
if enable_cheese
|
||||
cheese_deps = [
|
||||
dependency('cheese', version: '>= 3.28.0'),
|
||||
dependency('cheese-gtk', version: '>= 3.5.91')
|
||||
]
|
||||
endif
|
||||
config_h.set('HAVE_CHEESE', enable_cheese,
|
||||
description: 'Define to 1 to enable cheese webcam support')
|
||||
|
||||
# IBus support
|
||||
enable_ibus = get_option('ibus')
|
||||
if enable_ibus
|
||||
|
@ -310,7 +299,6 @@ summary({
|
|||
}, section: 'Dependencies')
|
||||
|
||||
summary({
|
||||
'Cheese': enable_cheese,
|
||||
'IBus': enable_ibus,
|
||||
'Snap': enable_snap,
|
||||
'Malcontent': enable_malcontent,
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support')
|
||||
option('documentation', type: 'boolean', value: false, description: 'build documentation')
|
||||
option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
|
||||
option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
|
||||
|
|
|
@ -184,10 +184,6 @@ deps = common_deps + [
|
|||
dependency('pwquality', version: '>= 1.2.2')
|
||||
]
|
||||
|
||||
if enable_cheese
|
||||
deps += cheese_deps
|
||||
endif
|
||||
|
||||
if enable_malcontent
|
||||
deps += malcontent_dep
|
||||
endif
|
||||
|
|
|
@ -29,10 +29,6 @@
|
|||
#include <X11/Xlib.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CHEESE
|
||||
#include <cheese-gtk.h>
|
||||
#endif /* HAVE_CHEESE */
|
||||
|
||||
#include "cc-application.h"
|
||||
|
||||
static void
|
||||
|
@ -42,10 +38,6 @@ initialize_dependencies (gint *argc,
|
|||
#ifdef GDK_WINDOWING_X11
|
||||
XInitThreads ();
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CHEESE
|
||||
cheese_gtk_init (argc, argv);
|
||||
#endif /* HAVE_CHEESE */
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -115,10 +115,6 @@ shell_deps = common_deps + [
|
|||
libshell_dep,
|
||||
]
|
||||
|
||||
if enable_cheese
|
||||
shell_deps += cheese_deps
|
||||
endif
|
||||
|
||||
if host_is_linux_not_s390
|
||||
shell_deps += wacom_deps
|
||||
endif
|
||||
|
|
Loading…
Add table
Reference in a new issue