Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2020-04-25 20:05:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Sat Apr 25 20:05:47 2020 rev:80 rq:795325 version:0.9.5+git20200407+6ca4b5b Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2020-04-14 16:28:21.023963548 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new.2738/plymouth.changes 2020-04-25 20:06:23.455308494 +0200 @@ -1,0 +2,24 @@ +Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao <[email protected]> + +- Update to version plymouth-0.9.5+git20200407+6ca4b5b: + plymouthd: fix mode changing before splash is shown. + two-step: Center message text within labels if labels are + centered. + drm: Do not unnecessarily get output info twice. + ply-device-manager: Only consume one udev event at a time. + two-step: Do not jump to end-animation on halt/reboot if it is + disabled + two-step: Add UseEndAnimation setting. +- Add plymouth-ignore-serial-console.patch: + Don't output in serial console for openQA need to take serial in + the test, and yast-installation prgram has a feature to install + system through it (bnc#1164123). +- Add plymouth-disable-fedora-bizcom-theme.patch: + Will not compile fedora related theme packages, which openSUSE + don't need. +- Drop plymouth-avoid-umount-hanging-shutdown.patch: + Already merged to upstream. +- Drop boot-duration: + this is an empty file which can generated after package building. + +------------------------------------------------------------------- Old: ---- boot-duration plymouth-0.9.5+git20191224+d7c737d.tar.xz plymouth-avoid-umount-hanging-shutdown.patch New: ---- plymouth-0.9.5+git20200407+6ca4b5b.tar.xz plymouth-disable-fedora-bizcom-theme.patch plymouth-ignore-serial-console.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.QsRN27/_old 2020-04-25 20:06:25.179312061 +0200 +++ /var/tmp/diff_new_pack.QsRN27/_new 2020-04-25 20:06:25.183312069 +0200 @@ -16,32 +16,32 @@ # -# plymouth's X11 renderer adds many GTK3 packages to the build cycle, -# it is not used in the production environment. %bcond_with x11_renderer +%bcond_with fedora_theme -%global git_version git20191224+d7c737d +%global git_version 20200407+6ca4b5b %global so_version 5 Name: plymouth -Version: 0.9.5+%{git_version} +Version: 0.9.5+git%{git_version} Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base URL: https://www.freedesktop.org/wiki/Software/Plymouth Source0: %{name}-%{version}.tar.xz -Source1: boot-duration # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 [email protected] -- To use suse colors in tribar. Patch0: plymouth-some-greenish-openSUSE-colors.patch -# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 [email protected] -- Fix man page installation +# PATCH-FIX-OPENSUSE plymouth-manpages.patch bnc#871419 [email protected] -- Fix man page installation Patch1: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 [email protected] -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. Patch2: plymouth-only_use_fb_for_cirrus_bochs.patch -# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 [email protected] -- Drop grantpt() to avoid system failed to unmount /var during shutdown. -Patch3: plymouth-avoid-umount-hanging-shutdown.patch # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch [email protected] -- Disable the fedora logo reference which is not in openSUSE. -Patch4: plymouth-disable-fedora-logo.patch +Patch3: plymouth-disable-fedora-logo.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-bizcom-theme.patch [email protected] -- Disable to compile fedora related themes. +Patch4: plymouth-disable-fedora-bizcom-theme.patch +# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch [email protected] bnc#1164123 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it. +Patch5: plymouth-ignore-serial-console.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 [email protected] -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 [email protected] -- add ability to output text in initrd needed for encryption. @@ -55,12 +55,6 @@ BuildRequires: libtool BuildRequires: libxslt BuildRequires: pkgconfig -%if 0%{suse_version} >= 1550 -# regenerate_initrd_post moved to rpm-config-SUSE:initrd.macros -BuildRequires: rpm-config-SUSE >= 0.g11 -%else -BuildRequires: suse-module-tools -%endif BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) @@ -73,6 +67,12 @@ %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif +%if 0%{suse_version} >= 1550 +# regenerate_initrd_post moved to rpm-config-SUSE:initrd.macros +BuildRequires: rpm-config-SUSE >= 0.g11 +%else +BuildRequires: suse-module-tools +%endif Recommends: %{name}-lang Requires: %{name}-branding Requires: systemd >= 186 @@ -150,15 +150,6 @@ %description dracut This package contains utilities that integrate dracut with Plymouth -%package x11-renderer -Summary: Plymouth X11 renderer -Group: System/Base -Requires: %{name} = %{version} - -%description x11-renderer -This package provides the X11 renderer which allows to test plymouth -behavior on environments with a valid DISPLAY. - %package scripts Summary: Plymouth related scripts Group: System/Base @@ -194,29 +185,31 @@ Plymouth. It provides the ability to render text on graphical boot splashes using FreeType -%package plugin-fade-throbber -Summary: Plymouth "Fade-Throbber" plugin +%package plugin-script +Summary: Plymouth "script" plugin Group: System/Base Requires: libply%{so_version} = %{version} Requires: libply-splash-core%{so_version} = %{version} Requires: libply-splash-graphics%{so_version} = %{version} -%description plugin-fade-throbber -This package contains the "Fade-In" boot splash plugin for -Plymouth. It features a centered image that fades in and out -while other images pulsate around during system boot up. +%description plugin-script +This package contains the "script" boot splash plugin for +Plymouth. It features an extensible, scriptable boot splash +language that simplifies the process of designing custom +boot splash themes. -%package plugin-space-flares -Summary: Plymouth "space-flares" plugin +%package plugin-tribar +Summary: Plymouth "script" plugin Group: System/Base -Requires: %{name}-plugin-label = %{version} Requires: libply%{so_version} = %{version} Requires: libply-splash-core%{so_version} = %{version} Requires: libply-splash-graphics%{so_version} = %{version} -%description plugin-space-flares -This package contains the "space-flares" boot splash plugin for -Plymouth. It features a corner image with animated flares. +%description plugin-tribar +This package contains the "tribar" boot splash plugin for +Plymouth. It features an extensible, scriptable boot splash +language that simplifies the process of designing custom +boot splash themes. %package plugin-two-step Summary: Plymouth "two-step" plugin @@ -232,44 +225,29 @@ a progressing animation synced to boot time and finishes with a short, fast one-shot animation. -%package plugin-script -Summary: Plymouth "script" plugin -Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} - -%description plugin-script -This package contains the "script" boot splash plugin for -Plymouth. It features an extensible, scriptable boot splash -language that simplifies the process of designing custom -boot splash themes. - -%package plugin-tribar -Summary: Plymouth "script" plugin +%package theme-bgrt +Summary: Plymouth "bgrt" theme Group: System/Base -Requires: libply%{so_version} = %{version} -Requires: libply-splash-core%{so_version} = %{version} -Requires: libply-splash-graphics%{so_version} = %{version} +Requires: %{name}-plugin-two-step = %{version} +Requires: %{name}-theme-spinner = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch -%description plugin-tribar -This package contains the "tribar" boot splash plugin for -Plymouth. It features an extensible, scriptable boot splash -language that simplifies the process of designing custom -boot splash themes. +%description theme-bgrt +This package contains the "bgrt" boot splash theme for +Plymouth. -%package theme-fade-in -Summary: Plymouth "Fade-In" theme +%package theme-script +Summary: Plymouth "Script" theme Group: System/Base -Requires: %{name}-plugin-fade-throbber = %{version} -Requires: plymouth-plugin-label = %{version} +Requires: %{name}-plugin-script = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-fade-in -This package contains the "Fade-In" boot splash theme for -Plymouth. It features a centered logo that fades in and out -while stars twinkle around the logo during system boot up. +%description theme-script +This package contains the "script" boot splash theme for +Plymouth. It is a simple example theme the uses the "script" +plugin. %package theme-spinfinity Summary: Plymouth "Spinfinity" theme @@ -295,17 +273,6 @@ This package contains the "spinner" boot splash theme for Plymouth. -%package theme-solar -Summary: Plymouth "Solar" theme -Group: System/Base -Requires: %{name}-plugin-space-flares = %{version} -Requires(post): %{name}-scripts -BuildArch: noarch - -%description theme-solar -This package contains the "Solar" boot splash theme for -Plymouth. It features a blue flamed sun with animated solar flares. - %package theme-tribar Summary: Plymouth "Tribar" theme Group: System/Base @@ -317,42 +284,83 @@ This package contains the "Tribar" boot splash theme for Plymouth -%package theme-script -Summary: Plymouth "Script" theme +%if %{with x11_renderer} +%package x11-renderer +Summary: Plymouth X11 renderer Group: System/Base -Requires: %{name}-plugin-script = %{version} +Requires: %{name} = %{version} + +%description x11-renderer +This package provides the X11 renderer which allows to test Plymouth +behavior on environments with a valid DISPLAY. +%endif + +%if %{with fedora_theme} +%package plugin-fade-throbber +Summary: Plymouth "Fade-Throbber" plugin +Group: System/Base +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} + +%description plugin-fade-throbber +This package contains the "Fade-In" boot splash plugin for +Plymouth. It features a centered image that fades in and out +while other images pulsate around during system boot up. + +%package theme-fade-in +Summary: Plymouth "Fade-In" theme +Group: System/Base +Requires: %{name}-plugin-fade-throbber = %{version} +Requires: plymouth-plugin-label = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-script -This package contains the "script" boot splash theme for -Plymouth. It is a simple example theme the uses the "script" -plugin. +%description theme-fade-in +This package contains the "Fade-In" boot splash theme for +Plymouth. It features a centered logo that fades in and out +while stars twinkle around the logo during system boot up. -%package theme-bgrt -Summary: Plymouth "bgrt" theme +%package theme-glow +Summary: Plymouth "glow" theme Group: System/Base -Requires: %{name}-plugin-two-step = %{version} -Requires: %{name}-theme-spinner = %{version} +Requires: %{name}-plugin-tribar = %{version} Requires(post): %{name}-scripts BuildArch: noarch -%description theme-bgrt -This package contains the "bgrt" boot splash theme for -Plymouth. +%description theme-glow +This package contains the "glow" boot splash theme for +Plymouth + +%package plugin-space-flares +Summary: Plymouth "space-flares" plugin +Group: System/Base +Requires: %{name}-plugin-label = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} + +%description plugin-space-flares +This package contains the "space-flares" boot splash plugin for +Plymouth. It features a corner image with animated flares. + +%package theme-solar +Summary: Plymouth "Solar" theme +Group: System/Base +Requires: %{name}-plugin-space-flares = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-solar +This package contains the "Solar" boot splash theme for +Plymouth. It features a blue flamed sun with animated solar flares. +%endif %prep %setup -q %autopatch -p1 autoreconf -ivf -# Change the default theme -%if 0%{?is_opensuse} -sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults -%else -sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults -%endif - %build %configure \ --enable-systemd-integration \ @@ -367,6 +375,7 @@ --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ --without-rhgb-compat-link \ + --without-logo \ --without-system-root-install \ %if %{without x11_renderer} --disable-gtk @@ -376,28 +385,32 @@ %install %make_install -rm -f %{buildroot}/%{_bindir}/rhgb-client - -#Link the plymouth client binary also to /bin until the move to /usr is completed -mkdir %{buildroot}/bin -(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) - -# Glow isn't quite ready for primetime -rm -rf %{buildroot}%{_datadir}/plymouth/glow/ -rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ -rm -f %{buildroot}%{_libdir}/plymouth/glow.so - -find %{buildroot} -type f -name "*.la" -delete -print +# Create necessary directories: mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth mkdir -p %{buildroot}/run/plymouth mkdir -p %{buildroot}%{_localstatedir}/log -touch %{buildroot}%{_localstatedir}/log/boot.log -touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log -cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration -cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth + +# Copy upstream's default config file to system and change release settings: cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf +%if 0%{?is_opensuse} +sed -i -e 's/spinner/bgrt/g' %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf +%else +sed -i -e 's/spinner/SLE/g' %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf +%endif + +# Link the plymouth client binary to /bin to fit display and emergency service requirement: +mkdir %{buildroot}/bin +(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth) + +# Create boot-duration file for recording boot info: +touch %{buildroot}%{_datadir}/plymouth/default-boot-duration +touch %{buildroot}%{_localstatedir}/lib/plymouth + +# Remove temp files which produced during the compilation: +find $RPM_BUILD_ROOT -name '*.la' -delete + %post %{?regenerate_initrd_post} if [ ! -e /.buildenv ]; then @@ -425,6 +438,22 @@ %post -n libply%{so_version} -p /sbin/ldconfig %postun -n libply%{so_version} -p /sbin/ldconfig +%postun theme-bgrt +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "bgrt" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + +%postun theme-script +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "script" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + %postun theme-spinfinity if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -433,6 +462,23 @@ fi fi +%postun theme-spinner +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinner" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + +%postun theme-tribar +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "tribar" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + +%if %{with fedora_theme} %postun theme-fade-in if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -441,6 +487,14 @@ fi fi +%postun theme-glow +if [ $1 -eq 0 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "glow" ]; then + %{_sbindir}/plymouth-set-default-theme -R --reset + fi +fi + %postun theme-solar if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -448,10 +502,9 @@ %{_sbindir}/plymouth-set-default-theme -R --reset fi fi +%endif %files -%license COPYING -%doc AUTHORS NEWS README %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details @@ -460,11 +513,11 @@ %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth +/bin/plymouth +%{_bindir}/plymouth +%{_sbindir}/plymouthd %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/bootlog -%{_sbindir}/plymouthd -%{_bindir}/plymouth -/bin/plymouth %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -473,13 +526,14 @@ %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults -%{_datadir}/plymouth/bizcom.png -%ghost /run/plymouth %{_localstatedir}/spool/plymouth -%{_mandir}/man?/* -%ghost %{_localstatedir}/lib/plymouth/boot-duration %{_unitdir}/* +%ghost /run/plymouth +%ghost %{_localstatedir}/lib/plymouth/boot-duration %ghost %{_localstatedir}/log/boot.log +%{_mandir}/man?/* +%doc AUTHORS NEWS README +%license COPYING /usr/share/locale/ %files dracut @@ -513,35 +567,28 @@ %{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd -%if %{with x11_renderer} -%files x11-renderer -%{_libdir}/plymouth/renderers/x11* -%endif - %files plugin-label %{_libdir}/plymouth/label.so %files plugin-label-ft %{_libdir}/plymouth/label-ft.so -%files plugin-fade-throbber -%{_libdir}/plymouth/fade-throbber.so +%files plugin-script +%{_libdir}/plymouth/script.so -%files plugin-space-flares -%{_libdir}/plymouth/space-flares.so +%files plugin-tribar +%{_libdir}/plymouth/tribar.so %files plugin-two-step %{_libdir}/plymouth/two-step.so -%files plugin-tribar -%{_libdir}/plymouth/tribar.so - -%files plugin-script -%{_libdir}/plymouth/script.so +%files theme-bgrt +%dir %{_datadir}/plymouth/themes/bgrt +%{_datadir}/plymouth/themes/bgrt/* -%files theme-fade-in -%dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/* +%files theme-script +%dir %{_datadir}/plymouth/themes/script/ +%{_datadir}/plymouth/themes/script/* %files theme-spinfinity %dir %{_datadir}/plymouth/themes/spinfinity @@ -551,20 +598,33 @@ %dir %{_datadir}/plymouth/themes/spinner %{_datadir}/plymouth/themes/spinner/* -%files theme-solar -%dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/* - %files theme-tribar %dir %{_datadir}/plymouth/themes/tribar %{_datadir}/plymouth/themes/tribar/* -%files theme-script -%dir %{_datadir}/plymouth/themes/script/ -%{_datadir}/plymouth/themes/script/* +%if %{with x11_renderer} +%files x11-renderer +%{_libdir}/plymouth/renderers/x11* +%endif -%files theme-bgrt -%dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/* +%if %{with fedora_theme} +%files plugin-fade-throbber +%{_libdir}/plymouth/fade-throbber.so + +%files theme-fade-in +%dir %{_datadir}/plymouth/themes/fade-in +%{_datadir}/plymouth/themes/fade-in/* + +%files theme-glow +%dir %{_datadir}/plymouth/themes/glow +%{_datadir}/plymouth/themes/glow/* + +%files plugin-space-flares +%{_libdir}/plymouth/space-flares.so + +%files theme-solar +%dir %{_datadir}/plymouth/themes/solar +%{_datadir}/plymouth/themes/solar/* +%endif %changelog ++++++ plymouth-0.9.5+git20191224+d7c737d.tar.xz -> plymouth-0.9.5+git20200407+6ca4b5b.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/FETCH_HEAD new/plymouth-0.9.5+git20200407+6ca4b5b/.git/FETCH_HEAD --- old/plymouth-0.9.5+git20191224+d7c737d/.git/FETCH_HEAD 2020-01-02 10:07:32.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/FETCH_HEAD 2020-04-11 06:40:49.000000000 +0200 @@ -1,4 +1,4 @@ -d7c737d05afea5ff1b26f90708a15add5c30fe92 branch 'master' of https://gitlab.freedesktop.org/plymouth/plymouth +6ca4b5b24d02242e85a3a5a4727aa195d4008210 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/ORIG_HEAD new/plymouth-0.9.5+git20200407+6ca4b5b/.git/ORIG_HEAD --- old/plymouth-0.9.5+git20191224+d7c737d/.git/ORIG_HEAD 2020-01-02 10:07:32.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/ORIG_HEAD 2020-04-11 06:40:49.000000000 +0200 @@ -1 +1 @@ -d7c737d05afea5ff1b26f90708a15add5c30fe92 +6ca4b5b24d02242e85a3a5a4727aa195d4008210 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/hooks/fsmonitor-watchman.sample new/plymouth-0.9.5+git20200407+6ca4b5b/.git/hooks/fsmonitor-watchman.sample --- old/plymouth-0.9.5+git20191224+d7c737d/.git/hooks/fsmonitor-watchman.sample 2020-01-02 10:03:05.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/hooks/fsmonitor-watchman.sample 2020-04-10 10:05:28.000000000 +0200 @@ -22,7 +22,8 @@ if ($version == 1) { # convert nanoseconds to seconds - $time = int $time / 1000000000; + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; } else { die "Unsupported query-fsmonitor hook version '$version'.\n" . "Falling back to scanning...\n"; @@ -53,18 +54,12 @@ # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. + # output to file names only. my $query = <<" END"; ["query", "$git_work_tree", { "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + "fields": ["name"] }] END Binary files old/plymouth-0.9.5+git20191224+d7c737d/.git/index and new/plymouth-0.9.5+git20200407+6ca4b5b/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/HEAD new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/HEAD --- old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/HEAD 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/HEAD 2020-04-10 10:09:28.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d7c737d05afea5ff1b26f90708a15add5c30fe92 Zhao Qiang <[email protected]> 1577955798 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git +0000000000000000000000000000000000000000 6ca4b5b24d02242e85a3a5a4727aa195d4008210 Zhao Qiang <[email protected]> 1586506168 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/refs/heads/master new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/refs/heads/master --- old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/refs/heads/master 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/refs/heads/master 2020-04-10 10:09:28.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d7c737d05afea5ff1b26f90708a15add5c30fe92 Zhao Qiang <[email protected]> 1577955798 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git +0000000000000000000000000000000000000000 6ca4b5b24d02242e85a3a5a4727aa195d4008210 Zhao Qiang <[email protected]> 1586506168 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/refs/remotes/origin/HEAD new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/refs/remotes/origin/HEAD --- old/plymouth-0.9.5+git20191224+d7c737d/.git/logs/refs/remotes/origin/HEAD 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/logs/refs/remotes/origin/HEAD 2020-04-10 10:09:28.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d7c737d05afea5ff1b26f90708a15add5c30fe92 Zhao Qiang <[email protected]> 1577955798 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git +0000000000000000000000000000000000000000 6ca4b5b24d02242e85a3a5a4727aa195d4008210 Zhao Qiang <[email protected]> 1586506168 +0800 clone: from https://gitlab.freedesktop.org/plymouth/plymouth.git Binary files old/plymouth-0.9.5+git20191224+d7c737d/.git/objects/pack/pack-712c1f289a138af02924a09f282bd592a3b3df64.idx and new/plymouth-0.9.5+git20200407+6ca4b5b/.git/objects/pack/pack-712c1f289a138af02924a09f282bd592a3b3df64.idx differ Binary files old/plymouth-0.9.5+git20191224+d7c737d/.git/objects/pack/pack-712c1f289a138af02924a09f282bd592a3b3df64.pack and new/plymouth-0.9.5+git20200407+6ca4b5b/.git/objects/pack/pack-712c1f289a138af02924a09f282bd592a3b3df64.pack differ Binary files old/plymouth-0.9.5+git20191224+d7c737d/.git/objects/pack/pack-dbf8d2042bb3042f038d3e0de267727365446b30.idx and new/plymouth-0.9.5+git20200407+6ca4b5b/.git/objects/pack/pack-dbf8d2042bb3042f038d3e0de267727365446b30.idx differ Binary files old/plymouth-0.9.5+git20191224+d7c737d/.git/objects/pack/pack-dbf8d2042bb3042f038d3e0de267727365446b30.pack and new/plymouth-0.9.5+git20200407+6ca4b5b/.git/objects/pack/pack-dbf8d2042bb3042f038d3e0de267727365446b30.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/packed-refs new/plymouth-0.9.5+git20200407+6ca4b5b/.git/packed-refs --- old/plymouth-0.9.5+git20191224+d7c737d/.git/packed-refs 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/packed-refs 2020-04-10 10:09:28.000000000 +0200 @@ -10,7 +10,7 @@ 424818f2917f2a5b50b7574aae8024548479d9a8 refs/remotes/origin/input-rework 7fd51ca08b06ab5b26f2bef00fc29058ce07b44d refs/remotes/origin/list-optimizations 1fa0bf62b7ae58db68104e4307590abab6f32ba5 refs/remotes/origin/man-page -d7c737d05afea5ff1b26f90708a15add5c30fe92 refs/remotes/origin/master +6ca4b5b24d02242e85a3a5a4727aa195d4008210 refs/remotes/origin/master d52b4efba18c4295618302fea9674e54c36e1b7e refs/remotes/origin/no-fbcon b4c8a9ebf8b62fcb2f64edd2cf38776fedf1b174 refs/remotes/origin/no-vt-switch-on-hide-splash 4f02890e059ade7bb1f4c8435f536714bd9ad25c refs/remotes/origin/optionalize-library-dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/.git/refs/heads/master new/plymouth-0.9.5+git20200407+6ca4b5b/.git/refs/heads/master --- old/plymouth-0.9.5+git20191224+d7c737d/.git/refs/heads/master 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/.git/refs/heads/master 2020-04-10 10:09:28.000000000 +0200 @@ -1 +1 @@ -d7c737d05afea5ff1b26f90708a15add5c30fe92 +6ca4b5b24d02242e85a3a5a4727aa195d4008210 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/INSTALL new/plymouth-0.9.5+git20200407+6ca4b5b/INSTALL --- old/plymouth-0.9.5+git20191224+d7c737d/INSTALL 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/INSTALL 2020-04-10 10:09:28.000000000 +0200 @@ -23,7 +23,6 @@ --with-background-start-color-stop=0x0073B3 \ --with-background-end-color-stop=0x00457E \ --with-background-color=0x3391cd \ - --enable-gdm-transition \ --with-system-root-install \ --with-rhgb-compat-link diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/configure.ac new/plymouth-0.9.5+git20200407+6ca4b5b/configure.ac --- old/plymouth-0.9.5+git20191224+d7c737d/configure.ac 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/configure.ac 2020-04-10 10:09:28.000000000 +0200 @@ -110,8 +110,6 @@ AC_DEFINE(PLY_ENABLE_TRACING, 1, [Build in verbose debug tracing spew]) fi -AC_ARG_ENABLE(gdm-transition, AS_HELP_STRING([--enable-gdm-transition],[enable smooth transition to gdm]),enable_gdm_transition=$enableval,enable_gdm_transition=no) - AC_ARG_ENABLE(upstart-monitoring, AS_HELP_STRING([--enable-upstart-monitoring],[listen for messages on the Upstart D-Bus interface]),enable_upstart_monitoring=$enableval,enable_upstart_monitoring=no) if test x$enable_upstart_monitoring = xyes; then PKG_CHECK_MODULES(DBUS, [dbus-1]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/po/LINGUAS new/plymouth-0.9.5+git20200407+6ca4b5b/po/LINGUAS --- old/plymouth-0.9.5+git20191224+d7c737d/po/LINGUAS 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/po/LINGUAS 2020-04-10 10:09:28.000000000 +0200 @@ -5,6 +5,7 @@ fr fur hu +id nl pl uk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/po/id.po new/plymouth-0.9.5+git20200407+6ca4b5b/po/id.po --- old/plymouth-0.9.5+git20191224+d7c737d/po/id.po 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/po/id.po 2020-04-10 10:09:28.000000000 +0200 @@ -0,0 +1,39 @@ +# Andika Triwidada <[email protected]>, 2019. #zanata +# Andika Triwidada <[email protected]>, 2020. #zanata +msgid "" +msgstr "" +"Project-Id-Version: plymouth 0.9.5\n" +"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/plymouth/plymouth/"; +"issues\n" +"POT-Creation-Date: 2019-06-12 11:54+0200\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2020-03-31 11:27+0000\n" +"Last-Translator: Andika Triwidada <[email protected]>\n" +"Language-Team: Indonesian\n" +"Language: id\n" +"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: src/plugins/splash/two-step/plugin.c:1885 +#, c-format +msgid "%d%% complete" +msgstr "%d%% selesai" + +#: themes/bgrt/bgrt.plymouth.in.h:1 themes/spinner/spinner.plymouth.in.h:1 +msgid "Installing Updates..." +msgstr "Memasang Pemutakhiran..." + +#: themes/bgrt/bgrt.plymouth.in.h:2 themes/spinner/spinner.plymouth.in.h:2 +msgid "Do not turn off your computer" +msgstr "Jangan matikan komputer Anda" + +#: themes/bgrt/bgrt.plymouth.in.h:3 themes/spinner/spinner.plymouth.in.h:3 +msgid "Upgrading System..." +msgstr "Meningkatkan Sistem..." + +#: themes/bgrt/bgrt.plymouth.in.h:4 themes/spinner/spinner.plymouth.in.h:4 +msgid "Upgrading Firmware..." +msgstr "Meningkatkan Firmware..." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth.spec new/plymouth-0.9.5+git20200407+6ca4b5b/scripts/plymouth.spec --- old/plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth.spec 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/scripts/plymouth.spec 2020-04-10 10:09:28.000000000 +0200 @@ -222,7 +222,6 @@ --with-background-start-color-stop=0x0073B3 \ --with-background-end-color-stop=0x00457E \ --with-background-color=0x3391cd \ - --disable-gdm-transition \ --enable-systemd-integration \ --without-system-root-install \ --without-log-viewer \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply/ply-event-loop.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply/ply-event-loop.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply/ply-event-loop.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply/ply-event-loop.c 2020-04-10 10:09:28.000000000 +0200 @@ -641,7 +641,11 @@ status = epoll_ctl (loop->epoll_fd, EPOLL_CTL_DEL, source->fd, NULL); - if (status < 0) + /* + * EBADF means that there was a disconnect handler, which has + * closed the fd, which is fine, do not log an error for this. + */ + if (status < 0 && errno != EBADF) ply_trace ("failed to delete fd %d from epoll watch list: %m", source->fd); source->is_getting_polled = false; } @@ -1057,15 +1061,9 @@ destination = (ply_event_destination_t *) ply_list_node_get_data (node); next_node = ply_list_get_next_node (source->destinations, node); - if (destination->disconnected_handler != NULL) { - ply_trace ("calling disconnected_handler %p for fd %d", - destination->disconnected_handler, source->fd); + if (destination->disconnected_handler != NULL) destination->disconnected_handler (destination->user_data, source->fd); - ply_trace ("done calling disconnected_handler %p for fd %d", - destination->disconnected_handler, source->fd); - } - node = next_node; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply/ply-terminal-session.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply/ply-terminal-session.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply/ply-terminal-session.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply/ply-terminal-session.c 2020-04-10 10:09:28.000000000 +0200 @@ -183,16 +183,6 @@ ply_trace (" opened device '/dev/ptmx'"); - ply_trace ("creating pseudoterminal"); - if (grantpt (session->pseudoterminal_master_fd) < 0) { - ply_save_errno (); - ply_trace ("could not create psuedoterminal: %m"); - close_pseudoterminal (session); - ply_restore_errno (); - return false; - } - ply_trace ("done creating pseudoterminal"); - ply_trace ("unlocking pseudoterminal"); if (unlockpt (session->pseudoterminal_master_fd) < 0) { ply_save_errno (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-core/ply-device-manager.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-core/ply-device-manager.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-core/ply-device-manager.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-core/ply-device-manager.c 2020-04-10 10:09:28.000000000 +0200 @@ -415,7 +415,7 @@ } } -static bool +static void on_udev_event (ply_device_manager_t *manager) { struct udev_device *device; @@ -423,14 +423,14 @@ device = udev_monitor_receive_device (manager->udev_monitor); if (device == NULL) - return false; + return; action = udev_device_get_action (device); ply_trace ("got %s event for device %s", action, udev_device_get_sysname (device)); if (action == NULL) - return false; + return; if (strcmp (action, "add") == 0 || strcmp (action, "change") == 0) { const char *subsystem; @@ -450,14 +450,6 @@ } udev_device_unref (device); - return true; -} - -static void -on_udev_event_loop (ply_device_manager_t *manager) -{ - /* Call on_udev_event until all events are consumed */ - while (on_udev_event (manager)) {} } static void @@ -487,7 +479,7 @@ fd, PLY_EVENT_LOOP_FD_STATUS_HAS_DATA, (ply_event_handler_t) - on_udev_event_loop, + on_udev_event, NULL, manager); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-capslock-icon.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-capslock-icon.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-capslock-icon.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-capslock-icon.c 2020-04-10 10:09:28.000000000 +0200 @@ -52,6 +52,8 @@ bool is_on; }; +static void ply_capslock_stop_polling (ply_capslock_icon_t *capslock_icon); + ply_capslock_icon_t * ply_capslock_icon_new (const char *image_dir) { @@ -74,7 +76,7 @@ return; if (!capslock_icon->is_hidden) - ply_capslock_icon_hide (capslock_icon); + ply_capslock_stop_polling (capslock_icon); if (capslock_icon->buffer != NULL) ply_pixel_buffer_free (capslock_icon->buffer); @@ -121,6 +123,14 @@ on_timeout, capslock_icon); } +static void +ply_capslock_stop_polling (ply_capslock_icon_t *capslock_icon) +{ + ply_event_loop_stop_watching_for_timeout (capslock_icon->loop, + (ply_event_loop_timeout_handler_t) + on_timeout, capslock_icon); +} + bool ply_capslock_icon_load (ply_capslock_icon_t *capslock_icon) { @@ -183,10 +193,8 @@ capslock_icon->is_hidden = true; ply_capslock_icon_draw (capslock_icon); + ply_capslock_stop_polling (capslock_icon); - ply_event_loop_stop_watching_for_timeout (capslock_icon->loop, - (ply_event_loop_timeout_handler_t) - on_timeout, capslock_icon); capslock_icon->loop = NULL; capslock_icon->display = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-keymap-icon.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-keymap-icon.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-keymap-icon.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-keymap-icon.c 2020-04-10 10:09:28.000000000 +0200 @@ -130,9 +130,6 @@ if (keymap_icon == NULL) return; - if (!keymap_icon->is_hidden) - ply_keymap_icon_hide (keymap_icon); - ply_pixel_buffer_free (keymap_icon->icon_buffer); ply_pixel_buffer_free (keymap_icon->keymap_buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-throbber.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-throbber.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/libply-splash-graphics/ply-throbber.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/libply-splash-graphics/ply-throbber.c 2020-04-10 10:09:28.000000000 +0200 @@ -78,7 +78,7 @@ uint32_t is_stopped : 1; }; -static void ply_throbber_stop_now (ply_throbber_t *throbber); +static void ply_throbber_stop_now (ply_throbber_t *throbber, bool redraw); ply_throbber_t * ply_throbber_new (const char *image_dir, @@ -126,7 +126,7 @@ return; if (!throbber->is_stopped) - ply_throbber_stop_now (throbber); + ply_throbber_stop_now (throbber, false); ply_throbber_remove_frames (throbber); ply_array_free (throbber->frames); @@ -324,15 +324,18 @@ } static void -ply_throbber_stop_now (ply_throbber_t *throbber) +ply_throbber_stop_now (ply_throbber_t *throbber, bool redraw) { throbber->is_stopped = true; - ply_pixel_display_draw_area (throbber->display, - throbber->x, - throbber->y, - throbber->frame_area.width, - throbber->frame_area.height); + if (redraw) { + ply_pixel_display_draw_area (throbber->display, + throbber->x, + throbber->y, + throbber->frame_area.width, + throbber->frame_area.height); + } + if (throbber->loop != NULL) { ply_event_loop_stop_watching_for_timeout (throbber->loop, (ply_event_loop_timeout_handler_t) @@ -356,7 +359,7 @@ } if (stop_trigger == NULL) { - ply_throbber_stop_now (throbber); + ply_throbber_stop_now (throbber, true); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/main.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/main.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/main.c 2020-04-10 10:09:28.000000000 +0200 @@ -108,6 +108,7 @@ uint32_t is_inactive : 1; uint32_t is_shown : 1; uint32_t should_force_details : 1; + uint32_t splash_is_becoming_idle : 1; char *override_splash_path; char *system_default_splash_path; @@ -156,6 +157,7 @@ ply_trigger_t *quit_trigger); static bool sh_is_init (state_t *state); static void cancel_pending_delayed_show (state_t *state); +static void prepare_logging (state_t *state); static void on_session_output (state_t *state, @@ -190,11 +192,6 @@ on_change_mode (state_t *state, const char *mode) { - if (state->boot_splash == NULL) { - ply_trace ("no splash set"); - return; - } - ply_trace ("updating mode to '%s'", mode); if (strcmp (mode, "boot-up") == 0) state->mode = PLY_BOOT_SPLASH_MODE_BOOT_UP; @@ -211,6 +208,15 @@ else return; + if (state->session != NULL) { + prepare_logging (state); + } + + if (state->boot_splash == NULL) { + ply_trace ("no splash set"); + return; + } + if (!ply_boot_splash_show (state->boot_splash, state->mode)) { ply_trace ("failed to update splash"); return; @@ -777,6 +783,8 @@ return; } + ply_terminal_session_close_log (state->session); + logfile = get_log_file_for_state (state); if (logfile != NULL) { bool log_opened; @@ -1250,6 +1258,8 @@ ply_trace ("deactivating splash"); deactivate_splash (state); } + + state->splash_is_becoming_idle = false; } static void @@ -1279,10 +1289,13 @@ ply_device_manager_deactivate_keyboards (state->device_manager); if (state->boot_splash != NULL) { - ply_boot_splash_become_idle (state->boot_splash, - (ply_boot_splash_on_idle_handler_t) - on_boot_splash_idle, - state); + if (!state->splash_is_becoming_idle) { + ply_boot_splash_become_idle (state->boot_splash, + (ply_boot_splash_on_idle_handler_t) + on_boot_splash_idle, + state); + state->splash_is_becoming_idle = true; + } } else { ply_trace ("deactivating splash"); deactivate_splash (state); @@ -1362,10 +1375,13 @@ dump_details_and_quit_splash (state); quit_program (state); } else if (state->boot_splash != NULL) { - ply_boot_splash_become_idle (state->boot_splash, - (ply_boot_splash_on_idle_handler_t) - on_boot_splash_idle, - state); + if (!state->splash_is_becoming_idle) { + ply_boot_splash_become_idle (state->boot_splash, + (ply_boot_splash_on_idle_handler_t) + on_boot_splash_idle, + state); + state->splash_is_becoming_idle = true; + } } else { quit_program (state); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/renderers/drm/plugin.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/renderers/drm/plugin.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/renderers/drm/plugin.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/renderers/drm/plugin.c 2020-04-10 10:09:28.000000000 +0200 @@ -1333,6 +1333,34 @@ ply_renderer_head_remove_connector (backend, head, output->connector_id); } +/* Check if an output has changed since we last enumerated it; and if + * it has changed remove it from the head it is part of. + */ +static bool +check_if_output_has_changed (ply_renderer_backend_t *backend, + ply_output_t *new_output) +{ + ply_output_t *old_output = NULL; + int i; + + for (i = 0; i < backend->outputs_len; i++) { + if (backend->outputs[i].connector_id == new_output->connector_id) { + old_output = &backend->outputs[i]; + break; + } + } + + if (!old_output || !old_output->controller_id) + return false; + + if (memcmp(old_output, new_output, sizeof(ply_output_t)) == 0) + return false; + + ply_trace ("Output for connector %u changed, removing", old_output->connector_id); + remove_output (backend, old_output); + return true; +} + /* Update our outputs array to match the hardware state and * create and/or remove heads as necessary. * Returns true if any heads were modified. @@ -1341,37 +1369,18 @@ create_heads_for_active_connectors (ply_renderer_backend_t *backend, bool change) { int i, j, number_of_setup_outputs, outputs_len; - ply_output_t output, *outputs; + ply_output_t *outputs; bool changed = false; /* Step 1: - * Remove existing outputs from heads if they have changed. - */ - ply_trace ("Checking currently connected outputs for changes"); - for (i = 0; i < backend->outputs_len; i++) { - if (!backend->outputs[i].controller_id) - continue; - - get_output_info (backend, backend->outputs[i].connector_id, &output); - - if (memcmp(&backend->outputs[i], &output, sizeof(ply_output_t))) { - ply_trace ("Output for connector %u changed, removing", - backend->outputs[i].connector_id); - remove_output (backend, &backend->outputs[i]); - changed = true; - } - } - - /* Step 2: - * Now that we've removed changed connectors from the heads, we can - * simply rebuild the outputs array from scratch. For any unchanged - * outputs for which we already have a head, we will end up in - * ply_renderer_head_add_connector which will ignore the already - * added connector. + * Query all outputs and: + * 1.1 Remove currently connected outputs from their heads if changed. + * 1.2 Build a new outputs array from scratch. For any unchanged + * outputs for which we already have a head, we will end up in + * ply_renderer_head_add_connector which will ignore the already + * added connector. */ ply_trace ("(Re)enumerating all outputs"); - free (backend->outputs); - backend->outputs = NULL; outputs = calloc (backend->resources->count_connectors, sizeof(*outputs)); outputs_len = backend->resources->count_connectors; @@ -1379,10 +1388,21 @@ backend->connected_count = 0; for (i = 0; i < outputs_len; i++) { get_output_info (backend, backend->resources->connectors[i], &outputs[i]); + + if (check_if_output_has_changed (backend, &outputs[i])) + changed = true; + if (outputs[i].connected) backend->connected_count++; } + /* Step 2: + * Free the old outputs array, now that we have checked for changes + * we no longer need it. + */ + free (backend->outputs); + backend->outputs = NULL; + /* Step 3: * Drop controllers for clones for which we've picked different modes. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/plugin.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/plugin.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/plugin.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/plugin.c 2020-04-10 10:09:28.000000000 +0200 @@ -426,6 +426,15 @@ } static void +system_update (ply_boot_splash_plugin_t *plugin, + int progress) +{ + script_lib_plymouth_on_system_update( plugin->script_state, + plugin->script_plymouth_lib, + progress); +} + +static void update_status (ply_boot_splash_plugin_t *plugin, const char *status) { @@ -534,6 +543,7 @@ .add_pixel_display = add_pixel_display, .remove_pixel_display = remove_pixel_display, .show_splash_screen = show_splash_screen, + .system_update = system_update, .update_status = update_status, .on_boot_progress = on_boot_progress, .hide_splash_screen = hide_splash_screen, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-image.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-image.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-image.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-image.c 2020-04-10 10:09:28.000000000 +0200 @@ -131,6 +131,25 @@ return script_return_obj_null (); } +static script_return_t image_crop (script_state_t *state, + void *user_data) +{ + script_lib_image_data_t *data = user_data; + ply_pixel_buffer_t *image = script_obj_as_native_of_class (state->this, data->class); + int x = script_obj_hash_get_number (state->local, "x"); + int y = script_obj_hash_get_number (state->local, "y"); + int width = script_obj_hash_get_number (state->local, "width"); + int height = script_obj_hash_get_number (state->local, "height"); + + if (image) { + ply_rectangle_t clip_area = { 0, 0, width, height }; + ply_pixel_buffer_t *new_image = ply_pixel_buffer_new (width, height); + ply_pixel_buffer_fill_with_buffer_with_clip (new_image, image, -x, -y, &clip_area); + return script_return_obj (script_obj_new_native (new_image, data->class)); + } + return script_return_obj_null (); +} + static script_return_t image_scale (script_state_t *state, void *user_data) { @@ -264,6 +283,15 @@ "angle", NULL); script_add_native_function (image_hash, + "_Crop", + image_crop, + data, + "x", + "y", + "width", + "height", + NULL); + script_add_native_function (image_hash, "_Scale", image_scale, data, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-image.script new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-image.script --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-image.script 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-image.script 2020-04-10 10:09:28.000000000 +0200 @@ -9,6 +9,11 @@ return Image.Adopt (this._Rotate(angle)); }; +Image.Crop = fun (x, y, width, height) +{ + return Image.Adopt (this._Crop(x, y, width, height)); +}; + Image.Scale = fun (width, height) { return Image.Adopt (this._Scale(width, height)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-plymouth.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-plymouth.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/script/script-lib-plymouth.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/script/script-lib-plymouth.c 2020-04-10 10:09:28.000000000 +0200 @@ -218,6 +218,7 @@ script_obj_unref (data->script_display_message_func); script_obj_unref (data->script_hide_message_func); script_obj_unref (data->script_quit_func); + script_obj_unref (data->script_system_update_func); free (data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/two-step/plugin.c new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/two-step/plugin.c --- old/plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/two-step/plugin.c 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/src/plugins/splash/two-step/plugin.c 2020-04-10 10:09:28.000000000 +0200 @@ -121,6 +121,7 @@ bool progress_bar_show_percent_complete; bool use_progress_bar; bool use_animation; + bool use_end_animation; bool use_firmware_background; char *title; char *subtitle; @@ -262,12 +263,13 @@ static void view_load_end_animation (view_t *view) { + ply_boot_splash_plugin_t *plugin = view->plugin; const char *animation_prefix; - ply_boot_splash_plugin_t *plugin; - ply_trace ("loading animation"); + if (!plugin->mode_settings[plugin->mode].use_end_animation) + return; - plugin = view->plugin; + ply_trace ("loading animation"); switch (plugin->mode) { case PLY_BOOT_SPLASH_MODE_BOOT_UP: @@ -315,6 +317,7 @@ ply_trace ("optional animation didn't load"); ply_animation_free (view->end_animation); view->end_animation = NULL; + plugin->mode_settings[plugin->mode].use_end_animation = false; } static bool @@ -995,6 +998,13 @@ else settings->use_animation = !settings->use_progress_bar; + /* This defaults to true for compat. with older themes */ + if (ply_key_file_has_key (key_file, group_name, "UseEndAnimation")) + settings->use_end_animation = + ply_key_file_get_bool (key_file, group_name, "UseEndAnimation"); + else + settings->use_end_animation = true; + /* If any mode uses the firmware background, then we need to load it */ if (settings->use_firmware_background) plugin->use_firmware_background = true; @@ -1260,6 +1270,25 @@ return; } + if (!plugin->mode_settings[plugin->mode].use_end_animation) { + node = ply_list_get_first_node (plugin->views); + while (node != NULL) { + view = ply_list_node_get_data (node); + + ply_progress_bar_hide (view->progress_bar); + + if (view->throbber != NULL) + ply_throbber_stop (view->throbber, NULL); + + if (view->progress_animation != NULL) + ply_progress_animation_hide (view->progress_animation); + + node = ply_list_get_next_node (plugin->views, node); + } + ply_trigger_pull (trigger, NULL); + return; + } + ply_trace ("starting end animation"); node = ply_list_get_first_node (plugin->views); @@ -1311,8 +1340,9 @@ * but it's normally really fast, so just jump to * the end animation */ - if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || - plugin->mode == PLY_BOOT_SPLASH_MODE_REBOOT) + if (plugin->mode_settings[plugin->mode].use_end_animation && + (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || + plugin->mode == PLY_BOOT_SPLASH_MODE_REBOOT)) become_idle (plugin, NULL); } @@ -1718,7 +1748,12 @@ if (plugin->is_idle) return; - if (percent_done >= SHOW_ANIMATION_PERCENT) { + /* + * If we do not have an end animation, we keep showing progress until + * become_idle gets called. + */ + if (plugin->mode_settings[plugin->mode].use_end_animation && + percent_done >= SHOW_ANIMATION_PERCENT) { if (plugin->stop_trigger == NULL) { ply_trace ("boot progressed to end"); @@ -1842,6 +1877,9 @@ ply_boot_splash_plugin_t *plugin = view->plugin; int x, y, width, height; + if (plugin->message_below_animation) + ply_label_set_alignment (view->message_label, PLY_LABEL_ALIGN_CENTER); + ply_label_set_text (view->message_label, message); width = ply_label_get_width (view->message_label); height = ply_label_get_height (view->message_label); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-halt.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-halt.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-halt.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-halt.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -10,3 +10,4 @@ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking +RemainAfterExit=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-kexec.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-kexec.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-kexec.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-kexec.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -10,3 +10,4 @@ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking +RemainAfterExit=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-poweroff.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-poweroff.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-poweroff.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-poweroff.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -10,3 +10,4 @@ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking +RemainAfterExit=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-quit-wait.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-quit-wait.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-quit-wait.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-quit-wait.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -5,4 +5,5 @@ [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait Type=oneshot +RemainAfterExit=yes TimeoutSec=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-quit.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-quit.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-quit.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-quit.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -5,4 +5,5 @@ [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit Type=oneshot +RemainAfterExit=yes TimeoutSec=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-read-write.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-read-write.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-read-write.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-read-write.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -8,3 +8,4 @@ [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --read-write Type=oneshot +RemainAfterExit=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-reboot.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-reboot.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-reboot.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-reboot.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -10,3 +10,4 @@ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=reboot --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking +RemainAfterExit=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-start.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-start.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-start.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-start.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -11,5 +11,6 @@ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking +RemainAfterExit=yes KillMode=none SendSIGKILL=no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-switch-root.service.in new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-switch-root.service.in --- old/plymouth-0.9.5+git20191224+d7c737d/systemd-units/plymouth-switch-root.service.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/systemd-units/plymouth-switch-root.service.in 2020-04-10 10:09:28.000000000 +0200 @@ -6,6 +6,7 @@ [Service] Type=oneshot +RemainAfterExit=yes ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --new-root-dir=/sysroot StandardInput=null StandardOutput=null diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/themes/bgrt/bgrt.plymouth.in new/plymouth-0.9.5+git20200407+6ca4b5b/themes/bgrt/bgrt.plymouth.in --- old/plymouth-0.9.5+git20191224+d7c737d/themes/bgrt/bgrt.plymouth.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/themes/bgrt/bgrt.plymouth.in 2020-04-10 10:09:28.000000000 +0200 @@ -25,12 +25,15 @@ MessageBelowAnimation=true [boot-up] +UseEndAnimation=false UseFirmwareBackground=true [shutdown] +UseEndAnimation=false UseFirmwareBackground=true [reboot] +UseEndAnimation=false UseFirmwareBackground=true [updates] @@ -51,6 +54,5 @@ SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -UseFirmwareBackground=true _Title=Upgrading Firmware... _SubTitle=Do not turn off your computer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.5+git20191224+d7c737d/themes/spinner/spinner.plymouth.in new/plymouth-0.9.5+git20200407+6ca4b5b/themes/spinner/spinner.plymouth.in --- old/plymouth-0.9.5+git20191224+d7c737d/themes/spinner/spinner.plymouth.in 2020-01-02 10:03:18.000000000 +0100 +++ new/plymouth-0.9.5+git20200407+6ca4b5b/themes/spinner/spinner.plymouth.in 2020-04-10 10:09:28.000000000 +0200 @@ -23,6 +23,15 @@ ProgressBarForegroundColor=0xffffff MessageBelowAnimation=true +[boot-up] +UseEndAnimation=false + +[shutdown] +UseEndAnimation=false + +[reboot] +UseEndAnimation=false + [updates] SuppressMessages=true ProgressBarShowPercentComplete=true @@ -41,6 +50,5 @@ SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -UseFirmwareBackground=true _Title=Upgrading Firmware... _SubTitle=Do not turn off your computer ++++++ plymouth-disable-fedora-bizcom-theme.patch ++++++ diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am --- plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am 2020-01-02 17:03:18.000000000 +0800 +++ plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am 2020-04-10 22:35:52.759365963 +0800 @@ -1,2 +1,2 @@ -SUBDIRS = fade-throbber text details space-flares two-step script tribar +SUBDIRS = text details two-step script tribar MAINTAINERCLEANFILES = Makefile.in diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am --- plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am 2020-01-02 17:03:18.000000000 +0800 +++ plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am 2020-04-10 21:07:15.395978166 +0800 @@ -1,2 +1,2 @@ -SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt +SUBDIRS = spinfinity text details script spinner tribar bgrt MAINTAINERCLEANFILES = Makefile.in ++++++ plymouth-ignore-serial-console.patch ++++++ diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/main.c plymouth-0.9.5+git20191224+d7c737d_new/src/main.c --- plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 17:03:18.000000000 +0800 +++ plymouth-0.9.5+git20191224+d7c737d_new/src/main.c 2020-04-11 12:34:22.295210835 +0800 @@ -2241,8 +2241,7 @@ find_system_default_splash (&state); find_distribution_default_splash (&state); - if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) - device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; + device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") || (getenv ("DISPLAY") != NULL))
