From e0959543184a3e8eb33a2a77312977a8a1c5ce9ef457eb3c2e46f794a70ab571 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 8 Jul 2019 10:32:47 +0000 Subject: [PATCH 1/4] Accepting request 714041 from home:qzhao:branches:Base:System plymouth update to git20190612+9359382. OBS-URL: https://build.opensuse.org/request/show/714041 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=234 --- plymouth-0.9.4+git20190325+b9f2aac.tar.xz | 3 --- plymouth-0.9.4+git20190612+9359382.tar.xz | 3 +++ plymouth.changes | 9 +++++++++ plymouth.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 plymouth-0.9.4+git20190325+b9f2aac.tar.xz create mode 100644 plymouth-0.9.4+git20190612+9359382.tar.xz diff --git a/plymouth-0.9.4+git20190325+b9f2aac.tar.xz b/plymouth-0.9.4+git20190325+b9f2aac.tar.xz deleted file mode 100644 index 3142ef8..0000000 --- a/plymouth-0.9.4+git20190325+b9f2aac.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11029f090e006b60ea46b62f68aeb10ec8b418d010373c6fd2505eb0cc0a9201 -size 6146932 diff --git a/plymouth-0.9.4+git20190612+9359382.tar.xz b/plymouth-0.9.4+git20190612+9359382.tar.xz new file mode 100644 index 0000000..3eb2197 --- /dev/null +++ b/plymouth-0.9.4+git20190612+9359382.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c91205fa5302b2e6f1b8a0f26da56adcf9c997e28e13aaf1cb70ecaa82dc165 +size 6335256 diff --git a/plymouth.changes b/plymouth.changes index d74468e..70086f4 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 8 06:48:38 UTC 2019 - Cliff Zhao + +- Update to version 0.9.4+git20190612+9359382: + * two-step: Add support for firmware-splashes with rotation + status bits set + * Regenerate plymouth.pot to add the strings for the new + firmware-upgrade mode. + ------------------------------------------------------------------- Fri Jun 14 07:06:46 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 45ca1b1..c3d7e12 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -22,7 +22,7 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.4+git20190325+b9f2aac +Version: 0.9.4+git20190612+9359382 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later From 912da92afac82d90cf7d781754d2e7578b887981314f00d87c0dbea8b3d50dec Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 31 Jul 2019 11:52:42 +0000 Subject: [PATCH 2/4] Accepting request 720040 from home:qzhao:branches:Base:System Update plymouth.spec: obsolete plymouth render plugin for Xwindows, Since this plugin will not be used in the production environment and this modify will highly decrease the compilation of build requirements. OBS-URL: https://build.opensuse.org/request/show/720040 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=235 --- plymouth.changes | 8 ++++++++ plymouth.spec | 30 ++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 70086f4..822c9c8 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 31 11:36:57 UTC 2019 - Cliff Zhao + +- Update plymouth.spec: obsolete plymouth render plugin for + Xwindows, Since this plugin will not be used in the production + environment, and this modify will highly decrease the compilation + of build requirements. + ------------------------------------------------------------------- Mon Jul 8 06:48:38 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index c3d7e12..7d9398c 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -16,6 +16,11 @@ # +# plymouth's Xwindow backend render will import many new gtk functions in build period, +# this will increase the compilation complexity. and the Xwindow render is not used in +# the production envronment. +%define support_Xwindow_backend 0 + %define plymouthdaemon_execdir %{_sbindir} %define plymouthclient_execdir %{_bindir} %define plymouth_libdir %{_libdir} @@ -62,12 +67,16 @@ BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libsystemd) >= 186 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(systemd) >= 186 + +%if 0%{?support_Xwindow_backend} > 0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 +%endif + #BuildRequires: translation-update-upstream Recommends: %{name}-lang @@ -126,7 +135,9 @@ This package contains the libply library used by Plymouth. Summary: Libraries and headers for writing Plymouth splash plugins Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?support_Xwindow_backend} == 0 Requires: %{name}-x11-renderer = %{version} +%endif Requires: libply-boot-client4 = %{version} Requires: libply-splash-core4 = %{version} Requires: libply-splash-graphics4 = %{version} @@ -146,14 +157,16 @@ Supplements: packageand(plymouth:dracut) %description dracut This package contains utilities that integrate dracut with Plymouth -%package x11-renderer +%if 0%{?support_Xwindow_backend} == 0 +#%package x11-renderer Summary: Plymouth X11 renderer Group: System/Base Requires: %{name} = %{version} -%description x11-renderer +#%description x11-renderer This package provides the X11 renderer which allows to test plymouth behavior on environments with a valid DISPLAY. +%endif %package scripts Summary: Plymouth related scripts @@ -381,6 +394,9 @@ autoreconf -fiv --without-rhgb-compat-link \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ +%if 0%{?support_Xwindow_backend} == 0 + --disable-gtk \ +%endif --with-release-file=%{_sysconfdir}/os-release make %{?_smp_mflags} @@ -573,9 +589,11 @@ fi %{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd -%files x11-renderer -%defattr(-,root,root,-) -%{_libdir}/plymouth/renderers/x11* +%if 0%{?support_Xwindow_backend} == 0 +#%files x11-renderer +#%defattr(-,root,root,-) +#%{_libdir}/plymouth/renderers/x11* +%endif %files plugin-label %defattr(-, root, root) From fe97b2baf437c6e965006b069bfb157cc6e3591102877f4578e0fb096d5d80f2 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 5 Aug 2019 03:35:40 +0000 Subject: [PATCH 3/4] Accepting request 720834 from home:StefanBruens:branches:Base:System Fix uninstallable plymouth-devel package due to syntax errors in spec file (uninstallable in Staging:B). OBS-URL: https://build.opensuse.org/request/show/720834 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=236 --- plymouth.changes | 5 +++++ plymouth.spec | 26 +++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 822c9c8..696ca11 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 4 03:51:50 UTC 2019 - Stefan Brüns + +- Use bcond_with for X11 renderer, cleanup syntax + ------------------------------------------------------------------- Wed Jul 31 11:36:57 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 7d9398c..a0fbdbd 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -16,10 +16,9 @@ # -# plymouth's Xwindow backend render will import many new gtk functions in build period, -# this will increase the compilation complexity. and the Xwindow render is not used in -# the production envronment. -%define support_Xwindow_backend 0 +# plymouth's X11 renderer adds many GTK3 packages to the build cycle, +# it is not used in the production environment. +%bcond_with x11_renderer %define plymouthdaemon_execdir %{_sbindir} %define plymouthclient_execdir %{_bindir} @@ -73,7 +72,7 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(systemd) >= 186 -%if 0%{?support_Xwindow_backend} > 0 +%if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif @@ -135,7 +134,7 @@ This package contains the libply library used by Plymouth. Summary: Libraries and headers for writing Plymouth splash plugins Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -%if 0%{?support_Xwindow_backend} == 0 +%if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif Requires: libply-boot-client4 = %{version} @@ -157,16 +156,14 @@ Supplements: packageand(plymouth:dracut) %description dracut This package contains utilities that integrate dracut with Plymouth -%if 0%{?support_Xwindow_backend} == 0 -#%package x11-renderer +%package x11-renderer Summary: Plymouth X11 renderer Group: System/Base Requires: %{name} = %{version} -#%description x11-renderer +%description x11-renderer This package provides the X11 renderer which allows to test plymouth behavior on environments with a valid DISPLAY. -%endif %package scripts Summary: Plymouth related scripts @@ -394,7 +391,7 @@ autoreconf -fiv --without-rhgb-compat-link \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ -%if 0%{?support_Xwindow_backend} == 0 +%if %{without x11_renderer} --disable-gtk \ %endif --with-release-file=%{_sysconfdir}/os-release @@ -589,10 +586,9 @@ fi %{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd -%if 0%{?support_Xwindow_backend} == 0 -#%files x11-renderer -#%defattr(-,root,root,-) -#%{_libdir}/plymouth/renderers/x11* +%if %{with x11_renderer} +%files x11-renderer +%{_libdir}/plymouth/renderers/x11* %endif %files plugin-label From f983786aead1ddd434c7a7be130df13cf1c290d24d656fc63f0b4eff8631eee1 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 5 Aug 2019 06:14:40 +0000 Subject: [PATCH 4/4] Accepting request 720962 from home:qzhao:branches:Base:System Update plymouth.spec: Disable upstart-monitor compile because it only used in Ubuntu/Debian. OBS-URL: https://build.opensuse.org/request/show/720962 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=237 --- plymouth.changes | 9 ++++++++- plymouth.spec | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 696ca11..2911ffb 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 5 05:58:21 UTC 2019 - Cliff Zhao + +- Update plymouth.spec: Disable upstart-monitor compile because it + only used in Ubuntu/Debian. + ------------------------------------------------------------------- Sun Aug 4 03:51:50 UTC 2019 - Stefan Brüns -- Use bcond_with for X11 renderer, cleanup syntax +- Update plymouth.spec: Use bcond_with for X11 renderer, cleanup + syntax. ------------------------------------------------------------------- Wed Jul 31 11:36:57 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index a0fbdbd..462a7dc 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -379,22 +379,23 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults %build autoreconf -fiv %configure \ - --disable-silent-rules \ - --disable-static \ --enable-systemd-integration \ --enable-tracing \ - --with-background-start-color-stop=0x1A3D1F \ - --with-background-end-color-stop=0x4EA65C \ - --with-background-color=0x3391cd \ + --disable-silent-rules \ + --disable-static \ --disable-gdm-transition \ - --without-system-root-install \ - --without-rhgb-compat-link \ - --with-boot-tty=/dev/tty7 \ - --with-shutdown-tty=/dev/tty1 \ + --disable-upstart-monitoring \ %if %{without x11_renderer} --disable-gtk \ %endif - --with-release-file=%{_sysconfdir}/os-release + --with-release-file=%{_sysconfdir}/os-release \ + --with-boot-tty=/dev/tty7 \ + --with-shutdown-tty=/dev/tty1 \ + --with-background-start-color-stop=0x1A3D1F \ + --with-background-end-color-stop=0x4EA65C \ + --with-background-color=0x3391cd \ + --without-rhgb-compat-link \ + --without-system-root-install make %{?_smp_mflags}