diff --git a/CMakeLists.txt b/CMakeLists.txt index e07f8591c21..431d5e39c31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,7 +234,6 @@ endif() pkg_check_modules(DRM REQUIRED IMPORTED_TARGET libdrm) pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl) pkg_check_modules(EPOXY REQUIRED IMPORTED_TARGET epoxy) -pkg_check_modules(GFlags REQUIRED IMPORTED_TARGET gflags) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0 gio-unix-2.0) pkg_check_modules(GLESv2 REQUIRED IMPORTED_TARGET glesv2) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) diff --git a/doc/sphinx/.readthedocs.yaml b/doc/sphinx/.readthedocs.yaml index 3194b3fea06..0ee7825cfaa 100644 --- a/doc/sphinx/.readthedocs.yaml +++ b/doc/sphinx/.readthedocs.yaml @@ -25,7 +25,6 @@ build: - libglib2.0-dev - libgles2-mesa-dev - libglm-dev - - libgflags-dev - libgoogle-glog-dev - libinput-dev - liblttng-ust-dev diff --git a/examples/mir_demo_server/CMakeLists.txt b/examples/mir_demo_server/CMakeLists.txt index 2a05b525f15..38df1744215 100644 --- a/examples/mir_demo_server/CMakeLists.txt +++ b/examples/mir_demo_server/CMakeLists.txt @@ -28,6 +28,5 @@ target_link_libraries(mir_demo_server example-shell-lib exampleserverconfig PkgConfig::GLog - PkgConfig::GFlags Boost::system ) diff --git a/examples/mir_demo_server/glog_logger.cpp b/examples/mir_demo_server/glog_logger.cpp index 092c629027c..dfd817c4e94 100644 --- a/examples/mir_demo_server/glog_logger.cpp +++ b/examples/mir_demo_server/glog_logger.cpp @@ -17,7 +17,6 @@ #include "glog_logger.h" #include -#include #include @@ -27,7 +26,6 @@ namespace { std::once_flag init_flag; std::once_flag shutdown_flag; -std::once_flag shutdown_flag_gflags; struct google_glog_guard_t { @@ -41,14 +39,6 @@ struct google_glog_guard_t std::call_once(shutdown_flag, google::ShutdownGoogleLogging); } }; - -struct google_gflag_guard_t -{ - ~google_gflag_guard_t() - { - std::call_once(shutdown_flag_gflags, google::ShutDownCommandLineFlags); - } -} google_gflag_guard; } diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 98d38cfbce1..87845dce014 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -63,7 +63,6 @@ parts: - libevdev2 - libfreetype6 - libgbm1 - - libgflags2.2 - libgles2 - libglibmm-2.4-1v5 - libglvnd0 diff --git a/spread/build/fedora/task.yaml b/spread/build/fedora/task.yaml index 0340d442b8f..5b2614f5a9a 100644 --- a/spread/build/fedora/task.yaml +++ b/spread/build/fedora/task.yaml @@ -19,7 +19,6 @@ execute: | mesa-libGLES-devel \ glm-devel \ glog-devel \ - gflags-devel \ systemd-devel \ glib2-devel \ wayland-devel \