Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2022-10-28 19:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Fri Oct 28 19:29:07 2022 rev:117 rq:1031464 version:22.02.122+94.4bd41a3
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2022-10-10
18:43:33.814739644 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new.2275/plymouth.changes
2022-10-28 19:29:15.806551026 +0200
@@ -1,0 +2,29 @@
+Wed Oct 26 07:12:23 UTC 2022 - Cliff Zhao <qz...@suse.com>
+
+- Update to version 22.02.122+94.4bd41a3:
+ * plugins: label-freetype: Fixes calculation of line width.
+ * plugins: label-freetype: Fix font alignment.
+ * populate-initrd: Install label-freetype plugin into initrd if
+ available.
+ * plugins: Add FreeType-based label plugin.
+ * ply-label: Don't crash if label plugin fails.
+ * details: Don't replay boot buffer on serial consoles.
+ * main: Add "reload" command.
+ * ply-device-manager: Add plymouth.force-frame-buffer-on-boot
+ parameter, allow to choose force framebuffer mode.
+ * systemd: Add mkinitcpio support to
+ plymouth-switch-root-initramfs.service.
+ * Rebase plymouth-only_use_fb_for_cirrus_bochs.patch;
+ for build success.
+ * Rebase plymouth-watermark-config.patch;
+ for build success.
+ * Drop 0001-Add-label-ft-plugin.patch;
+ for already merged by upstream.
+ * Drop 0002-Install-label-ft-plugin-into-initrd-if-available.patch
+ for already merged by upstream.
+ * Drop 0003-fix_null_deref.patch
+ for already merged by upstream.
+ * Drop 0004-label-ft-fix-alignment.patch
+ for already merged by upstream.
+
+-------------------------------------------------------------------
Old:
----
0001-Add-label-ft-plugin.patch
0002-Install-label-ft-plugin-into-initrd-if-available.patch
0003-fix_null_deref.patch
0004-label-ft-fix-alignment.patch
plymouth-22.02.122+77.c09c651.tar.xz
New:
----
plymouth-22.02.122+94.4bd41a3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.ts4BKE/_old 2022-10-28 19:29:16.762555820 +0200
+++ /var/tmp/diff_new_pack.ts4BKE/_new 2022-10-28 19:29:16.766555840 +0200
@@ -23,7 +23,7 @@
%global soversion 5
Name: plymouth
-Version: 22.02.122+77.c09c651
+Version: 22.02.122+94.4bd41a3
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
@@ -54,14 +54,6 @@
Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch
# PATCH-FIX-OPENSUSE
plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736
qz...@suse.com -- Confirm keyboard handler list not NULL before release memory
to avoid crash.
Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
-# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fv...@suse.com
-- Add ability to output text in initrd needed for encryption.
-Patch1001: 0001-Add-label-ft-plugin.patch
-# PATCH-FIX-UPSTREAM
0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986
fv...@suse.com -- Add ability to output text in initrd needed for encryption.
-Patch1002: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
-# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fv...@suse.com --
Add ability to output text in initrd needed for encryption.
-Patch1003: 0003-fix_null_deref.patch
-# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986
fv...@suse.com -- Fix alignment for label-ft
-Patch1004: 0004-label-ft-fix-alignment.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc
@@ -595,10 +587,10 @@
%{_libdir}/plymouth/fade-throbber.so
%files plugin-label
-%{_libdir}/plymouth/label.so
+%{_libdir}/plymouth/label-pango.so
%files plugin-label-ft
-%{_libdir}/plymouth/label-ft.so
+%{_libdir}/plymouth/label-freetype.so
%files plugin-script
%{_libdir}/plymouth/script.so
++++++ plymouth-22.02.122+77.c09c651.tar.xz ->
plymouth-22.02.122+94.4bd41a3.tar.xz ++++++
/work/SRC/openSUSE:Factory/plymouth/plymouth-22.02.122+77.c09c651.tar.xz
/work/SRC/openSUSE:Factory/.plymouth.new.2275/plymouth-22.02.122+94.4bd41a3.tar.xz
differ: char 27, line 1
++++++ plymouth-only_use_fb_for_cirrus_bochs.patch ++++++
--- /var/tmp/diff_new_pack.ts4BKE/_old 2022-10-28 19:29:16.906556542 +0200
+++ /var/tmp/diff_new_pack.ts4BKE/_new 2022-10-28 19:29:16.910556562 +0200
@@ -6,13 +6,10 @@
prevents DRM drivers from loading.
As we need to support cirrus for libvirt and bochs for QEMU, we cannot just
remove support for frame-buffer.
-Index:
plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c
-===================================================================
-
-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 @@
+diff -Nura
plymouth-22.02.122+94.4bd41a3/src/libply-splash-core/ply-device-manager.c
plymouth-22.02.122+94.4bd41a3_new/src/libply-splash-core/ply-device-manager.c
+--- plymouth-22.02.122+94.4bd41a3/src/libply-splash-core/ply-device-manager.c
2022-10-26 19:09:02.000000000 +0800
++++
plymouth-22.02.122+94.4bd41a3_new/src/libply-splash-core/ply-device-manager.c
2022-10-27 00:07:06.605777003 +0800
+@@ -316,6 +316,18 @@
subsystem = udev_device_get_subsystem (device);
ply_trace ("device subsystem is %s", subsystem);
@@ -31,7 +28,7 @@
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 @@
+@@ -323,10 +335,18 @@
}
ply_trace ("found DRM device %s", device_path);
renderer_type = PLY_RENDERER_TYPE_DRM;
@@ -48,7 +45,7 @@
+ else if (!fb_device_has_drm_device (manager, device))
{
+ ply_trace ("avoiding use of framebuffer to
not block DRM drivers from working");
+ }
+ else if (force_fb)
+ renderer_type =
PLY_RENDERER_TYPE_FRAME_BUFFER;
else
- ply_trace ("ignoring, since there's a DRM
device associated with it");
- }
++++++ plymouth-watermark-config.patch ++++++
--- /var/tmp/diff_new_pack.ts4BKE/_old 2022-10-28 19:29:16.942556723 +0200
+++ /var/tmp/diff_new_pack.ts4BKE/_new 2022-10-28 19:29:16.946556743 +0200
@@ -1,8 +1,30 @@
-Index: plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c
-===================================================================
-diff -Nura plymouth-22.02.122+64.0b0e93c/src/plugins/splash/two-step/plugin.c
plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c
---- plymouth-22.02.122+64.0b0e93c/src/plugins/splash/two-step/plugin.c
2022-08-13 20:58:13.000000000 +0800
-+++ plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c
2022-08-13 22:48:06.625172362 +0800
+diff -Nura plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in
plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in
+--- plymouth-22.02.122+94.4bd41a3/scripts/plymouth-populate-initrd.in
2022-10-27 12:28:09.250335251 +0800
++++ plymouth-22.02.122+94.4bd41a3_new/scripts/plymouth-populate-initrd.in
2022-10-27 14:41:01.624380841 +0800
+@@ -491,6 +491,7 @@
+
+ PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/ModuleName *= *//')
+ PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/ImageDir *= *//')
++PLYMOUTH_WATERMARK_PATH=$(grep "WatermarkPath *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/WatermarkPath *= *//')
+
+ PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth
| sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F
: {'print $1'} | sort -u | head -n 1)
+ PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont
*= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth
| sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'})
|awk -F : {'print $1'} | sort -u | head -n 1)
+@@ -516,6 +517,12 @@
+ inst_recur "${PLYMOUTH_IMAGE_DIR}"
+ fi
+
++# WatermarkPath is either an image file or a symlink to it
++[ -f "${PLYMOUTH_WATERMARK_PATH}" ] && inst "${PLYMOUTH_WATERMARK_PATH}"
$INITRDDIR
++if [ -L "${PLYMOUTH_WATERMARK_PATH}" ]; then
++ inst_symlink "${PLYMOUTH_WATERMARK_PATH}"
++fi
++
+ if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-freetype.so" ]; then
+ inst ${PLYMOUTH_PLUGIN_PATH}/label-freetype.so $INITRDDIR
+ font=$(fc-match -f %{file})
+diff -Nura plymouth-22.02.122+94.4bd41a3/src/plugins/splash/two-step/plugin.c
plymouth-22.02.122+94.4bd41a3_new/src/plugins/splash/two-step/plugin.c
+--- plymouth-22.02.122+94.4bd41a3/src/plugins/splash/two-step/plugin.c
2022-08-13 20:58:13.000000000 +0800
++++ plymouth-22.02.122+94.4bd41a3_new/src/plugins/splash/two-step/plugin.c
2022-10-27 14:37:52.319120852 +0800
@@ -1095,9 +1095,23 @@
plugin->background_tile_image = ply_image_new (image_path);
free (image_path);
@@ -30,11 +52,9 @@
if (!ply_kernel_command_line_has_argument
("secure_boot.warn_if_disabled=false") &&
!ply_is_secure_boot_enabled ()) {
-Index: plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop
-===================================================================
-diff -Nura plymouth-22.02.122+64.0b0e93c/themes/bgrt/bgrt.plymouth.desktop
plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop
---- plymouth-22.02.122+64.0b0e93c/themes/bgrt/bgrt.plymouth.desktop
2022-04-15 16:39:24.000000000 +0800
-+++ plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop
2022-08-13 22:45:46.132327415 +0800
+diff -Nura plymouth-22.02.122+94.4bd41a3/themes/bgrt/bgrt.plymouth.desktop
plymouth-22.02.122+94.4bd41a3_new/themes/bgrt/bgrt.plymouth.desktop
+--- plymouth-22.02.122+94.4bd41a3/themes/bgrt/bgrt.plymouth.desktop
2022-04-15 16:39:24.000000000 +0800
++++ plymouth-22.02.122+94.4bd41a3_new/themes/bgrt/bgrt.plymouth.desktop
2022-10-27 14:38:58.846563650 +0800
@@ -7,6 +7,7 @@
Font=Cantarell 12
TitleFont=Cantarell Light 30
@@ -43,30 +63,4 @@
DialogHorizontalAlignment=.5
DialogVerticalAlignment=.382
TitleHorizontalAlignment=.5
-Index: plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in
-===================================================================
-diff -Nura plymouth-22.02.122+64.0b0e93c/scripts/plymouth-populate-initrd.in
plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in
---- plymouth-22.02.122+64.0b0e93c/scripts/plymouth-populate-initrd.in
2022-08-13 22:33:38.499980381 +0800
-+++ plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in
2022-08-13 22:44:01.052695444 +0800
-@@ -491,6 +491,7 @@
-
- PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/ModuleName *= *//')
- PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/ImageDir *= *//')
-+PLYMOUTH_WATERMARK_PATH=$(grep "WatermarkPath *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed
's/WatermarkPath *= *//')
-
- PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth
| sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F
: {'print $1'} | sort -u | head -n 1)
- PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont
*= *"
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth
| sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'})
|awk -F : {'print $1'} | sort -u | head -n 1)
-@@ -516,6 +517,12 @@
- inst_recur "${PLYMOUTH_IMAGE_DIR}"
- fi
-
-+# WatermarkPath is either an image file or a symlink to it
-+[ -f "${PLYMOUTH_WATERMARK_PATH}" ] && inst "${PLYMOUTH_WATERMARK_PATH}"
$INITRDDIR
-+if [ -L "${PLYMOUTH_WATERMARK_PATH}" ]; then
-+ inst_symlink "${PLYMOUTH_WATERMARK_PATH}"
-+fi
-+
- if [ -L
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
- cp -a
${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth
$INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
- fi
