rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 424932 from home:scarabeus_iv:branches:Base:System

Browse Source 
- Update to version 0.9.2+git20160823.e4b7e49:
  * libply: fix HiDPI detection
  * libply, main: Add device scale setting
  * main: support plymouth.force-scale on the kernel command line
- Refresh patch:
  * 0001-let-it-become-a-real-daemon.patch

- Add systemd to buildrequires to properly detect systemd-ask-password

OBS-URL: https://build.opensuse.org/request/show/424932
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=175
This commit is contained in:
Ismail Dönmez 2016-09-06 09:35:37 +00:00 committed by Git OBS Bridge
parent dbc5b1774f
commit 82a38c1fee
5 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-let-it-become-a-real-daemon.patch
View File

@ -13,10 +13,10 @@ well restore the system console.
plymouth-0.9.0/src/main.c | 42 +++++++------ plymouth-0.9.0/src/main.c | 42 +++++++------
5 files changed, 43 insertions(+), 18 deletions(-) 5 files changed, 43 insertions(+), 18 deletions(-)
Index: plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-manager.c Index: plymouth-0.9.2+git20160823.e4b7e49/src/libply-splash-core/ply-device-manager.c
=================================================================== ===================================================================
--- plymouth-0.9.2+git20160620.0e65b86.orig/src/libply-splash-core/ply-device-manager.c --- plymouth-0.9.2+git20160823.e4b7e49.orig/src/libply-splash-core/ply-device-manager.c
+++ plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-manager.c +++ plymouth-0.9.2+git20160823.e4b7e49/src/libply-splash-core/ply-device-manager.c
@@ -949,3 +949,12 @@ ply_device_manager_deactivate_keyboards @@ -949,3 +949,12 @@ ply_device_manager_deactivate_keyboards
manager->keyboards_activated = false; manager->keyboards_activated = false;
@ -30,10 +30,10 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-mana
+ ply_terminal_close, + ply_terminal_close,
+ manager); + manager);
+} +}
Index: plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-manager.h Index: plymouth-0.9.2+git20160823.e4b7e49/src/libply-splash-core/ply-device-manager.h
=================================================================== ===================================================================
--- plymouth-0.9.2+git20160620.0e65b86.orig/src/libply-splash-core/ply-device-manager.h --- plymouth-0.9.2+git20160823.e4b7e49.orig/src/libply-splash-core/ply-device-manager.h
+++ plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-manager.h +++ plymouth-0.9.2+git20160823.e4b7e49/src/libply-splash-core/ply-device-manager.h
@@ -65,6 +65,7 @@ void ply_device_manager_deactivate_keybo @@ -65,6 +65,7 @@ void ply_device_manager_deactivate_keybo
void ply_device_manager_activate_renderers (ply_device_manager_t *manager); void ply_device_manager_activate_renderers (ply_device_manager_t *manager);
void ply_device_manager_deactivate_renderers (ply_device_manager_t *manager); void ply_device_manager_deactivate_renderers (ply_device_manager_t *manager);
@ -42,19 +42,19 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/libply-splash-core/ply-device-mana
#endif #endif
Index: plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-utils.c Index: plymouth-0.9.2+git20160823.e4b7e49/src/libply/ply-utils.c
=================================================================== ===================================================================
--- plymouth-0.9.2+git20160620.0e65b86.orig/src/libply/ply-utils.c --- plymouth-0.9.2+git20160823.e4b7e49.orig/src/libply/ply-utils.c
+++ plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-utils.c +++ plymouth-0.9.2+git20160823.e4b7e49/src/libply/ply-utils.c
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
static int errno_stack[PLY_ERRNO_STACK_SIZE]; static int errno_stack[PLY_ERRNO_STACK_SIZE];
static int errno_stack_position = 0; static int errno_stack_position = 0;
+static bool inChild = false; +static bool inChild = false;
bool static int overridden_device_scale = 0;
ply_open_unidirectional_pipe (int *sender_fd,
@@ -794,6 +795,7 @@ ply_create_daemon (void) @@ -796,6 +797,7 @@ ply_create_daemon (void)
if (!ply_read (receiver_fd, &byte, sizeof(uint8_t))) { if (!ply_read (receiver_fd, &byte, sizeof(uint8_t))) {
int read_error = errno; int read_error = errno;
int status; int status;
@ -62,7 +62,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-utils.c
if (waitpid (pid, &status, WNOHANG) <= 0) if (waitpid (pid, &status, WNOHANG) <= 0)
ply_error ("failed to read status from child immediately after starting to daemonize: %s", strerror (read_error)); ply_error ("failed to read status from child immediately after starting to daemonize: %s", strerror (read_error));
@@ -834,6 +836,9 @@ ply_detach_daemon (ply_daemon_handle_t * @@ -836,6 +838,9 @@ ply_detach_daemon (ply_daemon_handle_t *
close (sender_fd); close (sender_fd);
free (handle); free (handle);
@ -72,10 +72,10 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-utils.c
return true; return true;
} }
Index: plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-terminal-session.c Index: plymouth-0.9.2+git20160823.e4b7e49/src/libply/ply-terminal-session.c
=================================================================== ===================================================================
--- plymouth-0.9.2+git20160620.0e65b86.orig/src/libply/ply-terminal-session.c --- plymouth-0.9.2+git20160823.e4b7e49.orig/src/libply/ply-terminal-session.c
+++ plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-terminal-session.c +++ plymouth-0.9.2+git20160823.e4b7e49/src/libply/ply-terminal-session.c
@@ -187,6 +187,12 @@ ply_terminal_session_redirect_console (p @@ -187,6 +187,12 @@ ply_terminal_session_redirect_console (p
assert (terminal_name != NULL); assert (terminal_name != NULL);
@ -89,11 +89,11 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/libply/ply-terminal-session.c
fd = open (terminal_name, O_RDWR | O_NOCTTY); fd = open (terminal_name, O_RDWR | O_NOCTTY);
if (fd < 0) if (fd < 0)
Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c Index: plymouth-0.9.2+git20160823.e4b7e49/src/main.c
=================================================================== ===================================================================
--- plymouth-0.9.2+git20160620.0e65b86.orig/src/main.c --- plymouth-0.9.2+git20160823.e4b7e49.orig/src/main.c
+++ plymouth-0.9.2+git20160620.0e65b86/src/main.c +++ plymouth-0.9.2+git20160823.e4b7e49/src/main.c
@@ -1083,6 +1083,7 @@ on_text_display_removed (state_t @@ -1101,6 +1101,7 @@ on_text_display_removed (state_t
ply_boot_splash_remove_text_display (state->boot_splash, display); ply_boot_splash_remove_text_display (state->boot_splash, display);
} }
@ -101,7 +101,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
static void static void
load_devices (state_t *state, load_devices (state_t *state,
ply_device_manager_flags_t flags) ply_device_manager_flags_t flags)
@@ -1090,6 +1091,8 @@ load_devices (state_t @@ -1108,6 +1109,8 @@ load_devices (state_t
state->device_manager = ply_device_manager_new (state->default_tty, flags); state->device_manager = ply_device_manager_new (state->default_tty, flags);
state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager); state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
@ -110,7 +110,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
ply_device_manager_watch_devices (state->device_manager, ply_device_manager_watch_devices (state->device_manager,
state->device_timeout, state->device_timeout,
(ply_keyboard_added_handler_t) (ply_keyboard_added_handler_t)
@@ -1128,6 +1131,7 @@ quit_splash (state_t *state) @@ -1146,6 +1149,7 @@ quit_splash (state_t *state)
ply_trace ("Not retaining splash, so deallocating VT"); ply_trace ("Not retaining splash, so deallocating VT");
ply_terminal_deactivate_vt (state->local_console_terminal); ply_terminal_deactivate_vt (state->local_console_terminal);
ply_terminal_close (state->local_console_terminal); ply_terminal_close (state->local_console_terminal);
@ -118,7 +118,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
} }
} }
@@ -2073,28 +2077,20 @@ dump_debug_buffer_to_file (void) @@ -2091,28 +2095,20 @@ dump_debug_buffer_to_file (void)
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
static void static void
@ -157,7 +157,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
if (debug_buffer != NULL) { if (debug_buffer != NULL) {
dump_debug_buffer_to_file (); dump_debug_buffer_to_file ();
@@ -2107,7 +2103,6 @@ on_crash (int signum) @@ -2125,7 +2121,6 @@ on_crash (int signum)
pid_file = NULL; pid_file = NULL;
} }
@ -165,7 +165,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
raise (signum); raise (signum);
} }
@@ -2141,6 +2136,7 @@ main (int argc, @@ -2159,6 +2154,7 @@ main (int argc,
char *kernel_command_line = NULL; char *kernel_command_line = NULL;
char *tty = NULL; char *tty = NULL;
ply_device_manager_flags_t device_manager_flags = PLY_DEVICE_MANAGER_FLAGS_NONE; ply_device_manager_flags_t device_manager_flags = PLY_DEVICE_MANAGER_FLAGS_NONE;
@ -173,7 +173,7 @@ Index: plymouth-0.9.2+git20160620.0e65b86/src/main.c
state.start_time = ply_get_timestamp (); state.start_time = ply_get_timestamp ();
state.command_parser = ply_command_parser_new ("plymouthd", "Splash server"); state.command_parser = ply_command_parser_new ("plymouthd", "Splash server");
@@ -2243,8 +2239,13 @@ main (int argc, @@ -2261,8 +2257,13 @@ main (int argc,
if (debug) if (debug)
debug_buffer = ply_buffer_new (); debug_buffer = ply_buffer_new ();

3
plymouth-0.9.2+git20160620.0e65b86.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:729120eef3cf44dff4329e89e1122cf389865c0841c500ce10269e17cc3ba962
size 873172

3
plymouth-0.9.2+git20160823.e4b7e49.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf7b6118993ede8cb46b155d2ca8a3b4d897a74aefe62058f713e92d6d4a17c7
size 873224

19
plymouth.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Sep 06 09:23:50 UTC 2016 - tchvatal@suse.com
- Update to version 0.9.2+git20160823.e4b7e49:
* libply: fix HiDPI detection
* libply, main: Add device scale setting
* main: support plymouth.force-scale on the kernel command line
- Refresh patch:
* 0001-let-it-become-a-real-daemon.patch
-------------------------------------------------------------------
Tue Sep 6 09:22:50 UTC 2016 - tchvatal@suse.com
- Add systemd to buildrequires to properly detect systemd-ask-password
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 4 11:15:47 UTC 2016 - tchvatal@suse.com Thu Aug 4 11:15:47 UTC 2016 - tchvatal@suse.com
@ -13,10 +28,6 @@ Thu Aug 4 11:06:30 UTC 2016 - tchvatal@suse.com
* plymouth-boot-vga-framebuffer.patch * plymouth-boot-vga-framebuffer.patch
- Refresh patches: - Refresh patches:
* 0001-let-it-become-a-real-daemon.patch * 0001-let-it-become-a-real-daemon.patch
-------------------------------------------------------------------
Thu Aug 04 10:50:05 UTC 2016 - opensuse-packaging@opensuse.org
- Update to version 0.9.2+git20160620.0e65b86: - Update to version 0.9.2+git20160620.0e65b86:
* configure: tweak defaults to be more systemd friendly * configure: tweak defaults to be more systemd friendly
* text: don't draw if not animating * text: don't draw if not animating

4
plymouth.spec
View File

@ -21,7 +21,7 @@
%define plymouth_libdir %{_libdir} %define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img %define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth Name: plymouth
Version: 0.9.2+git20160620.0e65b86 Version: 0.9.2+git20160823.e4b7e49
Release: 0 Release: 0
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0+ License: GPL-2.0+
@ -58,6 +58,8 @@ BuildRequires: libxslt
BuildRequires: module-init-tools BuildRequires: module-init-tools
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
# needed for systemd-tty-ask-password-agent
BuildRequires: systemd
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)