Accepting request 920142 from home:qzhao:branches:Base:System

Add plymouth-watermark-config.patch: Add two-step watermark theme config support, make the plymouth-branding easy to work (bsc#1189613).

OBS-URL: https://build.opensuse.org/request/show/920142
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=308

plymouth-watermark-config.patch

@@ -0,0 +1,49 @@
+diff -Nura plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin.c plymouth-0.9.5~git20210406.e554475_new/src/plugins/splash/two-step/plugin.c
+--- plymouth-0.9.5~git20210406.e554475/src/plugins/splash/two-step/plugin.c	2021-04-06 19:53:40.000000000 +0800
++++ plymouth-0.9.5~git20210406.e554475_new/src/plugins/splash/two-step/plugin.c	2021-09-19 17:04:54.441225214 +0800
+@@ -1053,7 +1053,6 @@
+         plugin = calloc (1, sizeof(ply_boot_splash_plugin_t));
+ 
+         image_dir = ply_key_file_get_value (key_file, "two-step", "ImageDir");
+-
+         ply_trace ("Using '%s' as working directory", image_dir);
+ 
+         asprintf (&image_path, "%s/lock.png", image_dir);
+@@ -1076,9 +1075,23 @@
+         plugin->background_tile_image = ply_image_new (image_path);
+         free (image_path);
+ 
+-        asprintf (&image_path, "%s/watermark.png", image_dir);
+-        plugin->watermark_image = ply_image_new (image_path);
+-        free (image_path);
++	char *release_watermark_path, *theme_watermark_path;
++        release_watermark_path = ply_key_file_get_value (key_file, "two-step", "WatermarkPath");
++	asprintf (&theme_watermark_path, "%s/watermark.png", image_dir);
++	if (release_watermark_path != NULL && access(release_watermark_path, R_OK) == 0 )
++	{
++                ply_trace ("openSUSE's Watermark path: '%s'", release_watermark_path);
++                plugin->watermark_image = ply_image_new (release_watermark_path);
++                free (release_watermark_path);
++        }
++	else if( access(theme_watermark_path, R_OK) == 0)
++	{
++                ply_trace ("Theme's Watermark path: '%s'", theme_watermark_path);
++                plugin->watermark_image = ply_image_new (theme_watermark_path);
++                free (theme_watermark_path);
++        }
++	else
++		plugin->watermark_image = NULL;
+ 
+         plugin->animation_dir = image_dir;
+ 
+diff -Nura plymouth-0.9.5~git20210406.e554475/themes/bgrt/bgrt.plymouth.desktop plymouth-0.9.5~git20210406.e554475_new/themes/bgrt/bgrt.plymouth.desktop
+--- plymouth-0.9.5~git20210406.e554475/themes/bgrt/bgrt.plymouth.desktop	2021-04-06 19:53:40.000000000 +0800
++++ plymouth-0.9.5~git20210406.e554475_new/themes/bgrt/bgrt.plymouth.desktop	2021-09-19 17:14:04.299069740 +0800
+@@ -7,6 +7,7 @@
+ Font=Cantarell 12
+ TitleFont=Cantarell Light 30
+ ImageDir=@PLYMOUTH_THEME_PATH@/spinner
++WatermarkPath=/usr/share/pixmaps/distribution-logos/light-inline.png
+ DialogHorizontalAlignment=.5
+ DialogVerticalAlignment=.382
+ TitleHorizontalAlignment=.5

plymouth.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Sep 16 07:44:07 UTC 2021 - Cliff Zhao <qzhao@suse.com>
+
+- Add plymouth-watermark-config.patch: Add two-step watermark theme
+  config support, make the plymouth-branding easy to work
+  (bsc#1189613).
+
 -------------------------------------------------------------------
 Thu Sep  6 08:42:26 UTC 2021 - Cliff Zhao <qzhao@suse.com>
 

plymouth.spec

@@ -49,6 +49,8 @@ Patch7:         plymouth-only_use_fb_for_cirrus_bochs.patch
 Patch8:         plymouth-keep-KillMode-none.patch
 # PATCH-FIX-OPENSUSE plymouth-set-default-theme-suse-branding.patch bsc#1189613 qzhao@suse.com -- set plymouth's default theme to openSUSE/SUSE branding assigned style to avoid screen mass.
 Patch9:         plymouth-set-default-theme-suse-branding.patch
+# PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao@suse.com -- Add two-step water mark config support.
+Patch10:        plymouth-watermark-config.patch
 # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- 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 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
@@ -93,6 +95,7 @@ Suggests:       %{name}-theme-bgrt = %{version}
 Suggests:       %{name}-theme-spinner = %{version}
 %endif
 Recommends:     %{name}-lang
+Requires:       %{name}-scripts
 Requires:       libdrm2
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-boot-client%{soversion} = %{version}
@@ -408,7 +411,6 @@ autoreconf -ivf
            --disable-static                                      \
            --disable-upstart-monitoring                          \
            --disable-tests                                       \
-           --disable-libkms                                      \
 %if %{without x11_renderer}
            --disable-gtk                                         \
 %endif
@@ -478,10 +480,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %posttrans
-plymouth-set-default-theme -r
+plymouth-set-default-theme -r && plymouth-set-default-theme -R
-if [ $? -eq 0 ]; then
-        plymouth-set-default-theme -R
-fi
 
 %if 0%{?suse_version} > 1500
 %ldconfig_scriptlets -n libply-boot-client%{soversion}