diff --git a/plymouth-22.02.122+75.6f5dc63.tar.xz b/plymouth-22.02.122+75.6f5dc63.tar.xz deleted file mode 100644 index 45df7c4..0000000 --- a/plymouth-22.02.122+75.6f5dc63.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a32f811e20bee0641e1e6c4bd45c38002d4b5c8636385af752702795456a3b16 -size 6996332 diff --git a/plymouth-22.02.122+77.c09c651.tar.xz b/plymouth-22.02.122+77.c09c651.tar.xz new file mode 100644 index 0000000..5f8aa69 --- /dev/null +++ b/plymouth-22.02.122+77.c09c651.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7e79cdf8284ed2ca7f274c604345b9258d3583e8ea0749d59e88cd19cba8ad0 +size 7017620 diff --git a/plymouth-only_use_fb_for_cirrus_bochs.patch b/plymouth-only_use_fb_for_cirrus_bochs.patch index 5b7cf44..0b6f527 100644 --- a/plymouth-only_use_fb_for_cirrus_bochs.patch +++ b/plymouth-only_use_fb_for_cirrus_bochs.patch @@ -9,10 +9,10 @@ As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remo Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c =================================================================== -diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-device-manager.c plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-device-manager.c ---- plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-device-manager.c 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-device-manager.c 2022-04-18 16:33:00.126364096 +0800 -@@ -279,13 +279,33 @@ +diff -Nura plymouth-22.02.122+77.c09c651/src/libply-splash-core/ply-device-manager.c plymouth-22.02.122+77.c09c651_new/src/libply-splash-core/ply-device-manager.c +--- plymouth-22.02.122+77.c09c651/src/libply-splash-core/ply-device-manager.c 2022-10-06 07:38:29.000000000 +0800 ++++ plymouth-22.02.122+77.c09c651_new/src/libply-splash-core/ply-device-manager.c 2022-10-07 00:22:51.532816241 +0800 +@@ -312,6 +312,18 @@ subsystem = udev_device_get_subsystem (device); ply_trace ("device subsystem is %s", subsystem); @@ -29,6 +29,10 @@ diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-device- + } + if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) { + if (!manager->device_timeout_elapsed && !verify_drm_device (device)) { + ply_trace ("ignoring since we only handle SimpleDRM devices after timeout"); +@@ -319,10 +331,18 @@ + } ply_trace ("found DRM device %s", device_path); renderer_type = PLY_RENDERER_TYPE_DRM; + if (use_fb) { diff --git a/plymouth.changes b/plymouth.changes index b4b1547..9645440 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 6 11:20:28 UTC 2022 - Cliff Zhao + +- Update to version 22.02.122+77.c09c651: + * ply-device-manager: Move verify_drm_device() higher up in the + file. + * ply-device-manager: Also ignore SimpleDRM devs in coldplug + enumeration path + * Rebase plymouth-only_use_fb_for_cirrus_bochs.patch. + ------------------------------------------------------------------- Fri Sep 16 17:39:33 UTC 2022 - Bjørn Lie diff --git a/plymouth.spec b/plymouth.spec index 326dff9..be5288e 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -23,7 +23,7 @@ %global soversion 5 Name: plymouth -Version: 22.02.122+75.6f5dc63 +Version: 22.02.122+77.c09c651 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later