From 72f16973b9b4bd661147b82a8b15f82d6b544deed5c3b3043a53ad4bd8c2de96 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 7 Jun 2017 07:05:34 +0000 Subject: [PATCH 1/2] Accepting request 501560 from home:1Antoine1:branches:Base:System - 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 --- ...-manager-handle-NULL-renderer-better.patch | 47 ------------------- _servicedata | 2 +- plymouth-0.9.2+git20161215.18dd755.tar.xz | 3 -- plymouth-0.9.2+git20170424.6fd5c6b.tar.xz | 3 ++ plymouth.changes | 15 ++++++ plymouth.spec | 5 +- 6 files changed, 20 insertions(+), 55 deletions(-) delete mode 100644 0001-device-manager-handle-NULL-renderer-better.patch delete mode 100644 plymouth-0.9.2+git20161215.18dd755.tar.xz create mode 100644 plymouth-0.9.2+git20170424.6fd5c6b.tar.xz diff --git a/0001-device-manager-handle-NULL-renderer-better.patch b/0001-device-manager-handle-NULL-renderer-better.patch deleted file mode 100644 index 032b783..0000000 --- a/0001-device-manager-handle-NULL-renderer-better.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fdda9af2c305ecf57407856b1d061c076ae8fe4a Mon Sep 17 00:00:00 2001 -From: Ray Strode -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 - diff --git a/_servicedata b/_servicedata index a1575af..7074e57 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://anongit.freedesktop.org/plymouth - 18dd75589bbdf0ddc07a61421f05078df88ee768 \ No newline at end of file + 6fd5c6b260b89604f2ff7d65a4f1a011db23a726 diff --git a/plymouth-0.9.2+git20161215.18dd755.tar.xz b/plymouth-0.9.2+git20161215.18dd755.tar.xz deleted file mode 100644 index fb00357..0000000 --- a/plymouth-0.9.2+git20161215.18dd755.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb7c15c1b0261fd0079fae5174abd7154cc3786ae3a7367c3544f3b866d7595f -size 871936 diff --git a/plymouth-0.9.2+git20170424.6fd5c6b.tar.xz b/plymouth-0.9.2+git20170424.6fd5c6b.tar.xz new file mode 100644 index 0000000..5e15d12 --- /dev/null +++ b/plymouth-0.9.2+git20170424.6fd5c6b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1210024b55d387abc1fdd41adfbefdaa0a964146a6a0a39f64f41b49f3a39e57 +size 869664 diff --git a/plymouth.changes b/plymouth.changes index 48ad83a..5a42617 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -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 diff --git a/plymouth.spec b/plymouth.spec index 9870328..901fe5c 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -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 From 5cbb843f2598d8e7217ad521844898dced7be63aca950ef63196a2c8f44e85d5 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 15 Jun 2017 09:46:41 +0000 Subject: [PATCH 2/2] Accepting request 503548 from home:qzhao:branches:Base:System Update plymouth.spec: Add COPYING file in plymouth package file list, This is for the law requirement (bsc#1043834). OBS-URL: https://build.opensuse.org/request/show/503548 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=182 --- plymouth.changes | 6 ++++++ plymouth.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plymouth.changes b/plymouth.changes index 5a42617..339fe67 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 14 06:16:48 UTC 2017 - qzhao@suse.com + +- Update plymouth.spec: Add COPYING file in plymouth package file + list, This is for the law requirement (bsc#1043834). + ------------------------------------------------------------------- Mon May 8 15:20:02 UTC 2017 - antoine.belvire@opensuse.org diff --git a/plymouth.spec b/plymouth.spec index 901fe5c..5a59f82 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -494,7 +494,7 @@ fi %files %defattr(-, root, root) -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README COPYING %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details