plymouth: Update to 0.9.0.
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 7 Dec 2014 14:42:24 +0000 (15:42 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 7 Dec 2014 14:42:24 +0000 (15:42 +0100)
plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch [moved from plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch with 52% similarity]
plymouth/plymouth-update-initrd [deleted file]
plymouth/plymouth.nm

@@ -1,15 +1,15 @@
-diff -up plymouth-0.8.0/src/plugins/splash/text/plugin.c.red plymouth-0.8.0/src/plugins/splash/text/plugin.c
---- plymouth-0.8.0/src/plugins/splash/text/plugin.c.red        2009-11-19 14:40:24.000000000 -0500
-+++ plymouth-0.8.0/src/plugins/splash/text/plugin.c    2009-11-19 14:41:40.000000000 -0500
-@@ -184,10 +184,10 @@ view_start_animation (view_t *view)
+diff -Nur plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c plymouth-0.9.0/src/plugins/splash/text/plugin.c
+--- plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c       2014-04-21 17:18:19.000000000 +0200
++++ plymouth-0.9.0/src/plugins/splash/text/plugin.c    2014-12-07 14:57:09.344789424 +0100
+@@ -177,10 +177,10 @@
                                      0xffffff);
    ply_terminal_set_color_hex_value (terminal,
                                      PLY_TERMINAL_COLOR_BLUE,
--                                    0x0073B3);
+-                                    0x3465a4);
 +                                    0xCC0A00);
    ply_terminal_set_color_hex_value (terminal,
                                      PLY_TERMINAL_COLOR_BROWN,
--                                    0x00457E);
+-                                    0x979a9b);
 +                                    0x880400);
  
    ply_text_display_set_background_color (view->display,
diff --git a/plymouth/plymouth-update-initrd b/plymouth/plymouth-update-initrd
deleted file mode 100644 (file)
index c07b561..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install $(uname -r)
index cbecf07..257aef6 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.8
+version    = 0.9.0
 release    = 1
 
 groups     = System/Base
@@ -27,23 +27,14 @@ build
                autoconf
                automake
                cairo-devel
+               docbook-xsl
                glib2-devel
                pkgconfig(libdrm)
-               pkgconfig(libdrm_radeon)
-               pkgconfig(libdrm_nouveau)
                libpng-devel
+               libudev-devel
                pango-devel
        end
 
-       enable_libdrm_intel = 0
-
-       if "%{DISTRO_PLATFORM}" == "x86"
-               enable_libdrm_intel = 1
-               requires += pkgconfig(libdrm_intel)
-       end
-
-       CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-
        configure_options += \
                --libexecdir=/usr/lib \
                --disable-libkms \
@@ -60,10 +51,6 @@ build
                --without-rhgb-compat-link \
                --without-log-viewer
 
-       if "%{enable_libdrm_intel}" == "0"
-               configure_options += --disable-libdrm_intel
-       end
-
        prepare_cmds
                autoreconf -vfi
        end
@@ -80,10 +67,10 @@ build
                cp -vf %{DIR_SOURCE}/boot-duration \
                        %{BUILDROOT}%{localstatedir}/lib/plymouth
 
-               # Override plymouth-update-initrd to work dracut or mkinitrd
-               cp -vf %{DIR_SOURCE}/plymouth-update-initrd \
-                       %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
-               chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
+               # The "glow" theme isn't quite ready for primetime, so drop it.
+               rm -rvf %{BUILDROOT}%{datadir}/plymouth/themes/glow
+               rm -rvf %{BUILDROOT}%{datadir}/plymouth/glow/
+               rm -rvf %{BUILDROOT}%{libdir}/plymouth/glow.so
        end
 end
 
@@ -277,7 +264,7 @@ packages
                end
 
                script postun
-                       if [ "$(%{sbindir}/plymouth-set-default-theme)" = %{theme_name}" ]; then
+                       if [ "$(%{sbindir}/plymouth-set-default-theme)" = "%{theme_name}" ]; then
                                %{sbindir}/plymouth-set-default-theme --reset
                                /usr/lib/plymouth/plymouth-generate-initrd
                        fi