mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-04-16 22:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

testing/mir: rebuild against glog 0.7.1

Browse source 
Pick two patches from upstream that removes some files that cause
compilation errors with the newer glog.
This commit is contained in:
Luca Weiss 2024-06-08 21:36:38 +02:00 • committed by Kevin Daudt
parent 264f3755f8
commit 7c77c03a24
4 changed files with 475 additions and 4 deletions

6
testing/mir/0001-Fix-the-signature-of-drmModeCrtcSetGamma.patch
View file

@ -1,7 +1,7 @@
From 98250e9c32c5b9b940da2fb0a32d8139bbc68157 Mon Sep 17 00:00:00 2001
From a99d65d34e6b572d88c5fbade1efb809c3e9f0d9 Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Thu, 31 Aug 2023 12:05:13 +0100
Subject: [PATCH] Fix the signature of drmModeCrtcSetGamma
Subject: [PATCH 1/3] Fix the signature of drmModeCrtcSetGamma
---
tests/include/mir/test/doubles/mock_drm.h | 2 +-
@ -66,5 +66,5 @@ index d3d5840b7a..bd51466cba 100644
}
+}
--
2.42.0
2.45.2

99
testing/mir/0002-Drop-unused-dependency-on-gflags.patch Normal file
View file

@ -0,0 +1,99 @@
From 281ce68fc7935ba0d77bee132fba816dded4061b Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Mon, 4 Dec 2023 12:18:36 +0000
Subject: [PATCH 2/3] Drop unused dependency on gflags
---
CMakeLists.txt | 1 -
doc/sphinx/.readthedocs.yaml | 1 -
examples/mir_demo_server/CMakeLists.txt | 1 -
examples/mir_demo_server/glog_logger.cpp | 10 ----------
snap/snapcraft.yaml | 1 -
spread/build/fedora/task.yaml | 1 -
6 files changed, 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 995c653154..62873f9936 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,7 +262,6 @@ if(NOT GLM_FOUND)
endif()
pkg_check_modules(DRM REQUIRED IMPORTED_TARGET libdrm)
pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl)
-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 cb0bd3d2f8..b245ffc26e 100644
--- a/doc/sphinx/.readthedocs.yaml
+++ b/doc/sphinx/.readthedocs.yaml
@@ -24,7 +24,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 2a05b525f1..38df174421 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 092c629027..dfd817c4e9 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 <glog/logging.h>
-#include <gflags/gflags.h>
#include <mutex>
@@ -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 aec98e8419..e1955c4583 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -62,7 +62,6 @@ parts:
- libevdev2
- libfreetype6
- libgbm1
- - libgflags2.2
- libgles2
- libglibmm-2.4-1v5
- libglvnd0
--
2.45.2

368
testing/mir/0003-Strip-out-the-glog-example.patch Normal file
View file

