Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2018-12-05 09:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Wed Dec 5 09:36:51 2018 rev:66 rq:652589 version:0.9.4+git20181129.a7ec3e6 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2018-11-28 11:09:27.983227270 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new.19453/plymouth.changes 2018-12-05 09:36:55.357130055 +0100 @@ -1,0 +2,14 @@ +Thu Nov 29 07:54:27 UTC 2018 - [email protected] + +- Update to version 0.9.4+git20181129.a7ec3e6: + * Add new BGRT theme, using the firmware boot splash as background + * two-step: bgrt: Deal with quirky firmwares, Add ACPI BGRT + extension support, Speed up background-tile drawing on HiDPI + screens, Use a pixel-buffer instead of an image for the view's + background + * ply-pixel-buffer: Add ply_pixel_buffer_rotate_upright helper, + Add ply_pixel_buffer_get/set_device_rotation helpers, Fix marking + buffers as opaque when doing a solid fill, Fix fill_with_buffer + fastpath when device_scale != 1. + +------------------------------------------------------------------- Old: ---- plymouth-0.9.4+git20181122.aaa140b.tar.xz New: ---- plymouth-0.9.4+git20181129.a7ec3e6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.AILsg9/_old 2018-12-05 09:36:56.017129333 +0100 +++ /var/tmp/diff_new_pack.AILsg9/_new 2018-12-05 09:36:56.017129333 +0100 @@ -22,7 +22,7 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.4+git20181122.aaa140b +Version: 0.9.4+git20181129.a7ec3e6 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later @@ -325,7 +325,7 @@ Plymouth %package theme-script -Summary: Plymouth "Script" plugin +Summary: Plymouth "Script" theme Group: System/Base Requires: %{name}-plugin-script = %{version} Requires(post): %{name}-scripts @@ -333,9 +333,20 @@ %description theme-script This package contains the "script" boot splash theme for -Plymouth. It it is a simple example theme the uses the "script" +Plymouth. It is a simple example theme the uses the "script" plugin. +%package theme-bgrt +Summary: Plymouth "bgrt" theme +Group: System/Base +Requires: %{name}-plugin-script = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-bgrt +This package contains the "bgrt" boot splash theme for +Plymouth. + %prep %autosetup -p1 @@ -633,4 +644,9 @@ %{_datadir}/plymouth/themes/script/script.script %{_datadir}/plymouth/themes/script/script.plymouth +%files theme-bgrt +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/bgrt +%{_datadir}/plymouth/themes/bgrt/*.* + %changelog ++++++ plymouth-0.9.4+git20181122.aaa140b.tar.xz -> plymouth-0.9.4+git20181129.a7ec3e6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/FETCH_HEAD new/plymouth-0.9.4+git20181129.a7ec3e6/.git/FETCH_HEAD --- old/plymouth-0.9.4+git20181122.aaa140b/.git/FETCH_HEAD 2018-11-23 13:05:44.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/FETCH_HEAD 2018-11-29 10:49:57.000000000 +0100 @@ -1,4 +1,4 @@ -aaa140b83867f3c5b147df21f878e42d36d21a65 branch 'master' of https://gitlab.freedesktop.org/plymouth/plymouth +a7ec3e65ba3db78656883732feb9af7cf7362f77 branch 'master' of https://gitlab.freedesktop.org/plymouth/plymouth 133ef6f14af0cebef182750784284c4249d5166c not-for-merge branch 'bitmap-label-control' of https://gitlab.freedesktop.org/plymouth/plymouth cf766763f26ad0bb8e001a9ecf65b00f4c766e3c not-for-merge branch 'config-file' of https://gitlab.freedesktop.org/plymouth/plymouth 34ad039ed0816bd7372aca95dc0d25327320154d not-for-merge branch 'cothreads' of https://gitlab.freedesktop.org/plymouth/plymouth Binary files old/plymouth-0.9.4+git20181122.aaa140b/.git/index and new/plymouth-0.9.4+git20181129.a7ec3e6/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/HEAD new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/HEAD --- old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/HEAD 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/HEAD 2018-11-29 10:49:57.000000000 +0100 @@ -5,3 +5,4 @@ 025ce598252c6a08738e0efbc3512500b668a94b f89858654353d9ab1ca9a2a2a9f758d40f868091 ZhaoQiang <[email protected]> 1541474582 +0800 pull: Fast-forward f89858654353d9ab1ca9a2a2a9f758d40f868091 118c5ca1bc825ff5ff93029820e7badddb53dd6e ZhaoQiang <[email protected]> 1541991173 +0800 pull: Fast-forward 118c5ca1bc825ff5ff93029820e7badddb53dd6e aaa140b83867f3c5b147df21f878e42d36d21a65 ZhaoQiang <[email protected]> 1542974562 +0800 pull: Fast-forward +aaa140b83867f3c5b147df21f878e42d36d21a65 a7ec3e65ba3db78656883732feb9af7cf7362f77 ZhaoQiang <[email protected]> 1543484997 +0800 pull: Fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/refs/heads/master new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/refs/heads/master --- old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/refs/heads/master 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/refs/heads/master 2018-11-29 10:49:57.000000000 +0100 @@ -5,3 +5,4 @@ 025ce598252c6a08738e0efbc3512500b668a94b f89858654353d9ab1ca9a2a2a9f758d40f868091 ZhaoQiang <[email protected]> 1541474582 +0800 pull: Fast-forward f89858654353d9ab1ca9a2a2a9f758d40f868091 118c5ca1bc825ff5ff93029820e7badddb53dd6e ZhaoQiang <[email protected]> 1541991173 +0800 pull: Fast-forward 118c5ca1bc825ff5ff93029820e7badddb53dd6e aaa140b83867f3c5b147df21f878e42d36d21a65 ZhaoQiang <[email protected]> 1542974562 +0800 pull: Fast-forward +aaa140b83867f3c5b147df21f878e42d36d21a65 a7ec3e65ba3db78656883732feb9af7cf7362f77 ZhaoQiang <[email protected]> 1543484997 +0800 pull: Fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/refs/remotes/origin/master new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/refs/remotes/origin/master --- old/plymouth-0.9.4+git20181122.aaa140b/.git/logs/refs/remotes/origin/master 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/logs/refs/remotes/origin/master 2018-11-29 10:49:57.000000000 +0100 @@ -4,3 +4,4 @@ 025ce598252c6a08738e0efbc3512500b668a94b f89858654353d9ab1ca9a2a2a9f758d40f868091 ZhaoQiang <[email protected]> 1541474582 +0800 pull: fast-forward f89858654353d9ab1ca9a2a2a9f758d40f868091 118c5ca1bc825ff5ff93029820e7badddb53dd6e ZhaoQiang <[email protected]> 1541991173 +0800 pull: fast-forward 118c5ca1bc825ff5ff93029820e7badddb53dd6e aaa140b83867f3c5b147df21f878e42d36d21a65 ZhaoQiang <[email protected]> 1542974562 +0800 pull: fast-forward +aaa140b83867f3c5b147df21f878e42d36d21a65 a7ec3e65ba3db78656883732feb9af7cf7362f77 ZhaoQiang <[email protected]> 1543484997 +0800 pull: fast-forward Binary files old/plymouth-0.9.4+git20181122.aaa140b/.git/objects/pack/pack-322a07714071bde20d77de942e9cbc8fc67219ac.idx and new/plymouth-0.9.4+git20181129.a7ec3e6/.git/objects/pack/pack-322a07714071bde20d77de942e9cbc8fc67219ac.idx differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/.git/objects/pack/pack-322a07714071bde20d77de942e9cbc8fc67219ac.pack and new/plymouth-0.9.4+git20181129.a7ec3e6/.git/objects/pack/pack-322a07714071bde20d77de942e9cbc8fc67219ac.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/refs/heads/master new/plymouth-0.9.4+git20181129.a7ec3e6/.git/refs/heads/master --- old/plymouth-0.9.4+git20181122.aaa140b/.git/refs/heads/master 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/refs/heads/master 2018-11-29 10:49:57.000000000 +0100 @@ -1 +1 @@ -aaa140b83867f3c5b147df21f878e42d36d21a65 +a7ec3e65ba3db78656883732feb9af7cf7362f77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/.git/refs/remotes/origin/master new/plymouth-0.9.4+git20181129.a7ec3e6/.git/refs/remotes/origin/master --- old/plymouth-0.9.4+git20181122.aaa140b/.git/refs/remotes/origin/master 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/.git/refs/remotes/origin/master 2018-11-29 10:49:57.000000000 +0100 @@ -1 +1 @@ -aaa140b83867f3c5b147df21f878e42d36d21a65 +a7ec3e65ba3db78656883732feb9af7cf7362f77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/configure.ac new/plymouth-0.9.4+git20181129.a7ec3e6/configure.ac --- old/plymouth-0.9.4+git20181122.aaa140b/configure.ac 2018-11-06 04:23:02.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/configure.ac 2018-11-29 10:49:57.000000000 +0100 @@ -322,6 +322,7 @@ themes/glow/Makefile themes/spinner/Makefile themes/script/Makefile + themes/bgrt/Makefile images/Makefile scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-buffer.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-buffer.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-buffer.c 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-buffer.c 2018-11-29 10:49:57.000000000 +0100 @@ -315,7 +315,7 @@ /* If we're filling the entire buffer with a fully opaque color, * then make note of it */ - if (fill_area == &buffer->area && + if (memcmp(fill_area, &buffer->area, sizeof(ply_rectangle_t)) == 0 && (pixel_value >> 24) == 0xff) { buffer->is_opaque = true; } @@ -868,8 +868,8 @@ if (cropped_area.width == 0 || cropped_area.height == 0) return; - x = cropped_area.x - x_offset; - y = cropped_area.y - y_offset; + x = cropped_area.x - x_offset * canvas->device_scale; + y = cropped_area.y - y_offset * canvas->device_scale; ply_pixel_buffer_copy_area (canvas, source, x, y, &cropped_area); @@ -1079,4 +1079,59 @@ buffer->logical_area.height = buffer->area.height / scale; } +ply_pixel_buffer_rotation_t +ply_pixel_buffer_get_device_rotation (ply_pixel_buffer_t *buffer) +{ + return buffer->device_rotation; +} + +void +ply_pixel_buffer_set_device_rotation (ply_pixel_buffer_t *buffer, + ply_pixel_buffer_rotation_t device_rotation) +{ + if (buffer->device_rotation == device_rotation) + return; + + buffer->device_rotation = device_rotation; + + if (device_rotation == PLY_PIXEL_BUFFER_ROTATE_CLOCKWISE || + device_rotation == PLY_PIXEL_BUFFER_ROTATE_COUNTER_CLOCKWISE) { + unsigned long tmp = buffer->area.width; + buffer->area.width = buffer->area.height; + buffer->area.height = tmp; + + ply_pixel_buffer_set_device_scale (buffer, buffer->device_scale); + } + + while (ply_list_get_length (buffer->clip_areas) > 0) { + ply_pixel_buffer_pop_clip_area (buffer); + } + ply_pixel_buffer_push_clip_area (buffer, &buffer->area); +} + +ply_pixel_buffer_t * +ply_pixel_buffer_rotate_upright (ply_pixel_buffer_t *old_buffer) +{ + ply_pixel_buffer_t *buffer; + int x,y, width, height; + uint32_t pixel; + + width = old_buffer->area.width; + height = old_buffer->area.height; + + buffer = ply_pixel_buffer_new (width, height); + + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + pixel = ply_pixel_buffer_get_pixel (old_buffer, x, y); + ply_pixel_buffer_set_pixel (buffer, x, y, pixel); + } + } + + ply_pixel_buffer_set_device_scale (buffer, old_buffer->device_scale); + ply_pixel_buffer_set_opaque (buffer, old_buffer->is_opaque); + + return buffer; +} + /* vim: set ts=4 sw=4 et ai ci cino={.5s,^-2,+.5s,t0,g0,e-2,n-2,p2s,(0,=.5s,:.5s */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-buffer.h new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-buffer.h --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-buffer.h 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-buffer.h 2018-11-29 10:49:57.000000000 +0100 @@ -59,6 +59,12 @@ void ply_pixel_buffer_set_device_scale (ply_pixel_buffer_t *buffer, int scale); +ply_pixel_buffer_rotation_t +ply_pixel_buffer_get_device_rotation (ply_pixel_buffer_t *buffer); +/* Note calling this removes all pushed clip-areas */ +void ply_pixel_buffer_set_device_rotation (ply_pixel_buffer_t *buffer, + ply_pixel_buffer_rotation_t rotation); + unsigned long ply_pixel_buffer_get_width (ply_pixel_buffer_t *buffer); unsigned long ply_pixel_buffer_get_height (ply_pixel_buffer_t *buffer); @@ -153,6 +159,12 @@ long width, long height); +/* Return the upright version of a buffer which is non upright. + * This is the *only* ply_pixel_buffer function which works correctly with a + * non upright buffer as source. + */ +ply_pixel_buffer_t *ply_pixel_buffer_rotate_upright (ply_pixel_buffer_t *old_buffer); + #endif #endif /* PLY_PIXEL_BUFFER_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-display.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-display.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-display.c 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-display.c 2018-11-29 10:49:57.000000000 +0100 @@ -51,6 +51,7 @@ unsigned long width; unsigned long height; + int device_scale; ply_pixel_display_draw_handler_t draw_handler; void *draw_handler_user_data; @@ -77,6 +78,7 @@ display->width = size.width; display->height = size.height; + display->device_scale = ply_pixel_buffer_get_device_scale (pixel_buffer); return display; } @@ -105,6 +107,12 @@ return display->height; } +int +ply_pixel_display_get_device_scale (ply_pixel_display_t *display) +{ + return display->device_scale; +} + static void ply_pixel_display_flush (ply_pixel_display_t *display) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-display.h new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-display.h --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-pixel-display.h 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-pixel-display.h 2018-11-29 10:49:57.000000000 +0100 @@ -51,6 +51,7 @@ unsigned long ply_pixel_display_get_width (ply_pixel_display_t *display); unsigned long ply_pixel_display_get_height (ply_pixel_display_t *display); +int ply_pixel_display_get_device_scale (ply_pixel_display_t *display); void ply_pixel_display_set_draw_handler (ply_pixel_display_t *display, ply_pixel_display_draw_handler_t draw_handler, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer-plugin.h new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer-plugin.h --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer-plugin.h 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer-plugin.h 2018-11-29 10:49:57.000000000 +0100 @@ -68,6 +68,11 @@ ply_renderer_input_source_t *input_source); const char * (*get_device_name)(ply_renderer_backend_t *backend); + bool (*get_panel_properties)(ply_renderer_backend_t *backend, + int *width, + int *height, + ply_pixel_buffer_rotation_t *rotation, + int *scale); } ply_renderer_plugin_interface_t; #endif /* PLY_RENDERER_PLUGIN_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer.c 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer.c 2018-11-29 10:49:57.000000000 +0100 @@ -410,4 +410,19 @@ renderer->input_source_is_open = false; } +bool +ply_renderer_get_panel_properties (ply_renderer_t *renderer, + int *width, + int *height, + ply_pixel_buffer_rotation_t *rotation, + int *scale) +{ + if (!renderer->plugin_interface->get_panel_properties) + return false; + + return renderer->plugin_interface->get_panel_properties (renderer->backend, + width, height, + rotation, scale); +} + /* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer.h new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer.h --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-core/ply-renderer.h 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-core/ply-renderer.h 2018-11-29 10:49:57.000000000 +0100 @@ -76,6 +76,12 @@ void ply_renderer_close_input_source (ply_renderer_t *renderer, ply_renderer_input_source_t *input_source); + +bool ply_renderer_get_panel_properties (ply_renderer_t *renderer, + int *width, + int *height, + ply_pixel_buffer_rotation_t *rotation, + int *scale); #endif #endif /* PLY_RENDERER_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-graphics/ply-image.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-graphics/ply-image.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/libply-splash-graphics/ply-image.c 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/libply-splash-graphics/ply-image.c 2018-11-29 10:49:57.000000000 +0100 @@ -55,6 +55,29 @@ ply_pixel_buffer_t *buffer; }; +struct bmp_file_header { + uint16_t id; + uint32_t file_size; + uint32_t reserved; + uint32_t bitmap_offset; +} __attribute__((__packed__)); + +struct bmp_dib_header { + uint32_t dib_header_size; + int32_t width; + int32_t height; + uint16_t planes; + uint16_t bpp; + uint32_t compression; + uint32_t bitmap_size; + uint32_t horz_resolution; + uint32_t vert_resolution; + uint32_t colors_used; + uint32_t colors_important; +} __attribute__((__packed__)); + +const uint8_t png_header[8] = { 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a }; + ply_image_t * ply_image_new (const char *filename) { @@ -112,8 +135,8 @@ } } -bool -ply_image_load (ply_image_t *image) +static bool +ply_image_load_png (ply_image_t *image, FILE *fp) { png_struct *png; png_info *info; @@ -121,13 +144,9 @@ int bits_per_pixel, color_type, interlace_method; png_byte **rows; uint32_t *bytes; - FILE *fp; assert (image != NULL); - - fp = fopen (image->filename, "re"); - if (fp == NULL) - return false; + assert (fp != NULL); png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); assert (png != NULL); @@ -137,10 +156,8 @@ png_init_io (png, fp); - if (setjmp (png_jmpbuf (png)) != 0) { - fclose (fp); + if (setjmp (png_jmpbuf (png)) != 0) return false; - } png_read_info (png, info); png_get_IHDR (png, info, @@ -188,12 +205,106 @@ free (rows); png_read_end (png, info); - fclose (fp); png_destroy_read_struct (&png, &info, NULL); return true; } +static bool +ply_image_load_bmp (ply_image_t *image, FILE *fp) +{ + uint32_t x, y, src_y, width, height, bmp_pitch, *dst; + struct bmp_file_header file_header; + struct bmp_dib_header dib_header; + uint8_t r, g, b, *buf, *src; + bool ret = false; + + assert (image != NULL); + assert (fp != NULL); + + if (fread (&file_header, 1, sizeof(struct bmp_file_header), fp) != sizeof(struct bmp_file_header)) + return false; + + if (fread (&dib_header, 1, sizeof(struct bmp_dib_header), fp) != sizeof(struct bmp_dib_header)) + return false; + + if (dib_header.dib_header_size != 40 || dib_header.width < 0 || + dib_header.planes != 1 || dib_header.bpp != 24 || + dib_header.compression != 0) + return false; + + width = dib_header.width; + height = abs (dib_header.height); + bmp_pitch = (3 * width + 3) & ~3; + + buf = malloc (bmp_pitch * height); + assert (buf); + + if (fseek (fp, file_header.bitmap_offset, SEEK_SET) != 0) + goto out; + + if (fread (buf, 1, bmp_pitch * height, fp) != bmp_pitch * height) + goto out; + + image->buffer = ply_pixel_buffer_new (width, height); + dst = ply_pixel_buffer_get_argb32_data (image->buffer); + + for (y = 0; y < height; y++) { + /* Positive header height means upside down row order */ + if (dib_header.height > 0) + src_y = (height - 1) - y; + else + src_y = y; + + src = buf + src_y * bmp_pitch; + + for (x = 0; x < width; x++) { + b = *src++; + g = *src++; + r = *src++; + *dst++ = (0xff << 24) | (r << 16) | (g << 8) | (b << 0); + } + } + + ply_pixel_buffer_set_opaque (image->buffer, true); + ret = true; +out: + free (buf); + return ret; +} + +bool +ply_image_load (ply_image_t *image) +{ + uint8_t header[16]; + bool ret = false; + FILE *fp; + + assert (image != NULL); + + fp = fopen (image->filename, "re"); + if (fp == NULL) + return false; + + if (fread (header, 1, 16, fp) != 16) + goto out; + + /* Rewind */ + if (fseek (fp, 0, SEEK_SET) != 0) + goto out; + + if (memcmp (header, png_header, sizeof(png_header)) == 0) + ret = ply_image_load_png (image, fp); + + else if (((struct bmp_file_header *)header)->id == 0x4d42 && + ((struct bmp_file_header *)header)->reserved == 0) + ret = ply_image_load_bmp (image, fp); + +out: + fclose (fp); + return ret; +} + uint32_t * ply_image_get_data (ply_image_t *image) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/plugins/renderers/drm/plugin.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/plugins/renderers/drm/plugin.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/plugins/renderers/drm/plugin.c 2018-11-01 08:41:07.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/plugins/renderers/drm/plugin.c 2018-11-29 10:49:57.000000000 +0100 @@ -138,6 +138,11 @@ uint32_t is_active : 1; uint32_t requires_explicit_flushing : 1; uint32_t use_preferred_mode : 1; + + int panel_width; + int panel_height; + ply_pixel_buffer_rotation_t panel_rotation; + int panel_scale; }; ply_renderer_plugin_interface_t *ply_renderer_backend_get_interface (void); @@ -542,6 +547,15 @@ ply_pixel_buffer_fill_with_color (head->pixel_buffer, NULL, 0.0, 0.0, 0.0, 1.0); + if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS || + connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type == DRM_MODE_CONNECTOR_DSI) { + backend->panel_width = mode->hdisplay; + backend->panel_height = mode->vdisplay; + backend->panel_rotation = rotation; + backend->panel_scale = ply_pixel_buffer_get_device_scale (head->pixel_buffer); + } + return head; } @@ -1488,6 +1502,23 @@ input_source->backend = NULL; } +static bool +get_panel_properties (ply_renderer_backend_t *backend, + int *width, + int *height, + ply_pixel_buffer_rotation_t *rotation, + int *scale) +{ + if (!backend->panel_width) + return false; + + *width = backend->panel_width; + *height = backend->panel_height; + *rotation = backend->panel_rotation; + *scale = backend->panel_scale; + return true; +} + ply_renderer_plugin_interface_t * ply_renderer_backend_get_interface (void) { @@ -1509,7 +1540,8 @@ .open_input_source = open_input_source, .set_handler_for_input_source = set_handler_for_input_source, .close_input_source = close_input_source, - .get_device_name = get_device_name + .get_device_name = get_device_name, + .get_panel_properties = get_panel_properties, }; return &plugin_interface; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/src/plugins/splash/two-step/plugin.c new/plymouth-0.9.4+git20181129.a7ec3e6/src/plugins/splash/two-step/plugin.c --- old/plymouth-0.9.4+git20181122.aaa140b/src/plugins/splash/two-step/plugin.c 2018-11-23 13:02:42.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/src/plugins/splash/two-step/plugin.c 2018-11-29 10:49:57.000000000 +0100 @@ -93,7 +93,8 @@ ply_label_t *message_label; ply_rectangle_t box_area, lock_area, watermark_area; ply_trigger_t *end_trigger; - ply_image_t *background_image; + ply_pixel_buffer_t *background_buffer; + bool background_is_bgrt; } view_t; struct _ply_boot_splash_plugin @@ -105,6 +106,7 @@ ply_image_t *corner_image; ply_image_t *header_image; ply_image_t *background_tile_image; + ply_image_t *background_bgrt_image; ply_image_t *watermark_image; ply_list_t *views; @@ -122,6 +124,7 @@ uint32_t background_start_color; uint32_t background_end_color; + int background_bgrt_raw_width; progress_function_t progress_function; @@ -181,8 +184,8 @@ ply_label_free (view->label); ply_label_free (view->message_label); - if (view->background_image != NULL) - ply_image_free (view->background_image); + if (view->background_buffer != NULL) + ply_pixel_buffer_free (view->background_buffer); free (view); } @@ -243,19 +246,172 @@ } static bool +get_bgrt_sysfs_offsets(int *x_offset, int *y_offset) +{ + bool ret = false; + char buf[64]; + FILE *f; + + f = fopen("/sys/firmware/acpi/bgrt/xoffset", "r"); + if (!f) + return false; + + if (!fgets(buf, sizeof(buf), f)) + goto out; + + if (sscanf(buf, "%d", x_offset) != 1) + goto out; + + fclose(f); + + f = fopen("/sys/firmware/acpi/bgrt/yoffset", "r"); + if (!f) + return false; + + if (!fgets(buf, sizeof(buf), f)) + goto out; + + if (sscanf(buf, "%d", y_offset) != 1) + goto out; + + ret = true; +out: + fclose(f); + return ret; +} + +/* The Microsoft boot logo spec says that the logo must use a black background + * and have its center at 38.2% from the screen's top (golden ratio). + * We reproduce this exactly here so that we get a background which is an exact + * match of the firmware's boot splash. + * At the time of writing this comment this is documented in a document called + * "Boot screen components" which is available here: + * https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/boot-screen-components + * Note that we normally do not use the firmware reported x and y-offset as + * that is based on the EFI fb resolution which may not be the native + * resolution of the screen (esp. when using multiple heads). + */ +static void +view_set_bgrt_background (view_t *view) +{ + ply_pixel_buffer_rotation_t panel_rotation = PLY_PIXEL_BUFFER_ROTATE_UPRIGHT; + int x_offset, y_offset, sysfs_x_offset, sysfs_y_offset, width, height; + int panel_width = 0, panel_height = 0, panel_scale = 1; + int screen_width, screen_height, screen_scale; + ply_pixel_buffer_t *bgrt_buffer; + + if (!view->plugin->background_bgrt_image) + return; + + screen_width = ply_pixel_display_get_width (view->display); + screen_height = ply_pixel_display_get_height (view->display); + screen_scale = ply_pixel_display_get_device_scale (view->display); + + bgrt_buffer = ply_image_get_buffer (view->plugin->background_bgrt_image); + + if (ply_renderer_get_panel_properties (ply_pixel_display_get_renderer (view->display), + &panel_width, &panel_height, + &panel_rotation, &panel_scale)) { + ply_pixel_buffer_set_device_rotation (bgrt_buffer, panel_rotation); + ply_pixel_buffer_set_device_scale (bgrt_buffer, panel_scale); + } + + width = ply_pixel_buffer_get_width (bgrt_buffer); + height = ply_pixel_buffer_get_height (bgrt_buffer); + + x_offset = (screen_width - width) / 2; + y_offset = screen_height * 382 / 1000 - height / 2; + + /* + * On laptops / tablets the LCD panel is typically brought up in + * its native resolution, so we can trust the x- and y-offset values + * provided by the firmware to be correct for a screen with the panels + * resolution. + * + * Moreover some laptop / tablet firmwares to do all kind of hacks wrt + * the y offset. This happens especially on devices where the panel is + * mounted 90 degrees rotated, but also on other devices. + * + * So on devices with an internal LCD panel, we prefer to use the + * firmware provided offsets, to make sure we match its quirky behavior. + * + * We check that the x-offset matches what we expect for the panel's + * native resolution to make sure that the values are indeed for the + * panel's native resolution and then we correct for any difference + * between the (external) screen's and the panel's resolution. + */ + if (panel_width != 0 && panel_height != 0 && + get_bgrt_sysfs_offsets(&sysfs_x_offset, &sysfs_y_offset) && + (panel_width - view->plugin->background_bgrt_raw_width) / 2 == sysfs_x_offset) { + if (panel_rotation == PLY_PIXEL_BUFFER_ROTATE_CLOCKWISE || + panel_rotation == PLY_PIXEL_BUFFER_ROTATE_COUNTER_CLOCKWISE) { + /* 90 degrees rotated, swap x and y */ + x_offset = sysfs_y_offset / panel_scale; + y_offset = sysfs_x_offset / panel_scale; + + x_offset += (screen_width - panel_height / panel_scale) / 2; + y_offset += (screen_height - panel_width / panel_scale) * 382 / 1000; + } else { + /* Normal orientation */ + x_offset = sysfs_x_offset / panel_scale; + y_offset = sysfs_y_offset / panel_scale; + + x_offset += (screen_width - panel_width / panel_scale) / 2; + y_offset += (screen_height - panel_height / panel_scale) * 382 / 1000; + } + } + + ply_trace ("using %dx%d bgrt image centered at %dx%d for %dx%d screen", + width, height, x_offset, y_offset, screen_width, screen_height); + + view->background_buffer = ply_pixel_buffer_new (screen_width * screen_scale, screen_height * screen_scale); + ply_pixel_buffer_set_device_scale (view->background_buffer, screen_scale); + ply_pixel_buffer_fill_with_hex_color (view->background_buffer, NULL, 0x000000); + if (x_offset >= 0 && y_offset >= 0) { + bgrt_buffer = ply_pixel_buffer_rotate_upright (bgrt_buffer); + ply_pixel_buffer_fill_with_buffer (view->background_buffer, bgrt_buffer, x_offset, y_offset); + ply_pixel_buffer_free (bgrt_buffer); + } + view->background_is_bgrt = true; +} + +static bool view_load (view_t *view) { - unsigned long screen_width, screen_height; + unsigned long screen_width, screen_height, screen_scale; ply_boot_splash_plugin_t *plugin; + ply_pixel_buffer_t *buffer; plugin = view->plugin; screen_width = ply_pixel_display_get_width (view->display); screen_height = ply_pixel_display_get_height (view->display); - if (plugin->background_tile_image != NULL) { + buffer = ply_renderer_get_buffer_for_head( + ply_pixel_display_get_renderer (view->display), + ply_pixel_display_get_renderer_head (view->display)); + screen_scale = ply_pixel_buffer_get_device_scale (buffer); + + view_set_bgrt_background (view); + + if (!view->background_buffer && plugin->background_tile_image != NULL) { ply_trace ("tiling background to %lux%lu", screen_width, screen_height); - view->background_image = ply_image_tile (plugin->background_tile_image, screen_width, screen_height); + + /* Create a buffer at screen scale so that we only do the slow interpolating scale once */ + view->background_buffer = ply_pixel_buffer_new (screen_width * screen_scale, screen_height * screen_scale); + ply_pixel_buffer_set_device_scale (view->background_buffer, screen_scale); + + if (plugin->background_start_color != plugin->background_end_color) + ply_pixel_buffer_fill_with_gradient (view->background_buffer, NULL, + plugin->background_start_color, + plugin->background_end_color); + else + ply_pixel_buffer_fill_with_hex_color (view->background_buffer, NULL, + plugin->background_start_color); + + buffer = ply_pixel_buffer_tile (ply_image_get_buffer (plugin->background_tile_image), screen_width, screen_height); + ply_pixel_buffer_fill_with_buffer (view->background_buffer, buffer, 0, 0); + ply_pixel_buffer_free (buffer); } if (plugin->watermark_image != NULL) { @@ -649,6 +805,10 @@ free (color); + /* Boolean option, true if the key is present */ + if (ply_key_file_get_value (key_file, "two-step", "UseBGRT")) + plugin->background_bgrt_image = ply_image_new ("/sys/firmware/acpi/bgrt/image"); + progress_function = ply_key_file_get_value (key_file, "two-step", "ProgressFunction"); if (progress_function != NULL) { @@ -726,6 +886,9 @@ if (plugin->background_tile_image != NULL) ply_image_free (plugin->background_tile_image); + if (plugin->background_bgrt_image != NULL) + ply_image_free (plugin->background_bgrt_image); + if (plugin->watermark_image != NULL) ply_image_free (plugin->watermark_image); @@ -874,7 +1037,16 @@ area.width = width; area.height = height; - if (plugin->background_start_color != plugin->background_end_color) + /* When using the firmware logo as background, use solid black as + * background for dialogs. + */ + if ((plugin->state == PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY || + plugin->state == PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY) && + view->background_is_bgrt) + ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, 0); + else if (view->background_buffer != NULL) + ply_pixel_buffer_fill_with_buffer (pixel_buffer, view->background_buffer, 0, 0); + else if (plugin->background_start_color != plugin->background_end_color) ply_pixel_buffer_fill_with_gradient (pixel_buffer, &area, plugin->background_start_color, plugin->background_end_color); @@ -882,17 +1054,6 @@ ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, plugin->background_start_color); - if (view->background_image != NULL) { - uint32_t *data; - data = ply_image_get_data (view->background_image); - - /* We must pass NULL as fill area, because the fill area - must be sized as the image we're sourcing from, otherwise - sampling does not work - */ - ply_pixel_buffer_fill_with_argb32_data_with_clip (pixel_buffer, NULL, NULL, data); - } - if (plugin->watermark_image != NULL) { uint32_t *data; @@ -1004,7 +1165,8 @@ if (plugin->is_visible) { if (view_load (view)) { ply_list_append_data (plugin->views, view); - view_start_progress_animation (view); + if (plugin->is_animating) + view_start_progress_animation (view); } else { view_free (view); } @@ -1084,6 +1246,16 @@ } } + if (plugin->background_bgrt_image != NULL) { + ply_trace ("loading background bgrt image"); + if (ply_image_load (plugin->background_bgrt_image)) { + plugin->background_bgrt_raw_width = ply_image_get_width (plugin->background_bgrt_image); + } else { + ply_image_free (plugin->background_bgrt_image); + plugin->background_bgrt_image = NULL; + } + } + if (plugin->watermark_image != NULL) { ply_trace ("loading watermark image"); if (!ply_image_load (plugin->watermark_image)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/themes/Makefile.am new/plymouth-0.9.4+git20181129.a7ec3e6/themes/Makefile.am --- old/plymouth-0.9.4+git20181122.aaa140b/themes/Makefile.am 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/themes/Makefile.am 2018-11-29 10:49:57.000000000 +0100 @@ -1,2 +1,2 @@ -SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar +SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/Makefile.am new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/Makefile.am --- old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/Makefile.am 2018-11-29 10:49:57.000000000 +0100 @@ -0,0 +1,84 @@ +themedir = $(datadir)/plymouth/themes/bgrt +nodist_theme_DATA = bgrt.plymouth + +dist_theme_DATA = \ + background-tile.png \ + box.png \ + bullet.png \ + entry.png \ + lock.png \ + animation-0001.png \ + animation-0002.png \ + animation-0003.png \ + animation-0004.png \ + animation-0005.png \ + animation-0006.png \ + animation-0007.png \ + animation-0008.png \ + animation-0009.png \ + animation-0010.png \ + animation-0011.png \ + animation-0012.png \ + animation-0013.png \ + animation-0014.png \ + animation-0015.png \ + animation-0016.png \ + animation-0017.png \ + animation-0018.png \ + animation-0019.png \ + animation-0020.png \ + animation-0021.png \ + animation-0022.png \ + animation-0023.png \ + animation-0024.png \ + animation-0025.png \ + animation-0026.png \ + animation-0027.png \ + animation-0028.png \ + animation-0029.png \ + animation-0030.png \ + animation-0031.png \ + animation-0032.png \ + animation-0033.png \ + animation-0034.png \ + animation-0035.png \ + animation-0036.png \ + throbber-0001.png \ + throbber-0002.png \ + throbber-0003.png \ + throbber-0004.png \ + throbber-0005.png \ + throbber-0006.png \ + throbber-0007.png \ + throbber-0008.png \ + throbber-0009.png \ + throbber-0010.png \ + throbber-0011.png \ + throbber-0012.png \ + throbber-0013.png \ + throbber-0014.png \ + throbber-0015.png \ + throbber-0016.png \ + throbber-0017.png \ + throbber-0018.png \ + throbber-0019.png \ + throbber-0020.png \ + throbber-0021.png \ + throbber-0022.png \ + throbber-0023.png \ + throbber-0024.png \ + throbber-0025.png \ + throbber-0026.png \ + throbber-0027.png \ + throbber-0028.png \ + throbber-0029.png \ + throbber-0030.png + +MAINTAINERCLEANFILES = Makefile.in bgrt.plymouth +CLEANFILES = bgrt.plymouth + +bgrt.plymouth: $(srcdir)/bgrt.plymouth.in + sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ + $(srcdir)/bgrt.plymouth.in > bgrt.plymouth + +EXTRA_DIST = bgrt.plymouth.in Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0001.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0001.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0002.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0002.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0003.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0003.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0004.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0004.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0005.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0005.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0006.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0006.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0007.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0007.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0008.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0008.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0009.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0009.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0010.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0010.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0011.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0011.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0012.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0012.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0013.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0013.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0014.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0014.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0015.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0015.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0016.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0016.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0017.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0017.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0018.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0018.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0019.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0019.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0020.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0020.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0021.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0021.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0022.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0022.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0023.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0023.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0024.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0024.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0025.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0025.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0026.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0026.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0027.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0027.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0028.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0028.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0029.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0029.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0030.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0030.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0031.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0031.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0032.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0032.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0033.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0033.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0034.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0034.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0035.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0035.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/animation-0036.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/animation-0036.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/background-tile.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/background-tile.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/bgrt.plymouth.in new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/bgrt.plymouth.in --- old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/bgrt.plymouth.in 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/bgrt.plymouth.in 2018-11-29 10:49:57.000000000 +0100 @@ -0,0 +1,16 @@ +[Plymouth Theme] +Name=BGRT +Description=Jimmac's spinner theme using the ACPI BGRT graphics as background +ModuleName=two-step + +[two-step] +ImageDir=@PLYMOUTH_THEME_PATH@/bgrt +HorizontalAlignment=.5 +VerticalAlignment=.75 +WatermarkHorizontalAlignment=.5 +WatermarkVerticalAlignment=.96 +Transition=none +TransitionDuration=0.0 +BackgroundStartColor=0x202020 +BackgroundEndColor=0x202020 +UseBGRT=true Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/box.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/box.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/bullet.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/bullet.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/entry.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/entry.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/lock.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/lock.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0001.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0001.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0002.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0002.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0003.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0003.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0004.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0004.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0005.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0005.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0006.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0006.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0007.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0007.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0008.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0008.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0009.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0009.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0010.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0010.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0011.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0011.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0012.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0012.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0013.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0013.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0014.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0014.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0015.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0015.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0016.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0016.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0017.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0017.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0018.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0018.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0019.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0019.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0020.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0020.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0021.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0021.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0022.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0022.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0023.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0023.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0024.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0024.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0025.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0025.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0026.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0026.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0027.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0027.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0028.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0028.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0029.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0029.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/bgrt/throbber-0030.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/bgrt/throbber-0030.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/Makefile.am new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/Makefile.am --- old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/Makefile.am 2018-08-29 08:43:26.000000000 +0200 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/Makefile.am 2018-11-29 10:49:57.000000000 +0100 @@ -54,7 +54,25 @@ throbber-0009.png \ throbber-0010.png \ throbber-0011.png \ - throbber-0012.png + throbber-0012.png \ + throbber-0013.png \ + throbber-0014.png \ + throbber-0015.png \ + throbber-0016.png \ + throbber-0017.png \ + throbber-0018.png \ + throbber-0019.png \ + throbber-0020.png \ + throbber-0021.png \ + throbber-0022.png \ + throbber-0023.png \ + throbber-0024.png \ + throbber-0025.png \ + throbber-0026.png \ + throbber-0027.png \ + throbber-0028.png \ + throbber-0029.png \ + throbber-0030.png MAINTAINERCLEANFILES = Makefile.in spinner.plymouth CLEANFILES = spinner.plymouth Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0001.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0001.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0002.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0002.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0003.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0003.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0004.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0004.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0005.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0005.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0006.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0006.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0007.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0007.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0008.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0008.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0009.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0009.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0010.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0010.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0011.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0011.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0012.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0012.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0013.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0013.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0014.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0014.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0015.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0015.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0016.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0016.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0017.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0017.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0018.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0018.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0019.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0019.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0020.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0020.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0021.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0021.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0022.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0022.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0023.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0023.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0024.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0024.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0025.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0025.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0026.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0026.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0027.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0027.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0028.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0028.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0029.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0029.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0030.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0030.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0031.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0031.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0032.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0032.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0033.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0033.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0034.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0034.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0035.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0035.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/animation-0036.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/animation-0036.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/entry.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/entry.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/lock.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/lock.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/lock.svg new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/lock.svg --- old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/lock.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/lock.svg 2018-11-29 10:49:57.000000000 +0100 @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:xlink="http://www.w3.org/1999/xlink"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="41" + height="44" + viewBox="0 0 41 44" + version="1.1" + id="svg1212" + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="lock.svg" + inkscape:export-filename="/home/jimmac/src/git/plymouth/themes/spinner/lock.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs1206"> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient974" + id="linearGradient992" + gradientUnits="userSpaceOnUse" + x1="48" + y1="44" + x2="464" + y2="44" + gradientTransform="matrix(0.09375,0,0,0.09375,-3.500001,244.73584)" /> + <linearGradient + id="linearGradient974" + inkscape:collect="always"> + <stop + id="stop962" + offset="0" + style="stop-color:#babdb6;stop-opacity:1" /> + <stop + style="stop-color:#f6f5f4;stop-opacity:1" + offset="0.04166667" + id="stop964" /> + <stop + id="stop966" + offset="0.08333334" + style="stop-color:#d5d3cf;stop-opacity:1" /> + <stop + style="stop-color:#deddda;stop-opacity:1" + offset="0.91666669" + id="stop968" /> + <stop + id="stop970" + offset="0.95833331" + style="stop-color:#f6f5f4;stop-opacity:1" /> + <stop + id="stop972" + offset="1" + style="stop-color:#babdb6;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient974" + id="linearGradient15047" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09375,0,0,0.09375,-82.500001,304.73584)" + x1="48" + y1="44" + x2="464" + y2="44" /> + <linearGradient + gradientTransform="matrix(0.44643041,0,0,0.44643041,-138.72178,-8.165377)" + inkscape:collect="always" + xlink:href="#linearGradient1205" + id="linearGradient1207" + x1="-253.99997" + y1="63.999985" + x2="-206" + y2="63.999985" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + id="linearGradient1205"> + <stop + style="stop-color:#deddda;stop-opacity:1" + offset="0" + id="stop1201" /> + <stop + style="stop-color:#c0bfbc;stop-opacity:1" + offset="1" + id="stop1203" /> + </linearGradient> + <radialGradient + r="24" + fy="64" + fx="-223" + cy="64" + cx="-223" + gradientTransform="matrix(0.69444688,0,0,0.69444688,-82.29804,-24.038432)" + gradientUnits="userSpaceOnUse" + id="radialGradient1528" + xlink:href="#linearGradient1110" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + id="linearGradient1110"> + <stop + id="stop1108" + offset="0" + style="stop-color:#c0bfbc;stop-opacity:1" /> + <stop + id="stop1106" + offset="1" + style="stop-color:#5e5c64;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient974" + id="linearGradient24134" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09375,0,0,0.09375,65.266133,304.73584)" + x1="48" + y1="44" + x2="464" + y2="44" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="12.339396" + inkscape:cy="31.979429" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + inkscape:showpageshadow="false" + showborder="true" + inkscape:pagecheckerboard="true"> + <inkscape:grid + type="xygrid" + id="grid1827" /> + </sodipodi:namedview> + <metadata + id="metadata1209"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-285.35832)"> + <rect + style="display:inline;opacity:1;fill:url(#linearGradient992);fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + id="rect972" + width="39" + height="31.499996" + x="1" + y="236.86084" + rx="3.0000002" + ry="3.0000002" /> + <rect + ry="3.0000002" + rx="3.0000002" + y="229.36084" + x="1" + height="32.250038" + width="39" + id="rect974" + style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" /> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#ff7800;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + d="m 3.999988,226.35838 c -1.662,0 -2.999999,1.338 -2.999999,3 v 28.99994 h 39 v -28.99994 c 0,-1.662 -1.338001,-3 -3.000001,-3 z" + id="rect10782" + sodipodi:nodetypes="ssccsss" /> + <rect + ry="3.0000002" + rx="3.0000002" + y="296.86084" + x="-78" + height="31.499996" + width="39" + id="rect15033" + style="display:inline;opacity:1;fill:url(#linearGradient15047);fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" /> + <rect + style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + id="rect15035" + width="39" + height="32.250038" + x="-78" + y="289.36084" + rx="3.0000002" + ry="3.0000002" /> + <path + sodipodi:nodetypes="ssccsss" + id="path15041" + d="m -75.000012,286.35838 c -1.662,0 -3,1.338 -3,3 v 28.99994 h 39.000001 v -28.99994 c 0,-1.662 -1.338001,-3 -3.000001,-3 z" + style="display:inline;opacity:1;fill:#ff7800;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + inkscape:connector-curvature="0" /> + <path + id="path15043" + d="m -57.926225,292.35832 a 6.2857142,6.2857142 0 0 0 -6.285714,6.28572 6.2857142,6.2857142 0 0 0 3.142858,5.43708 v 10.2772 h 6.285714 v -10.28027 a 6.2857142,6.2857142 0 0 0 3.142856,-5.43401 6.2857142,6.2857142 0 0 0 -6.285714,-6.28572 z" + style="display:inline;opacity:1;vector-effect:none;fill:#412f03;fill-opacity:1;stroke:none;stroke-width:9.4285717;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" + inkscape:connector-curvature="0" /> + <circle + transform="rotate(-90)" + r="12.500045" + cy="20.406162" + cx="-242.74011" + id="circle1197" + style="display:inline;opacity:1;vector-effect:none;fill:#3d3846;fill-opacity:1;stroke:none;stroke-width:4.16668177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" /> + <circle + style="display:inline;opacity:1;vector-effect:none;fill:url(#radialGradient1528);fill-opacity:1;stroke:none;stroke-width:4.16668177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" + id="path2947" + cx="-241.8472" + cy="20.406162" + r="12.500045" + transform="rotate(-90)" /> + <circle + r="10.714324" + cy="20.406162" + cx="-241.40079" + id="circle1121" + style="display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1207);fill-opacity:1;stroke:none;stroke-width:3.57144117;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" + transform="rotate(-90)" /> + <path + style="display:inline;opacity:1;vector-effect:none;fill:#3d3846;fill-opacity:1;stroke:none;stroke-width:0.43490815;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" + d="M 22.000011,234.35832 H 19 v 5 h 1.562503 v 0.62501 L 19,240.92083 v 8.43749 h 3.000011 v -4.6875 L 20.562503,243.73333 22,242.79582 Z" + id="rect1125" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccc" /> + <rect + ry="3.0000002" + rx="3.0000002" + y="296.86084" + x="69.766136" + height="31.499996" + width="39" + id="rect24120" + style="display:inline;opacity:1;fill:url(#linearGradient24134);fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" /> + <rect + style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + id="rect24122" + width="39" + height="32.250038" + x="69.766136" + y="289.36084" + rx="3.0000002" + ry="3.0000002" /> + <path + sodipodi:nodetypes="ssccsss" + id="path24124" + d="m 72.766122,286.35838 c -1.662,0 -2.999999,1.338 -2.999999,3 v 28.99994 h 38.999997 v -28.99994 c 0,-1.662 -1.338,-3 -3,-3 z" + style="display:inline;opacity:1;fill:#ff7800;fill-opacity:1;stroke:none;stroke-width:0.09375001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccccccccccc" + inkscape:connector-curvature="0" + id="path24132" + d="m 90.766146,294.35832 h -3.000011 v 5 h 1.562503 v 0.62501 l -1.562503,0.9375 v 8.43749 h 3.000011 v -4.6875 l -1.437508,-0.93749 1.437497,-0.93751 z" + style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.43490815;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" /> + <path + style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:new" + d="m 18,296.35832 c -3.2894,0 -6,2.7106 -6,6 v 4 c 0,0 -2,0 -2,2 v 1.0625 8.9375 h 20 v -8.9375 -1.0625 c 0,0 0,-2 -2,-2 v -4 c 0,-3.2894 -2.7106,-6 -6,-6 z m 0,4 h 4 c 1.1426,0 2,0.8574 2,2 v 4 h -8 v -4 c 0,-1.1426 0.8574,-2 2,-2 z" + id="rect4063-8-6" + inkscape:connector-curvature="0" /> + </g> +</svg> Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/spinner.blend and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/spinner.blend differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0001.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0001.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0002.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0002.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0003.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0003.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0004.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0004.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0005.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0005.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0006.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0006.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0007.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0007.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0008.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0008.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0009.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0009.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0010.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0010.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0011.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0011.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0012.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0012.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0013.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0013.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0014.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0014.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0015.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0015.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0016.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0016.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0017.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0017.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0018.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0018.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0019.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0019.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0020.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0020.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0021.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0021.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0022.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0022.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0023.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0023.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0024.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0024.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0025.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0025.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0026.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0026.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0027.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0027.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0028.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0028.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0029.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0029.png differ Binary files old/plymouth-0.9.4+git20181122.aaa140b/themes/spinner/throbber-0030.png and new/plymouth-0.9.4+git20181129.a7ec3e6/themes/spinner/throbber-0030.png differ
