- updated to 0.8.5.1

- removed obsolete check_for_consoles patch

Changed files:
    check_for_consoles.patch -> 1.3
    plymouth.spec -> 1.28

diff --git a/check_for_consoles.patch b/check_for_consoles.patch
deleted file mode 100644 (file)
index f088df2..0000000
--- a/check_for_consoles.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index e4223b7..c85fe4c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1872,14 +1872,16 @@ add_display_and_keyboard_for_console (const char *console,
-   add_display_and_keyboard_for_terminal (state, terminal);
- }
- 
--static bool
-+static int
- add_consoles_from_file (state_t         *state,
-                         ply_hashtable_t *consoles,
-                         const char      *path)
- {
-   int fd;
-   char contents[512] = "";
--  const char *remaining_command_line;
-+  ssize_t contents_length;
-+  int num_consoles;
-+  const char *remaining_file_contents;
-   char *console;
- 
-   ply_trace ("opening %s", path);
-@@ -1888,60 +1890,86 @@ add_consoles_from_file (state_t         *state,
-   if (fd < 0)
-     {
-       ply_trace ("couldn't open it: %m");
--      return false;
-+      return 0;
-     }
- 
-   ply_trace ("reading file");
--  if (read (fd, contents, sizeof (contents)))
-+  contents_length = read (fd, contents, sizeof (contents));
-+
-+  if (contents_length <= 0)
-     {
-       ply_trace ("couldn't read it: %m");
-       close (fd);
--      return false;
-+      return 0;
-     }
-   close (fd);
- 
--  remaining_command_line = contents;
-+  remaining_file_contents = contents;
-+  num_consoles = 0;
- 
-   console = NULL;
--  while (remaining_command_line != '\0')
-+  while (remaining_file_contents < contents + contents_length)
-     {
--      char *end;
-       size_t console_length;
-+      char *end;
-       char *console_device;
- 
--      state->should_force_details = true;
-+      /* Advance past any leading whitespace */
-+      remaining_file_contents += strspn (remaining_file_contents, " \n\t\v");
- 
--      console = strdup (remaining_command_line);
-+      if (*remaining_file_contents == '\0')
-+        {
-+          /* There's nothing left after the whitespace, we're done */
-+          break;
-+        }
- 
--      end = strpbrk (console, " \n\t\v");
-+      console = strdup (remaining_file_contents);
- 
--      if (end != NULL)
--        *end = '\0';
-+      /* Find trailing whitespace and NUL terminate.  If strcspn
-+       * doesn't find whitespace, it gives us the length of the string
-+       * until the next NUL byte, which we'll just overwrite with
-+       * another NUL byte anyway. */
-+      console_length = strcspn (console, " \n\t\v");
-+      console[console_length] = '\0';
- 
--      console_length = strlen (console);
-+      /* If this console is anything besides tty0, then the user is sort
-+       * of a weird case (uses a serial console or whatever) and they
-+       * most likely don't want a graphical splash, so force details.
-+       */
-+      if (strcmp (console, "tty0") != 0)
-+        state->should_force_details = true;
- 
-       asprintf (&console_device, "/dev/%s", console);
-       free (console);
-       console = NULL;
- 
-       ply_trace ("console %s found!", console_device);
-       ply_hashtable_insert (consoles, console_device, console_device);
--      remaining_command_line += console_length;
-+      num_consoles++;
-+
-+      /* Move past the parsed console string, and the whitespace we
-+       * may have found above.  If we found a NUL above and not whitespace,
-+       * then we're going to jump past the end of the buffer and the loop
-+       * will terminate
-+       */
-+      remaining_file_contents += console_length + 1;
-     }
- 
--  return true;
-+  return num_consoles;
- }
- 
--static void
-+static int
- add_consoles_from_kernel_command_line (state_t         *state,
-                                        ply_hashtable_t *consoles)
- {
-   const char *console_string;
-   const char *remaining_command_line;
-   char *console;
-+  int num_consoles;
- 
-   remaining_command_line = state->kernel_command_line;
- 
-+  num_consoles = 0;
-   console = NULL;
-   while ((console_string = command_line_get_string_after_prefix (remaining_command_line,
-                                                                  "console=")) != NULL)
-@@ -1977,8 +2003,11 @@ add_consoles_from_kernel_command_line (state_t         *state,
- 
-       ply_trace ("console %s found!", console_device);
-       ply_hashtable_insert (consoles, console_device, console_device);
-+      num_consoles++;
-       remaining_command_line += console_length;
-     }
-+
-+  return num_consoles;
- }
- 
- static void
-@@ -1988,33 +2017,47 @@ check_for_consoles (state_t    *state,
- {
-   char *console;
-   ply_hashtable_t *consoles;
-+  int num_consoles;
-+  bool ignore_serial_consoles;
- 
-   ply_trace ("checking for consoles%s",
-              should_add_displays? " and adding displays": "");
- 
-   consoles = ply_hashtable_new (ply_hashtable_string_hash,
-                                 ply_hashtable_string_compare);
-+  ignore_serial_consoles = command_line_has_argument (state->kernel_command_line, "plymouth.ignore-serial-consoles");
-+
-+  num_consoles = 0;
- 
--  if (!add_consoles_from_file (state,
--                               consoles,
--                               "/sys/class/tty/console/active"))
-+  if (!ignore_serial_consoles)
-     {
--      ply_trace ("falling back to kernel command line");
--      add_consoles_from_kernel_command_line (state, consoles);
-+      num_consoles = add_consoles_from_file (state, consoles, "/sys/class/tty/console/active");
-+
-+      if (num_consoles == 0)
-+        {
-+          ply_trace ("falling back to kernel command line");
-+          num_consoles = add_consoles_from_kernel_command_line (state, consoles);
-+        }
-+    }
-+  else
-+    {
-+      ply_trace ("ignoring all consoles but default console because of plymouth.ignore-serial-consoles");
-     }
- 
-   console = ply_hashtable_remove (consoles, (void *) "/dev/tty0");
-   if (console != NULL)
-     {
-       free (console);
--      ply_hashtable_insert (consoles, (void *) default_tty, (char *) default_tty);
-+      console = strdup (default_tty);
-+      ply_hashtable_insert (consoles, console, console);
-     }
- 
-   console = ply_hashtable_remove (consoles, (void *) "/dev/tty");
-   if (console != NULL)
-     {
-       free (console);
--      ply_hashtable_insert (consoles, (void *) default_tty, (void *) default_tty);
-+      console = strdup (default_tty);
-+      ply_hashtable_insert (consoles, console, console);
-     }
- 
-   free (state->kernel_console_tty);
-@@ -2025,10 +2068,18 @@ check_for_consoles (state_t    *state,
- 
-   if (should_add_displays)
-     {
--      ply_hashtable_foreach (consoles,
--                             (ply_hashtable_foreach_func_t *)
--                             add_display_and_keyboard_for_console,
--                             state);
-+      /* Do a full graphical splash if there's no weird serial console
-+       * stuff going on, otherwise just prepare text splashes
-+       */
-+      if ((num_consoles == 0) ||
-+          ((num_consoles == 1) &&
-+           (ply_hashtable_lookup (consoles, (void *) default_tty) != NULL)))
-+        add_default_displays_and_keyboard (state);
-+      else
-+        ply_hashtable_foreach (consoles,
-+                               (ply_hashtable_foreach_func_t *)
-+                               add_display_and_keyboard_for_console,
-+                               state);
-     }
- 
-   ply_hashtable_foreach (consoles, (ply_hashtable_foreach_func_t *) free, NULL);
-@@ -2036,8 +2087,6 @@ check_for_consoles (state_t    *state,
- 
-   ply_trace ("After processing serial consoles there are now %d text displays",
-              ply_list_get_length (state->text_displays));
--  if (should_add_displays && ply_list_get_length (state->text_displays) == 0)
--    add_default_displays_and_keyboard (state);
- }
- 
- static bool

diff --git a/plymouth.spec b/plymouth.spec
index e877b4b3787bb4bcf7f629de526d7ff97746ece8..9afb7b0396eeff1e5998fa4f5e052ad8a551da76 100644 (file)
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -11,12 +11,12 @@
 Summary:       Graphical Boot Animation and Logger
 Summary(pl.UTF-8):     Graficzna animacja i logowanie startu systemu
 Name:          plymouth
-Version:       0.8.4
-Release:       5
+Version:       0.8.5.1
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 6f370cd69bd6d0c67657d243a99dc260
+# Source0-md5: 76714ebe125991f59b8a5029070f9b83
 Source1:       %{name}-logo.png
 # Source1-md5: 6b38a868585adfd3a96a4ad16973c1f8
 Source2:       %{name}.tmpfiles
@@ -24,15 +24,14 @@ Source3:    charge.%{name}
 Source4:       boot-duration
 Source5:       %{name}-set-default-plugin
 Source6:       %{name}-update-initrd
-Patch0:                check_for_consoles.patch
-Patch1:                text-colors.patch
+Patch0:                text-colors.patch
 URL:           http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRequires: cairo-devel
 BuildRequires: gtk+2-devel >= 2:2.12.0
 %if %{with drm_intel} ||  %{with drm_radeon} ||  %{with drm_nouveau} ||  %{with kms}
 BuildRequires: libdrm-devel
 %endif
-BuildRequires: libpng-devel >= 1.2.16
+BuildRequires: libpng-devel >= 2:1.2.16
 BuildRequires: pango-devel >= 1:1.21.0
 BuildRequires: pkgconfig
 Requires:      %{name}-graphics-libs = %{version}-%{release}
@@ -341,7 +340,6 @@ Odznacza się on małym kółkiem kręcącym się na ciemnym tle.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -444,6 +442,15 @@ fi
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
+# currently packaged in systemd-plymouth
+#%{systemdunitdir}/plymouth-halt.service
+#%{systemdunitdir}/plymouth-kexec.service
+#%{systemdunitdir}/plymouth-poweroff.service
+#%{systemdunitdir}/plymouth-quit-wait.service
+#%{systemdunitdir}/plymouth-quit.service
+#%{systemdunitdir}/plymouth-read-write.service
+#%{systemdunitdir}/plymouth-reboot.service
+#%{systemdunitdir}/plymouth-start.service
 
 %files core-libs
 %defattr(644,root,root,755)