Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2022-08-07 18:33:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Sun Aug 7 18:33:47 2022 rev:110 rq:993316 version:22.02.122+60.52b0494
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2022-07-31
23:01:05.907718674 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new.1521/plymouth.changes
2022-08-07 18:33:51.661140858 +0200
@@ -1,0 +2,13 @@
+Thu Aug 4 01:50:22 UTC 2022 - Cliff Zhao <qz...@suse.com>
+
+- Update to version 22.02.122+60.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;
+
+-------------------------------------------------------------------
@@ -5 +18 @@
- * Make use of standard --runstatedir flag vs custom --with-runtimedir
+ Make use of standard --runstatedir flag vs custom --with-runtimedir
Old:
----
plymouth-0.9.5~git20220719.9e72df3.tar.xz
New:
----
plymouth-22.02.122+60.52b0494.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.p1VQPW/_old 2022-08-07 18:33:52.465143194 +0200
+++ /var/tmp/diff_new_pack.p1VQPW/_new 2022-08-07 18:33:52.473143218 +0200
@@ -23,7 +23,7 @@
%global soversion 5
Name: plymouth
-Version: 0.9.5~git20220719.9e72df3
+Version: 22.02.122+60.52b0494
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.p1VQPW/_old 2022-08-07 18:33:52.525143369 +0200
+++ /var/tmp/diff_new_pack.p1VQPW/_new 2022-08-07 18:33:52.529143381 +0200
@@ -4,7 +4,10 @@
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">plymouth</param>
- <param name="versionformat">0.9.5~git%cd.%h</param>
+ <param name="revision">main</param>
+ <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.%h</param>
+ <param name="versionrewrite-pattern">(.*)\+0.*</param>
+ <param name="versionrewrite-replacement">\1</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.p1VQPW/_old 2022-08-07 18:33:52.553143451 +0200
+++ /var/tmp/diff_new_pack.p1VQPW/_new 2022-08-07 18:33:52.557143462 +0200
@@ -3,6 +3,6 @@
<param
name="url">git://anongit.freedesktop.org/plymouth</param>
<param
name="changesrevision">6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6</param></service><service
name="tar_scm">
<param
name="url">https://gitlab.freedesktop.org/plymouth/plymouth.git</param>
- <param
name="changesrevision">2a7755febb2daa92f785abb710aee00d48cb7e3a</param></service></servicedata>
+ <param
name="changesrevision">9dff465f0cb6ee512d8273891a41675f39e5e654</param></service></servicedata>
(No newline at EOF)
++++++ plymouth-log-on-default.patch ++++++
--- /var/tmp/diff_new_pack.p1VQPW/_old 2022-08-07 18:33:52.601143590 +0200
+++ /var/tmp/diff_new_pack.p1VQPW/_new 2022-08-07 18:33:52.605143602 +0200
@@ -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 @@
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;
++
++ 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);
++ }
++
++ assert (buffer->size + length < buffer->capacity);
+
-+ const uint8_t *bytes = bytes_in;
++ memcpy (buffer->data + buffer->size,
++ bytes, length);
+
-+ 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);
-+ }
-+
- 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,
++ 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 @@
- 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
+-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 @@
- 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 @@
- 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 @@
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 @@
}
static void
-@@ -2156,7 +2123,7 @@
+@@ -2156,7 +2120,7 @@
bool should_help = false;
bool no_boot_log = false;
bool no_daemon = false;
++++++ plymouth-screen-twice-scale-on-160DPI-higher.patch ++++++
--- /var/tmp/diff_new_pack.p1VQPW/_old 2022-08-07 18:33:52.625143660 +0200
+++ /var/tmp/diff_new_pack.p1VQPW/_new 2022-08-07 18:33:52.625143660 +0200
@@ -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 @@
#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 @@
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)
