[gnome-control-center/gbsneto/gtk4: 14/53] Drop Cheese dependency




commit 5ca53a0a78108019bf37ba01b07ac25a123db34a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Oct 19 20:27:39 2021 -0300

    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.

 meson.build                      | 12 ------------
 meson_options.txt                |  1 -
 panels/user-accounts/meson.build |  4 ----
 shell/main.c                     |  8 --------
 shell/meson.build                |  4 ----
 5 files changed, 29 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3815be78f..6c95516cb 100644
--- a/meson.build
+++ b/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,
diff --git a/meson_options.txt b/meson_options.txt
index 1b7b54810..dbca72387 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index b8ee9d98e..895b0dfe0 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -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
diff --git a/shell/main.c b/shell/main.c
index 14c81c5f7..e3ac0f327 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -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
diff --git a/shell/meson.build b/shell/meson.build
index 89b96590e..2a6cbf46f 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]