From 3a49828aeb415c5c3c5e2b91219e2a561ed52ad5fb4d177a0fe4f4b209446a22 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 4 Aug 2022 13:38:06 +0000 Subject: [PATCH] Accepting request 993084 from home:qzhao:branches:Base:System - Update to version 0.9.5~git20220803.52b0494: src: Run through uncrustify. scripts: Diff less. scripts: Update uncrustify config. src: Drop vim: lines. ply-utils: Drop linux/fs.h include. scripts: Add -B to interdiff in check-format. - Rebase plymouth-log-on-default.patch; - Rebase plymouth-screen-twice-scale-on-160DPI-higher.patch; OBS-URL: https://build.opensuse.org/request/show/993084 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=339 --- plymouth-0.9.5~git20220719.9e72df3.tar.xz | 3 - plymouth-0.9.5~git20220803.52b0494.tar.xz | 3 + plymouth-log-on-default.patch | 182 ++++++++++-------- ...-screen-twice-scale-on-160DPI-higher.patch | 20 +- plymouth.changes | 15 +- plymouth.spec | 2 +- 6 files changed, 126 insertions(+), 99 deletions(-) delete mode 100644 plymouth-0.9.5~git20220719.9e72df3.tar.xz create mode 100644 plymouth-0.9.5~git20220803.52b0494.tar.xz diff --git a/plymouth-0.9.5~git20220719.9e72df3.tar.xz b/plymouth-0.9.5~git20220719.9e72df3.tar.xz deleted file mode 100644 index 274c59c..0000000 --- a/plymouth-0.9.5~git20220719.9e72df3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:772d411bc76b85e80fdcf331aede22d783ce4c5bb4283878ea97a712bc922756 -size 6378912 diff --git a/plymouth-0.9.5~git20220803.52b0494.tar.xz b/plymouth-0.9.5~git20220803.52b0494.tar.xz new file mode 100644 index 0000000..2c17bfe --- /dev/null +++ b/plymouth-0.9.5~git20220803.52b0494.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:134afdd9c224dbd14ce04b14e9a1894d58bd48558d8eda33be7f30d59fe60e24 +size 6915544 diff --git a/plymouth-log-on-default.patch b/plymouth-log-on-default.patch index d1aa8a0..1af8194 100644 --- a/plymouth-log-on-default.patch +++ b/plymouth-log-on-default.patch @@ -1,6 +1,6 @@ -diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-buffer.c plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-buffer.c ---- plymouth-0.9.5~git20220412.e960111/src/libply/ply-buffer.c 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-buffer.c 2022-05-07 12:10:27.891589631 +0800 +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c +--- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c 2022-08-04 16:27:35.810694440 +0800 @@ -46,6 +46,10 @@ #define PLY_BUFFER_MAX_BUFFER_CAPACITY (255 * 4096) #endif @@ -33,61 +33,62 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-buffer.c plymouth-0 void ply_buffer_remove_bytes (ply_buffer_t *buffer, size_t bytes_to_remove) -@@ -195,6 +213,36 @@ - ply_buffer_remove_bytes (buffer, length); - } +@@ -205,6 +223,38 @@ + } -+ assert (buffer->size + length < buffer->capacity); -+ -+ memcpy (buffer->data + buffer->size, -+ bytes, length); -+ -+ buffer->size += length; -+ buffer->data[buffer->size] = '\0'; -+} -+ -+void + void +ply_buffer_append_log_bytes (ply_buffer_t *buffer, + const void *bytes_in, + size_t length) +{ -+ assert (buffer != NULL); -+ assert (bytes_in != NULL); -+ assert (length != 0); ++ assert (buffer != NULL); ++ assert (bytes_in != NULL); ++ assert (length != 0); + -+ const uint8_t *bytes = bytes_in; ++ const uint8_t *bytes = bytes_in; + -+ if (length > PLY_BUFFER_MAX_BUFFER_CAPACITY) { -+ bytes += length - (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); -+ length = (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); -+ } ++ if (length > PLY_BUFFER_MAX_BUFFER_CAPACITY) ++ { ++ bytes += length - (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); ++ length = (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); ++ } + -+ while ((buffer->size + length) >= buffer->capacity) { -+ if (!ply_buffer_increase_log_capacity (buffer)) -+ ply_buffer_remove_bytes (buffer, length); -+ } ++ while ((buffer->size + length) >= buffer->capacity) ++ { ++ if (!ply_buffer_increase_log_capacity (buffer)) ++ ply_buffer_remove_bytes (buffer, length); ++ } + - assert (buffer->size + length < buffer->capacity); - - memcpy (buffer->data + buffer->size, -diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-buffer.h plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-buffer.h ---- plymouth-0.9.5~git20220412.e960111/src/libply/ply-buffer.h 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-buffer.h 2022-05-07 12:10:27.892589638 +0800 -@@ -34,7 +34,10 @@ - void ply_buffer_append_bytes (ply_buffer_t *buffer, ++ assert (buffer->size + length < buffer->capacity); ++ ++ memcpy (buffer->data + buffer->size, ++ bytes, length); ++ ++ buffer->size += length; ++ buffer->data[buffer->size] = '\0'; ++} ++ ++void + ply_buffer_append_from_fd (ply_buffer_t *buffer, + int fd) + { +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h +--- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h 2022-08-04 16:27:35.810694440 +0800 +@@ -35,6 +35,10 @@ const void *bytes, size_t number_of_bytes); -- + +void ply_buffer_append_log_bytes (ply_buffer_t *buffer, + const void *bytes, + size_t length); -+ ++ void ply_buffer_append_from_fd (ply_buffer_t *buffer, int fd); #define ply_buffer_append(buffer, format, args ...) \ -diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220412.e960111_new/src/main.c ---- plymouth-0.9.5~git20220412.e960111/src/main.c 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/src/main.c 2022-05-07 12:10:27.892589638 +0800 +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/main.c plymouth-0.9.5~git20220801.eb1b893_new/src/main.c +--- plymouth-0.9.5~git20220801.eb1b893/src/main.c 2022-08-02 21:28:28.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/main.c 2022-08-04 17:37:22.768631505 +0800 @@ -1225,8 +1225,7 @@ } @@ -95,22 +96,21 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220 - if (ply_kernel_command_line_has_argument ("plymouth.debug")) - ply_logger_close_file (ply_logger_get_error_default ()); + ply_logger_close_file (ply_logger_get_error_default ()); - - } - -@@ -1854,71 +1853,39 @@ } static void +@@ -1853,77 +1852,42 @@ + state->is_attached = false; + } + +-static void -check_verbosity (state_t *state) -+initialize_debug (state_t *state) ++static void initialize_debug (state_t *state) { - char *stream; - +- - ply_trace ("checking if tracing should be enabled"); -+ if (!ply_is_tracing ()) -+ ply_toggle_tracing (); - +- - if (!debug_buffer_path) - debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:"); - @@ -140,47 +140,31 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220 - char *file; - - device = state->default_tty; -+ if (debug_buffer == NULL) -+ debug_buffer = ply_buffer_new (); - +- - ply_trace ("redirecting debug output to %s", device); - - if (strncmp (device, "/dev/", strlen ("/dev/")) == 0) - file = strdup (device); - else - asprintf (&file, "/dev/%s", device); -- ++ if (!ply_is_tracing ()) ++ ply_toggle_tracing (); + - fd = open (file, O_RDWR | O_APPEND); -+ char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:"); -+ if (stream != NULL) -+ { -+ int fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600); -+ if (fd < 0) -+ ply_trace ("could not stream output to %s: %m", stream); -+ else -+ ply_logger_set_output_fd (ply_logger_get_error_default (), fd); -+ free (stream); -+ } ++ if (debug_buffer == NULL) ++ debug_buffer = ply_buffer_new (); - if (fd < 0) - ply_trace ("could not redirected debug output to %s: %m", device); - else - ply_logger_set_output_fd (ply_logger_get_error_default (), fd); -+ if (!debug_buffer_path) -+ debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:"); - +- - free (file); - } - } else { - ply_trace ("tracing shouldn't be enabled!"); -+ if (debug_buffer_path == NULL) -+ { -+ if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || state->mode == PLY_BOOT_SPLASH_MODE_REBOOT) -+ debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-shutdown-debug.log"); -+ else -+ debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); - } - +- } +- - if (debug_buffer != NULL) { - if (debug_buffer_path == NULL) { - if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || @@ -189,13 +173,43 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220 - else - debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); - } -- -+ if (debug_buffer != NULL) -+ { - ply_logger_add_filter (ply_logger_get_error_default (), - (ply_logger_filter_handler_t) - on_error_message, -@@ -2007,7 +1974,7 @@ ++ char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:"); ++ if (stream != NULL) ++ { ++ int fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600); ++ if (fd < 0) ++ ply_trace ("could not stream output to %s: %m", stream); ++ else ++ ply_logger_set_output_fd (ply_logger_get_error_default (), fd); ++ free (stream); ++ } ++ ++ if (!debug_buffer_path) ++ debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:"); ++ ++ if (debug_buffer_path == NULL) ++ { ++ if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || state->mode == PLY_BOOT_SPLASH_MODE_REBOOT) ++ debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-shutdown-debug.log"); ++ else ++ debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); ++ } + +- ply_logger_add_filter (ply_logger_get_error_default (), +- (ply_logger_filter_handler_t) +- on_error_message, +- debug_buffer); +- } ++ if (debug_buffer != NULL) ++ { ++ ply_logger_add_filter (ply_logger_get_error_default (), ++ (ply_logger_filter_handler_t) on_error_message, ++ debug_buffer); ++ } + } + + static void +@@ -2007,7 +1971,7 @@ } } @@ -204,7 +218,7 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220 check_logging (state); ply_trace ("source built on %s", __DATE__); -@@ -2033,7 +2000,7 @@ +@@ -2033,7 +1997,7 @@ const void *bytes, size_t number_of_bytes) { @@ -213,7 +227,7 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/main.c plymouth-0.9.5~git20220 } static void -@@ -2156,7 +2123,7 @@ +@@ -2156,7 +2120,7 @@ bool should_help = false; bool no_boot_log = false; bool no_daemon = false; diff --git a/plymouth-screen-twice-scale-on-160DPI-higher.patch b/plymouth-screen-twice-scale-on-160DPI-higher.patch index 75286f1..c3e30e5 100644 --- a/plymouth-screen-twice-scale-on-160DPI-higher.patch +++ b/plymouth-screen-twice-scale-on-160DPI-higher.patch @@ -1,7 +1,7 @@ -diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-utils.c plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-utils.c ---- plymouth-0.9.5~git20220412.e960111/src/libply/ply-utils.c 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/src/libply/ply-utils.c 2022-05-13 18:34:30.249211696 +0800 -@@ -861,7 +861,7 @@ +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-utils.c plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-utils.c +--- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-utils.c 2022-08-02 21:28:28.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-utils.c 2022-08-04 17:51:09.943348306 +0800 +@@ -862,7 +862,7 @@ } /* The minimum resolution at which we turn on a device-scale of 2 */ @@ -10,7 +10,7 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-utils.c plymouth-0. #define HIDPI_MIN_HEIGHT 1200 int -@@ -873,8 +873,20 @@ +@@ -874,8 +874,20 @@ int device_scale; double dpi_x, dpi_y; const char *force_device_scale; @@ -32,16 +32,16 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply/ply-utils.c plymouth-0. if ((force_device_scale = getenv ("PLYMOUTH_FORCE_SCALE"))) return strtoul (force_device_scale, NULL, 0); -@@ -893,14 +905,10 @@ +@@ -894,14 +906,10 @@ (width_mm == 16 && height_mm == 10)) return 1; - if (width_mm > 0 && height_mm > 0) { -- dpi_x = (double)width / (width_mm / 25.4); -- dpi_y = (double)height / (height_mm / 25.4); +- dpi_x = (double) width / (width_mm / 25.4); +- dpi_y = (double) height / (height_mm / 25.4); - /* We don't completely trust these values so both -- must be high, and never pick higher ratio than -- 2 automatically */ +- * must be high, and never pick higher ratio than +- * 2 automatically */ - if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT) - device_scale = 2; + if (dpi_x > HIDPI_TWICE_LIMIT && dpi_y > HIDPI_TWICE_LIMIT) diff --git a/plymouth.changes b/plymouth.changes index 2b42528..9029cd3 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,8 +1,21 @@ +------------------------------------------------------------------- +Thu Aug 4 01:50:22 UTC 2022 - Cliff Zhao + +- Update to version 0.9.5~git20220803.52b0494: + src: Run through uncrustify. + scripts: Diff less. + scripts: Update uncrustify config. + src: Drop vim: lines. + ply-utils: Drop linux/fs.h include. + scripts: Add -B to interdiff in check-format. +- Rebase plymouth-log-on-default.patch; +- Rebase plymouth-screen-twice-scale-on-160DPI-higher.patch; + ------------------------------------------------------------------- Wed Jul 20 03:50:22 UTC 2022 - Cliff Zhao - Update to version 0.9.5~git20220719.9e72df3: - * Make use of standard --runstatedir flag vs custom --with-runtimedir + Make use of standard --runstatedir flag vs custom --with-runtimedir ------------------------------------------------------------------- Mon Jul 11 13:01:49 UTC 2022 - Fabian Vogt diff --git a/plymouth.spec b/plymouth.spec index e1d641b..2d55035 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -23,7 +23,7 @@ %global soversion 5 Name: plymouth -Version: 0.9.5~git20220719.9e72df3 +Version: 0.9.5~git20220803.52b0494 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later