pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 645870 from home:qzhao:branches:Base:System

Browse Source 
Update to version 0.9.3+git20181031.025ce59: drm: use preferred mode for outputs, drm: Refactor ply_renderer_connector_get_rotation, drm: Reset LUT/gamma table before the first drmModeSetCrtc call, libply: Move kernel commandline parsing functions to libply/ply-utils, throbber: Don't skip last frame when waiting for end. - Drop plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch, * Upstream has already accept Michal's modification.

OBS-URL: https://build.opensuse.org/request/show/645870
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=206
This commit is contained in:
Cliff Zhao 2018-11-01 09:05:31 +00:00 committed by Git OBS Bridge
parent d27b9a66a2
commit 4ee51fec78
5 changed files with 16 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plymouth-0.9.3+git20181016.a588b3f.tar.xz
View File

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

3
plymouth-0.9.3+git20181031.025ce59.tar.xz Normal file
View File

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

49
plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch
View File

@ -1,49 +0,0 @@
From 121783eff1759f6089863ec4d3e722e94fe73cdb Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Tue, 23 Oct 2018 09:10:25 +0200
Subject: [PATCH] throbber: Don't skip last frame when waiting for end.
If the stop_trigger is set and we are waiting for the last frame to stop the
animation, make sure we don't accidentally skip the last frame. It could
happen if the machine is busy and can't keep up with the frames or when the
animation has more than 60 frames (30FPS * 2 seconds).
---
src/libply-splash-graphics/ply-throbber.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/libply-splash-graphics/ply-throbber.c b/src/libply-splash-graphics/ply-throbber.c
index f18feb6..a4311fd 100644
--- a/src/libply-splash-graphics/ply-throbber.c
+++ b/src/libply-splash-graphics/ply-throbber.c
@@ -144,6 +144,7 @@ animate_at_time (ply_throbber_t *throbber,
ply_pixel_buffer_t *const *frames;
bool should_continue;
double percent_in_sequence;
+ int last_frame_number;
number_of_frames = ply_array_get_size (throbber->frames);
@@ -152,11 +153,19 @@ animate_at_time (ply_throbber_t *throbber,
should_continue = true;
percent_in_sequence = fmod (time, THROBBER_DURATION) / THROBBER_DURATION;
+ last_frame_number = throbber->frame_number;
throbber->frame_number = (int) (number_of_frames * percent_in_sequence);
- if (throbber->stop_trigger != NULL)
+ if (throbber->stop_trigger != NULL) {
+ /* If we are trying to stop, make sure we don't skip the last
+ * frame and loop around. Clamp it to the last frame.
+ */
+ if (last_frame_number > throbber->frame_number)
+ throbber->frame_number = number_of_frames - 1;
+
if (throbber->frame_number == number_of_frames - 1)
should_continue = false;
+ }
frames = (ply_pixel_buffer_t *const *) ply_array_get_pointer_elements (throbber->frames);
ply_pixel_buffer_get_size (frames[throbber->frame_number], &throbber->frame_area);
--
2.16.4

12
plymouth.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Oct 31 15:30:48 UTC 2018 - qzhao@suse.com
- Update to version 0.9.3+git20181031.025ce59:
drm: use preferred mode for outputs
drm: Refactor ply_renderer_connector_get_rotation
drm: Reset LUT/gamma table before the first drmModeSetCrtc call
libply: Move kernel commandline parsing functions to libply/ply-utils
throbber: Don't skip last frame when waiting for end.
- Drop plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch
* Upstream has already accept Michal's modification.
-------------------------------------------------------------------
Tue Oct 23 07:15:48 UTC 2018 - msrb@suse.com

4
plymouth.spec
View File

@ -22,7 +22,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.9.3+git20181016.a588b3f
Version: 0.9.3+git20181031.025ce59
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
@ -47,8 +47,6 @@ Patch5: 0001-Add-label-ft-plugin.patch
Patch6: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
Patch7: 0003-fix_null_deref.patch
# PATCH-FIX-UPSTREAM plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch boo#1110199 msrb@suse.com -- Do not skip last frame when waiting for end of throbber animation. Prevents unvanted looping after being told to quit.
Patch8: plymouth-throbber-Don-t-skip-last-frame-when-waiting-for-end.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets