openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package plymouth (Revision c183b54f6993261b19f2e68666d12fb6)

Currently displaying revision c183b54f6993261b19f2e68666d12fb6 , 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,11 +6,11 @@ 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,35 @@ create_devices_for_udev_device (ply_devi
                  subsystem = udev_device_get_subsystem (device);
                  ply_trace ("device subsystem is %s", subsystem);
  
@@ -24,6 +24,8 @@ Index: plymouth-0.9.3+git20180807.7663b0
 +                        /* "Technical Corp", also used by bochs */
 +                        else if (strcmp ("0x1234", card_vendor) == 0)
 +                                use_fb = strcmp("0x1111", card_device) == 0;
++			else if (ply_kernel_command_line_has_argument ("plymouth.force-renderer=frame-buffer"))
++				use_fb = true;
 +                }
 +
                  if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
--- plymouth.changes.orig
+++ plymouth.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed May 19 12:00:45 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Add kernel command line option plymouth.force-renderer=frame-buffer
+  in order to allow the frame buffer renderer to be used, where DRM
+  is not available or not sufficient (eg. NVIDIA proprietary)
+
+-------------------------------------------------------------------
 Fri May 14 14:19:22 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
 - Do not own /usr/share/locale (owned by filesystem):
--- plymouth.spec.orig
+++ plymouth.spec
@@ -35,6 +35,7 @@ Group:          System/Base
 URL:            https://www.freedesktop.org/wiki/Software/Plymouth
 Source0:        %{name}-%{version}.tar.xz
 Source1:        boot-duration
+Source2:        %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
 Patch0:         plymouth-dracut-path.patch
 # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
@@ -133,7 +134,7 @@ Requires:       libply-boot-client%{sove
 This package contains the libply library used by Plymouth.
 
 %package branding-upstream
-Summary:        default configuration file and branding from the Plymouth upstream.
+Summary:        Upstream configuration file and branding
 Group:          System/Base
 Provides:       %{name}-branding = %{version}-%{release}.
 Conflicts:      %{name}-branding

Places

File project.diff of Package plymouth (Revision c183b54f6993261b19f2e68666d12fb6)

Places