@ -0,0 +1,368 @@
From a1d05935a577d5d8a7d079b6f14a149e491a9543 Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Fri, 12 Apr 2024 11:55:49 +0100
Subject: [PATCH 3/3] Strip out the glog example
---
CMakeLists.txt | 1 -
debian/control | 1 -
doc/sphinx/.readthedocs.yaml | 1 -
examples/mir_demo_server/CMakeLists.txt | 3 -
examples/mir_demo_server/glog_logger.cpp | 72 -------------------
examples/mir_demo_server/glog_logger.h | 39 ----------
examples/mir_demo_server/server_example.cpp | 2 -
.../server_example_log_options.cpp | 70 ------------------
.../server_example_log_options.h | 30 --------
snap/snapcraft.yaml | 2 -
spread/build/alpine/task.yaml | 1 -
spread/build/fedora/task.yaml | 1 -
src/platform/symbols.map | 4 --
13 files changed, 227 deletions(-)
delete mode 100644 examples/mir_demo_server/glog_logger.cpp
delete mode 100644 examples/mir_demo_server/glog_logger.h
delete mode 100644 examples/mir_demo_server/server_example_log_options.cpp
delete mode 100644 examples/mir_demo_server/server_example_log_options.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62873f9936..82ef2a5aec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,6 @@ pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl)
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)
-pkg_check_modules(GLog REQUIRED IMPORTED_TARGET libglog)
pkg_check_modules(LIBINPUT REQUIRED IMPORTED_TARGET libinput>=1.1)
pkg_check_modules(LTTNG_UST REQUIRED IMPORTED_TARGET lttng-ust>=2.9)
pkg_check_modules(UDEV REQUIRED IMPORTED_TARGET libudev)
diff --git a/doc/sphinx/.readthedocs.yaml b/doc/sphinx/.readthedocs.yaml
index b245ffc26e..0f4ddbd0c6 100644
--- a/doc/sphinx/.readthedocs.yaml
+++ b/doc/sphinx/.readthedocs.yaml
@@ -24,7 +24,6 @@ build:
- libglib2.0-dev
- libgles2-mesa-dev
- libglm-dev
- - libgoogle-glog-dev
- libinput-dev
- liblttng-ust-dev
- libwayland-dev
diff --git a/examples/mir_demo_server/CMakeLists.txt b/examples/mir_demo_server/CMakeLists.txt
index 38df174421..ae1c169337 100644
--- a/examples/mir_demo_server/CMakeLists.txt
+++ b/examples/mir_demo_server/CMakeLists.txt
@@ -1,7 +1,6 @@
add_library(exampleserverconfig STATIC
server_example_input_device_config.cpp
server_example_input_event_filter.cpp
- server_example_log_options.cpp
server_example_input_filter.cpp
)
@@ -20,13 +19,11 @@ include_directories(
mir_add_wrapped_executable(mir_demo_server
server_example.cpp
- glog_logger.cpp
server_example_test_client.cpp
)
target_link_libraries(mir_demo_server
example-shell-lib
exampleserverconfig
- PkgConfig::GLog
Boost::system
)
diff --git a/examples/mir_demo_server/glog_logger.cpp b/examples/mir_demo_server/glog_logger.cpp
deleted file mode 100644
index dfd817c4e9..0000000000
--- a/examples/mir_demo_server/glog_logger.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright © Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 or 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "glog_logger.h"
-
-#include <glog/logging.h>
-
-#include <mutex>
-
-namespace ml=mir::logging;
-
-namespace
-{
-std::once_flag init_flag;
-std::once_flag shutdown_flag;
-
-struct google_glog_guard_t
-{
- google_glog_guard_t(const char* argv0)
- {
- std::call_once(init_flag, google::InitGoogleLogging, argv0);
- }
-
- ~google_glog_guard_t()
- {
- std::call_once(shutdown_flag, google::ShutdownGoogleLogging);
- }
-};
-}
-
-
-mir::examples::GlogLogger::GlogLogger(
- const char* argv0,
- int stderrthreshold,
- int minloglevel,
- std::string const& log_dir)
-{
- FLAGS_stderrthreshold = stderrthreshold;
- FLAGS_minloglevel = minloglevel;
- FLAGS_log_dir = log_dir;
-
- static google_glog_guard_t guard(argv0);
-}
-
-void mir::examples::GlogLogger::log(ml::Severity severity, std::string const& message, std::string const& component)
-{
- static int glog_level[] =
- {
- google::GLOG_FATAL, // critical = 0,
- google::GLOG_ERROR, // error = 1,
- google::GLOG_WARNING, // warning = 2,
- google::GLOG_INFO, // informational = 3,
- google::GLOG_INFO, // debug = 4
- };
-
- // Since we're not collecting __FILE__ or __LINE__ this is misleading
- google::LogMessage(__FILE__, __LINE__, glog_level[static_cast<int>(severity)]).stream()
- << '[' << component << "] " << message;
-}
diff --git a/examples/mir_demo_server/glog_logger.h b/examples/mir_demo_server/glog_logger.h
deleted file mode 100644
index eb53690260..0000000000
--- a/examples/mir_demo_server/glog_logger.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright © Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 or 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mir/logging/logger.h"
-
-namespace mir
-{
-namespace examples
-{
-class GlogLogger : public logging::Logger
-{
-public:
- GlogLogger(
- char const* argv0,
- int stderrthreshold,
- int minloglevel,
- std::string const& log_dir);
-
-private:
- virtual void log(
- mir::logging::Severity severity,
- std::string const& message,
- std::string const& component) override;
-};
-}
-}
diff --git a/examples/mir_demo_server/server_example.cpp b/examples/mir_demo_server/server_example.cpp
index 195f0c2f6d..2517054eca 100644
--- a/examples/mir_demo_server/server_example.cpp
+++ b/examples/mir_demo_server/server_example.cpp
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "server_example_log_options.h"
#include "server_example_input_event_filter.h"
#include "server_example_input_filter.h"
#include "server_example_test_client.h"
@@ -129,7 +128,6 @@ try
auto const server_exit_status = runner.run_with({
// example options for display layout, logging and timeout
miral::display_configuration_options,
- me::add_glog_options_to,
miral::X11Support{},
miral::WaylandExtensions{}
.enable(miral::WaylandExtensions::zwlr_layer_shell_v1)
diff --git a/examples/mir_demo_server/server_example_log_options.cpp b/examples/mir_demo_server/server_example_log_options.cpp
deleted file mode 100644
index 95911ade06..0000000000
--- a/examples/mir_demo_server/server_example_log_options.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 or 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "server_example_log_options.h"
-#include "glog_logger.h"
-
-#include "mir/server.h"
-#include "mir/options/option.h"
-
-namespace me = mir::examples;
-namespace ml = mir::logging;
-
-///\example server_example_log_options.cpp
-/// Demonstrate adding custom logging options to a server (using glog as the example)
-void me::add_glog_options_to(mir::Server& server)
-{
- static char const* const glog = "glog";
- static char const* const glog_stderrthreshold = "glog-stderrthreshold";
- static char const* const glog_minloglevel = "glog-minloglevel";
- static char const* const glog_log_dir = "glog-log-dir";
-
- static int const glog_stderrthreshold_default = 2;
- static int const glog_minloglevel_default = 0;
- static char const* const glog_log_dir_default = "";
-
- server.add_configuration_option(glog, "Use google::GLog for logging", mir::OptionType::null);
- server.add_configuration_option(glog_stderrthreshold,
- "Copy log messages at or above this level "
- "to stderr in addition to logfiles. The numbers "
- "of severity levels INFO, WARNING, ERROR, and "
- "FATAL are 0, 1, 2, and 3, respectively.",
- glog_stderrthreshold_default);
- server.add_configuration_option(glog_minloglevel,
- "Log messages at or above this level. The numbers "
- "of severity levels INFO, WARNING, ERROR, and "
- "FATAL are 0, 1, 2, and 3, respectively.",
- glog_minloglevel_default);
- server.add_configuration_option(glog_log_dir, "logfiles are written into this directory.", glog_log_dir_default);
-
- server.override_the_logger(
- [&]() -> std::shared_ptr<ml::Logger>
- {
- if (server.get_options()->is_set(glog))
- {
- return std::make_shared<me::GlogLogger>(
- "mir",
- server.get_options()->get<int>(glog_stderrthreshold),
- server.get_options()->get<int>(glog_minloglevel),
- server.get_options()->get<std::string>(glog_log_dir));
- }
- else
- {
- return std::shared_ptr<ml::Logger>{};
- }
- });
-}
-
diff --git a/examples/mir_demo_server/server_example_log_options.h b/examples/mir_demo_server/server_example_log_options.h
deleted file mode 100644
index 88c374d42f..0000000000
--- a/examples/mir_demo_server/server_example_log_options.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright © Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 or 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MIR_EXAMPLES_EXAMPLE_LOG_OPTIONS_H_
-#define MIR_EXAMPLES_EXAMPLE_LOG_OPTIONS_H_
-
-namespace mir
-{
-class Server;
-
-namespace examples
-{
-void add_glog_options_to(Server& server);
-}
-}
-
-#endif /* MIR_EXAMPLES_EXAMPLE_LOG_OPTIONS_H_ */
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e1955c4583..3f1e1b8f59 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,7 +33,6 @@ parts:
- libfreetype6-dev
- libgbm-dev
- libglm-dev
- - libgoogle-glog-dev
- libgtest-dev
- libinput-dev
- liblttng-ust-dev
@@ -65,7 +64,6 @@ parts:
- libgles2
- libglibmm-2.4-1v5
- libglvnd0
- - libgoogle-glog0v5
- libgudev-1.0-0
- libicu70
- libinput10
diff --git a/src/platform/symbols.map b/src/platform/symbols.map
index 0187aed279..528bd7e313 100644
--- a/src/platform/symbols.map
+++ b/src/platform/symbols.map
@@ -104,10 +104,6 @@ MIRPLATFORM_2.5 {
mir::options::enable_input_opt*;
mir::options::enable_key_repeat_opt*;
mir::options::fatal_except_opt*;
- mir::options::glog*;
- mir::options::glog_log_dir*;
- mir::options::glog_minloglevel*;
- mir::options::glog_stderrthreshold*;
mir::options::input_report_opt*;
mir::options::log_opt_value*;
mir::options::logind_console;
--
2.45.2

6
testing/mir/APKBUILD
View file

@ -51,6 +51,8 @@ checkdepends="
"
source="https://github.com/MirServer/mir/releases/download/v$pkgver/mir-$pkgver.tar.xz
0001-Fix-the-signature-of-drmModeCrtcSetGamma.patch
0002-Drop-unused-dependency-on-gflags.patch
0003-Strip-out-the-glog-example.patch
"
subpackages="$pkgname-dev $pkgname-demos $pkgname-test-tools:test_tools"
options="!check" # some tests fail/hang currently, to be debugged
@ -107,5 +109,7 @@ test_tools() {
sha512sums="
b8a5ed4326a6257595873c35d683a343fc96840d1b2824af6478c59db44cc8d0eea9984b74db09ae101885d457d83fa4faa37992b755b92f3e7712b1c09072cd mir-2.15.0.tar.xz
c31f487d4db5281bad79b228899dcc4e159050e218002f7f152a5885e065c55f109932085854f8c4f45fb70ecb629c5a6bfeef87d2f94db0e39ab82004f337fc 0001-Fix-the-signature-of-drmModeCrtcSetGamma.patch
e1e9884a6537419e7d2ca85c03b8dbc1225fc1eed6aaa8d9908eaf84cd1c5776ef393f55fe14f2328686e11aa9a246da0f79d431f564ba69106f418da4a66127 0001-Fix-the-signature-of-drmModeCrtcSetGamma.patch
fa5762030ae82fb7c85f9f8edbd2f477da0a4790ff27af557815f91a40d7184d96f0789faabab79988a0fbe374f7cddc5dcd416ffb6930c7ffcf7b4d362b4538 0002-Drop-unused-dependency-on-gflags.patch
4442d3bfe401eb6a63634e2c84b85c0d18d48e50f94328d094bd618980abe43b305a3ef46461dbd22c4693ee5c130fb509b4550acc8c18409be0b69b77909af4 0003-Strip-out-the-glog-example.patch
"