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

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

Browse Source 
Drop plymouth-fix-window-size: The use of the smallest screen size is deliberate (boo#804607 bsc#894051).

OBS-URL: https://build.opensuse.org/request/show/627432
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=196
This commit is contained in:
Cliff Zhao 2018-08-04 07:53:38 +00:00 committed by Git OBS Bridge
parent 1b8c32e67b
commit 4bda2c2181
3 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plymouth-fix-window-size
View File

@ -1,38 +0,0 @@
From: Jeff Mahoney <jeffm@suse.com>
Subject: plymouth/script: Fix window size with multiple heads
Plymouth "zooms" in on smaller displays when multiple displays are used,
but the script splash plugin defines the window size as the smallest
of the displays. When using a sprite as a background image, the wrong
size is used which leaves large chunks of the screen unused.
This patch uses the largest display as the window size, which allows
it to be appopriately cropped on smaller displays.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
src/plugins/splash/script/script-lib-sprite.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
===================================================================
--- plymouth-0.9.2.orig/src/plugins/splash/script/script-lib-sprite.c
+++ plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
@@ -231,7 +231,7 @@ static script_return_t sprite_window_get
if (width == 0)
width = ply_pixel_display_get_width (display->pixel_display);
else
- width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
+ width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
}
return script_return_obj (script_obj_new_number (width));
}
@@ -269,7 +269,7 @@ static script_return_t sprite_window_get
if (height == 0)
height = ply_pixel_display_get_height (display->pixel_display);
else
- height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
+ height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
}
return script_return_obj (script_obj_new_number (height));
}

6
plymouth.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Aug 4 06:15:14 UTC 2018 - qzhao@suse.com
- Drop plymouth-fix-window-size: The use of the smallest screen
size is deliberate (boo#804607 bsc#894051).
-------------------------------------------------------------------
Wed Apr 11 12:44:36 UTC 2018 - oholecek@suse.com

18
plymouth.spec
View File

@ -20,6 +20,7 @@
%define plymouthclient_execdir %{_bindir}
%define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.9.3+git20171220.6e9e95d
Release: 0
@ -27,13 +28,9 @@ Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
Group: System/Base
Url: http://www.freedesktop.org/wiki/Software/Plymouth
# Switched to git snapshot to ease bugfix inclusion
Source0: %{name}-%{version}.tar.xz
Source1: boot-duration
# PATCH-FIX-OPENSUSE plymouth-fix-window-size.patch
# plymouth Mailist 2013 April 14 jeffm@suse.com
# -- Handle correctly multiple displays with different sizes
Patch3: plymouth-fix-window-size
# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com
# -- prefix is /usr/sbin and /usr/bin
Patch9: plymouth-dracut-path.patch
@ -46,8 +43,12 @@ Patch16: plymouth-correct-runtime-dir.patch
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de
# -- Fix man page installation
Patch17: plymouth-manpages.patch
# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch bsc#888590 bsc#980750 fvogt@suse.com
# -- force fb for cirrus and bochs, force drm otherwise
# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch bnc#888590 fcrozat@suse.com
# -- ignore cirrusdrm, use fb instead
# Patch26: plymouth-ignore-cirrusdrm.patch
# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com
# -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer
# -- driver and plymouth-ignore-cirrusdrm.patch with single patch.
Patch26: only_use_fb_for_cirrus_bochs.patch
# PATCH-FIX-UPSTREAM
# 0001-Add-label-ft-plugin.patch
@ -58,6 +59,7 @@ Patch26: only_use_fb_for_cirrus_bochs.patch
Patch30: 0001-Add-label-ft-plugin.patch
Patch31: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
Patch32: 0003-fix_null_deref.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: kernel-headers
@ -78,6 +80,7 @@ BuildRequires: pkgconfig(libsystemd) >= 186
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(pango) >= 1.21.0
BuildRequires: pkgconfig(systemd) >= 186
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
Requires: systemd >= 186
@ -347,7 +350,6 @@ plugin.
%prep
%setup -q
%patch3 -p1
%patch9
%patch10 -p1
%patch16 -p1