Skip to content

Commit 9581984

Browse files
committed
Strip out the glog example
1 parent 79cd71c commit 9581984

13 files changed

+0
-227
lines changed

CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ pkg_check_modules(EPOXY REQUIRED IMPORTED_TARGET epoxy)
237237
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0 gio-unix-2.0)
238238
pkg_check_modules(GLESv2 REQUIRED IMPORTED_TARGET glesv2)
239239
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
240-
pkg_check_modules(GLog REQUIRED IMPORTED_TARGET libglog)
241240
pkg_check_modules(LIBINPUT REQUIRED IMPORTED_TARGET libinput>=1.1)
242241
pkg_check_modules(LTTNG_UST REQUIRED IMPORTED_TARGET lttng-ust>=2.9)
243242
pkg_check_modules(UDEV REQUIRED IMPORTED_TARGET libudev)

debian/control

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Build-Depends: cmake,
2020
libgles2-mesa-dev,
2121
libgbm-dev,
2222
libglm-dev,
23-
libgoogle-glog-dev,
2423
liblttng-ust-dev,
2524
libxkbcommon-dev (>= 0.5),
2625
libumockdev-dev (>= 0.6),

doc/sphinx/.readthedocs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ build:
2525
- libglib2.0-dev
2626
- libgles2-mesa-dev
2727
- libglm-dev
28-
- libgoogle-glog-dev
2928
- libinput-dev
3029
- liblttng-ust-dev
3130
- libwayland-dev

examples/mir_demo_server/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
add_library(exampleserverconfig STATIC
22
server_example_input_device_config.cpp
33
server_example_input_event_filter.cpp
4-
server_example_log_options.cpp
54
server_example_input_filter.cpp
65
)
76

@@ -20,13 +19,11 @@ include_directories(
2019

2120
mir_add_wrapped_executable(mir_demo_server
2221
server_example.cpp
23-
glog_logger.cpp
2422
server_example_test_client.cpp
2523
)
2624

2725
target_link_libraries(mir_demo_server
2826
example-shell-lib
2927
exampleserverconfig
30-
PkgConfig::GLog
3128
Boost::system
3229
)

examples/mir_demo_server/glog_logger.cpp

-72
This file was deleted.

examples/mir_demo_server/glog_logger.h

-39
This file was deleted.

examples/mir_demo_server/server_example.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
#include "server_example_log_options.h"
1817
#include "server_example_input_event_filter.h"
1918
#include "server_example_input_filter.h"
2019
#include "server_example_test_client.h"
@@ -134,7 +133,6 @@ try
134133
auto const server_exit_status = runner.run_with({
135134
// example options for display layout, logging and timeout
136135
miral::display_configuration_options,
137-
me::add_glog_options_to,
138136
miral::X11Support{},
139137
wayland_extensions,
140138
miral::set_window_management_policy<miral::MinimalWindowManager>(),

examples/mir_demo_server/server_example_log_options.cpp

-70
This file was deleted.

examples/mir_demo_server/server_example_log_options.h

-30
This file was deleted.

snap/snapcraft.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ parts:
3333
- libfreetype6-dev
3434
- libgbm-dev
3535
- libglm-dev
36-
- libgoogle-glog-dev
3736
- libgtest-dev
3837
- libinput-dev
3938
- liblttng-ust-dev
@@ -66,7 +65,6 @@ parts:
6665
- libgles2
6766
- libglibmm-2.4-1v5
6867
- libglvnd0
69-
- libgoogle-glog0v5
7068
- libgudev-1.0-0
7169
- libicu70
7270
- libinput10

spread/build/alpine/task.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ execute: |
1414
g++ \
1515
glib-dev \
1616
glm-dev \
17-
glog-dev \
1817
grep \
1918
gtest-dev \
2019
libepoxy-dev \

spread/build/fedora/task.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ execute: |
1818
mesa-libEGL-devel \
1919
mesa-libGLES-devel \
2020
glm-devel \
21-
glog-devel \
2221
systemd-devel \
2322
glib2-devel \
2423
wayland-devel \

src/platform/symbols.map

-4
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ MIR_PLATFORM_2.17 {
123123
mir::options::enable_input_opt*;
124124
mir::options::enable_key_repeat_opt*;
125125
mir::options::fatal_except_opt*;
126-
mir::options::glog*;
127-
mir::options::glog_log_dir*;
128-
mir::options::glog_minloglevel*;
129-
mir::options::glog_stderrthreshold*;
130126
mir::options::idle_timeout_opt;
131127
mir::options::input_report_opt*;
132128
mir::options::log_opt_value*;

0 commit comments

Comments
 (0)