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

Accepting request 501560 from home:1Antoine1:branches:Base:System

Browse Source 
- Update to version 0.9.2+git20170424.6fd5c6b:
  * main: Look for config in runtime dir first
  * main: Look for theme in runtime dir first
  * Revert "Recreate boot log at each boot instead of appending"
  * x11: implement get_display_name
  * drm: implement get_display_name
  * configure: don't look for libudev when --without-udev is passed
  * renderer: export device name from plugin
  * device-manager: handle NULL renderer better
- Remove 0001-device-manager-handle-NULL-renderer-better.patch
  (upstreamed).

This fixes plymouth-start.service failure at startup for me. Still have
the three green question marks instead of a proper splash screen but I
guess it's another problem.

OBS-URL: https://build.opensuse.org/request/show/501560
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=181
This commit is contained in:
Cliff Zhao 2017-06-07 07:05:34 +00:00 committed by Git OBS Bridge
parent b4dd9ebde7
commit 72f16973b9
6 changed files with 20 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-device-manager-handle-NULL-renderer-better.patch
View File

@ -1,47 +0,0 @@
From fdda9af2c305ecf57407856b1d061c076ae8fe4a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 18 Jan 2017 10:07:00 -0500
Subject: [PATCH] device-manager: handle NULL renderer better
Right now we'll pass a NULL device name and crash if the renderer
fails to open.
This commit fixes that.
---
src/libply-splash-core/ply-device-manager.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 4004e11..b4c33d4 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -689,16 +689,18 @@ create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
return;
}
- old_renderer = ply_hashtable_lookup (manager->renderers,
- (void *) ply_renderer_get_device_name (renderer));
+ if (renderer != NULL) {
+ old_renderer = ply_hashtable_lookup (manager->renderers,
+ (void *) ply_renderer_get_device_name (renderer));
- if (old_renderer != NULL) {
- ply_trace ("ignoring device %s since it's alerady managed",
- ply_renderer_get_device_name (renderer));
- ply_renderer_free (renderer);
+ if (old_renderer != NULL) {
+ ply_trace ("ignoring device %s since it's alerady managed",
+ ply_renderer_get_device_name (renderer));
+ ply_renderer_free (renderer);
- renderer = NULL;
- return;
+ renderer = NULL;
+ return;
+ }
}
}
--
2.11.0

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://anongit.freedesktop.org/plymouth</param>
<param name="changesrevision">18dd75589bbdf0ddc07a61421f05078df88ee768</param></service></servicedata>
<param name="changesrevision">6fd5c6b260b89604f2ff7d65a4f1a011db23a726</param></service></servicedata>

3
plymouth-0.9.2+git20161215.18dd755.tar.xz
View File

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

3
plymouth-0.9.2+git20170424.6fd5c6b.tar.xz Normal file
View File

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

15
plymouth.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon May 8 15:20:02 UTC 2017 - antoine.belvire@opensuse.org
- Update to version 0.9.2+git20170424.6fd5c6b:
* main: Look for config in runtime dir first
* main: Look for theme in runtime dir first
* Revert "Recreate boot log at each boot instead of appending"
* x11: implement get_display_name
* drm: implement get_display_name
* configure: don't look for libudev when --without-udev is passed
* renderer: export device name from plugin
* device-manager: handle NULL renderer better
- Remove 0001-device-manager-handle-NULL-renderer-better.patch
(upstreamed).
-------------------------------------------------------------------
Thu Jan 26 22:11:01 UTC 2017 - zaitor@opensuse.org

5
plymouth.spec
View File

@ -21,7 +21,7 @@
%define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.9.2+git20161215.18dd755
Version: 0.9.2+git20170424.6fd5c6b
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
@ -41,8 +41,6 @@ Patch10: 0001-Some-greenish-openSUSE-colors.patch
Patch16: plymouth-correct-runtime-dir.patch
# PATCH-FIX-UPSTREAM plymouth-manpages.patch idoenmez@suse.de -- Fix man page installation
Patch17: plymouth-manpages.patch
# PATCH-FIX-UPSTREAM 0001-device-manager-handle-NULL-renderer-better.patch rstrode@redhat.com -- device-manager: handle NULL renderer better
Patch18: 0001-device-manager-handle-NULL-renderer-better.patch
# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise
Patch26: only_use_fb_for_cirrus_bochs.patch
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch fvogt@suse.com -- add ability to output text in initrd
@ -344,7 +342,6 @@ plugin.
%patch10 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch26 -p1
%patch30 -p1
%patch31 -p1