openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package plymouth (Revision d6ddd7b37de7c3c81a989aa0974cb080)

Currently displaying revision d6ddd7b37de7c3c81a989aa0974cb080 , Show latest

--- plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch.orig
+++ plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
@@ -1,7 +1,8 @@
-diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in
---- plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in	2019-09-09 15:31:37.000000000 +0800
-+++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in	2020-09-07 16:09:51.568487811 +0800
-@@ -58,7 +58,12 @@
+Index: b/scripts/plymouth-set-default-theme.in
+===================================================================
+--- a/scripts/plymouth-set-default-theme.in
++++ b/scripts/plymouth-set-default-theme.in
+@@ -58,7 +58,12 @@ function read_theme_name_from_file ()
  
  function get_default_theme ()
  {
@@ -15,7 +16,7 @@ diff -Nura plymouth-0.9.5+git20190908+3a
          if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
                  THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults)
          fi
-@@ -168,9 +173,16 @@
+@@ -168,9 +173,16 @@ if [ `id -u` -ne 0 ]; then
  fi
  
  if [ $DO_RESET -ne 0 ]; then
@@ -35,10 +36,11 @@ diff -Nura plymouth-0.9.5+git20190908+3a
  fi
  
  if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
-diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am
---- plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am	2019-09-09 15:31:37.000000000 +0800
-+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am	2020-09-07 10:50:57.711594680 +0800
-@@ -16,6 +16,7 @@
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,6 +17,7 @@ plymouthdbin_PROGRAMS = plymouthd
  
  plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS)                                         \
  		   -rdynamic                                                  \
--- plymouth-only_use_fb_for_cirrus_bochs.patch.orig
+++ plymouth-only_use_fb_for_cirrus_bochs.patch
@@ -6,17 +6,20 @@ DRM does not work well with cirrus and b
 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
+Index: b/src/libply-splash-core/ply-device-manager.c
 ===================================================================
---- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-core/ply-device-manager.c        2018-08-07 17:41:15.000000000 +0200
-+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c        2018-08-17 19:58:41.178821647 +0200
-@@ -228,13 +228,33 @@ create_devices_for_udev_device (ply_devi
+--- a/src/libply-splash-core/ply-device-manager.c
++++ b/src/libply-splash-core/ply-device-manager.c
+@@ -274,13 +274,36 @@ create_devices_for_udev_device (ply_devi
                  subsystem = udev_device_get_subsystem (device);
                  ply_trace ("device subsystem is %s", subsystem);
  
 +                const char *card_vendor = udev_device_get_sysattr_value (device, "device/vendor");
 +                const char *card_device = udev_device_get_sysattr_value (device, "device/device");
 +                bool use_fb = false;
++                if (ply_kernel_command_line_has_argument ("plymouth.force-renderer=frame-buffer"))
++                        use_fb = true;
++
 +                if (card_vendor) {
 +                        /* Cirrus */
 +                        if (strcmp ("0x1013", card_vendor) == 0)
@@ -30,7 +33,7 @@ Index: plymouth-0.9.3+git20180807.7663b0
                          ply_trace ("found DRM device %s", device_path);
                          renderer_type = PLY_RENDERER_TYPE_DRM;
 +                        if (use_fb) {
-+                                ply_trace ("forcing use of framebuffer for cirrusdrmfb");
++                                ply_trace ("forcing use of framebuffer");
 +                                renderer_type = PLY_RENDERER_TYPE_NONE;
 +                        }
                  } else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) {
--- plymouth-watermark-config.patch.orig
+++ plymouth-watermark-config.patch
@@ -36,14 +36,3 @@ diff -Nura plymouth-0.9.5~git20210406.e5
  
          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.orig
+++ plymouth.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Feb  4 13:29:04 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Remove dist specific path setting in plymouth-watermark-config.patch
+  which prevents the use of any custom watermarks
+
+-------------------------------------------------------------------
 Sun Jan 30 05:12:13 UTC 2022 - Cliff Zhao <qzhao@suse.com>
 
 - Add plymouth-watermark-config.patch:
--- plymouth.spec.orig
+++ plymouth.spec
@@ -42,7 +42,7 @@ Patch3:         plymouth-no-longer-modif
 # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
 Patch4:         plymouth-disable-fedora-logo.patch
 # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
-Patch5:         plymouth-only_use_fb_for_cirrus_bochs.patch
+#Patch5:         plymouth-only_use_fb_for_cirrus_bochs.patch
 # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
 Patch6:         plymouth-keep-KillMode-none.patch
 # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.

Places

File project.diff of Package plymouth (Revision d6ddd7b37de7c3c81a989aa0974cb080)

Places