Merge pull request #1658 from alihanozturk/master

revert plymouth
This commit is contained in:
Ertuğrul Erata
2016-04-22 11:07:06 +03:00
7 changed files with 311 additions and 183 deletions
+5 -5
View File
@@ -16,6 +16,8 @@ def setup():
# /var/run => /run # /var/run => /run
pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$localstatedir(\/run\/plymouth)", r"\1\2") pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$localstatedir(\/run\/plymouth)", r"\1\2")
pisitools.dosed("src/Makefile.am", "^(plymouthdrundir\s=\s)\$\(localstatedir\)(\/run\/plymouth)", r"\1\2") pisitools.dosed("src/Makefile.am", "^(plymouthdrundir\s=\s)\$\(localstatedir\)(\/run\/plymouth)", r"\1\2")
shelltools.export("LDFLAGS","%s -ludev" % get.LDFLAGS())
autotools.autoreconf("-fis") autotools.autoreconf("-fis")
@@ -30,13 +32,11 @@ def setup():
--with-system-root-install \ --with-system-root-install \
--with-boot-tty=/dev/tty7 \ --with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \ --with-shutdown-tty=/dev/tty1 \
--with-log-viewer \
--disable-libdrm_nouveau \
--disable-tests \
--disable-static \ --disable-static \
--enable-drm \
--enable-pango \
--enable-gdm-transition \ --enable-gdm-transition \
--without-rhgb-compat-link \ --without-rhgb-compat-link" % LOGO_FILE)
--without-gdm-autostart-file" % LOGO_FILE)
def build(): def build():
autotools.make() autotools.make()
+231 -124
View File
@@ -1,137 +1,244 @@
From 6ccedf7b6ecdc8314ed97355cfe5499fffb13a1e Mon Sep 17 00:00:00 2001 From fceb77c9dffd6644944bfd26e77ace64aba3f96f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Thu, 1 Nov 2012 17:04:33 -0400 Date: Mon, 26 Oct 2015 13:20:18 -0400
Subject: [PATCH 1/3] main: if deactivate when already deactivated return Subject: [PATCH 1/2] two-step: don't tank in updates mode when there's no
immediately progress animations
We were trying to ignore second deactivate requests, but Right now we try to use the progress animation in updates mode, even
were instead crashing because we're trying to use a nullified if there's not one. This commit makes the progress animation truely
trigger. optional.
This commit makes sure things don't go crashy when a user
does "plymouth deactivate" on an already deactivated plymouthd.
--- ---
src/main.c | 8 +++++++- src/plugins/splash/two-step/plugin.c | 22 +++++++++++++++-------
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main.c b/src/main.c
index 88e5002..60ca28f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1135,7 +1135,13 @@ static void
on_deactivate (state_t *state,
ply_trigger_t *deactivate_trigger)
{
- if ((state->deactivate_trigger != NULL) || state->is_inactive)
+ if (state->is_inactive)
+ {
+ ply_trigger_pull (deactivate_trigger, NULL);
+ return;
+ }
+
+ if (state->deactivate_trigger != NULL)
{
ply_trigger_add_handler (state->deactivate_trigger,
(ply_trigger_handler_t)
--
1.7.12.1
From b3548ebaf76d222f56d6a7b34c5940b930d47609 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Thu, 1 Nov 2012 17:16:07 -0400
Subject: [PATCH 2/3] two-step: don't update progress when idle
We've already reach a state where we aren't drawing anymore, etc,
so don't update progress and potentially fire off animations
that won't be seen.
---
src/plugins/splash/two-step/plugin.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index 2998beb..541a108 100644 index 541a108..ceca101 100644
--- a/src/plugins/splash/two-step/plugin.c --- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c +++ b/src/plugins/splash/two-step/plugin.c
@@ -1067,6 +1067,9 @@ on_boot_progress (ply_boot_splash_plugin_t *plugin, @@ -180,66 +180,73 @@ view_free (view_t *view)
if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
return;
+ if (plugin->is_idle)
+ return;
+
if (percent_done >= SHOW_ANIMATION_PERCENT)
{
if (plugin->stop_trigger == NULL)
--
1.7.12.1
From a6129abfc527ac247685d80fc5c20144be1badca Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 2 Nov 2012 17:26:41 -0400
Subject: [PATCH 3/3] main: make plymouth show-splash idempotent
plymouth show-splash causes hairy things, that should only happen once,
like activating renderers to happen.
This commit makes subsequent show-splash calls be no-ops.
---
src/main.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/main.c b/src/main.c
index 60ca28f..ff06163 100644
--- a/src/main.c
+++ b/src/main.c
@@ -113,6 +113,7 @@ typedef struct
uint32_t should_be_attached : 1;
uint32_t should_retain_splash : 1;
uint32_t is_inactive : 1;
+ uint32_t is_shown : 1;
uint32_t should_force_details : 1;
char *kernel_console_tty;
@@ -871,6 +872,12 @@ on_show_splash (state_t *state)
{
bool has_display;
+ if (state->is_shown)
+ {
+ ply_trace ("show splash called while already shown");
+ return;
+ }
+
if (state->is_inactive)
{
ply_trace ("show splash called while inactive");
@@ -884,6 +891,8 @@ on_show_splash (state_t *state)
return;
}
+ state->is_shown = true;
+
check_for_consoles (state, state->default_tty, true);
has_display = ply_list_get_length (state->pixel_displays) > 0 ||
@@ -1012,6 +1021,8 @@ dump_details_and_quit_splash (state_t *state)
if (state->boot_splash != NULL)
ply_boot_splash_hide (state->boot_splash);
+ state->is_shown = false;
+
quit_splash (state);
} }
@@ -1116,6 +1127,8 @@ on_boot_splash_idle (state_t *state) static bool
ply_renderer_deactivate (state->renderer); view_load (view_t *view)
if (state->boot_splash != NULL) {
ply_boot_splash_hide (state->boot_splash); ply_trace ("loading entry");
+ if (!ply_entry_load (view->entry))
+ state->is_shown = false; return false;
ply_trace ("loading animation");
if (!ply_animation_load (view->end_animation))
{
ply_trace ("Default animation wouldn't load, "
"falling back to old naming scheme");
/* fallback to throbber- for compatibility
*/
ply_animation_free (view->end_animation);
view->end_animation = ply_animation_new (view->plugin->animation_dir,
"throbber-");
if (!ply_animation_load (view->end_animation))
{
ply_trace ("old naming scheme didn't work either");
return false;
} }
ply_trace ("quitting splash"); ply_throbber_free (view->throbber);
view->throbber = NULL;
}
- ply_trace ("loading progress animation");
- if (!ply_progress_animation_load (view->progress_animation))
+ if (view->progress_animation != NULL)
+ {
+ ply_trace ("loading progress animation");
+ if (!ply_progress_animation_load (view->progress_animation))
+ {
+ ply_trace ("optional progress animation wouldn't load");
+ ply_progress_animation_free (view->progress_animation);
+ view->progress_animation = NULL;
+ }
+ }
+ else
{
- ply_trace ("optional progress animation wouldn't load");
- ply_progress_animation_free (view->progress_animation);
- view->progress_animation = NULL;
+ ply_trace ("this theme has no progress animation\n");
}
if (view->throbber != NULL)
{
ply_trace ("loading throbber");
if (!ply_throbber_load (view->throbber))
{
ply_trace ("optional throbber was not loaded");
ply_throbber_free (view->throbber);
view->throbber = NULL;
}
}
else
{
ply_trace ("this theme has no throbber\n");
}
return true;
}
static bool
load_views (ply_boot_splash_plugin_t *plugin)
{
ply_list_node_t *node;
bool view_loaded;
view_loaded = false;
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
@@ -1249,62 +1256,63 @@ show_message (ply_boot_splash_plugin_t *plugin,
view = ply_list_node_get_data (node);
next_node = ply_list_get_next_node (plugin->views, node);
ply_label_set_text (view->message_label, message);
ply_label_show (view->message_label, view->display, 10, 10);
ply_pixel_display_draw_area (view->display, 10, 10,
ply_label_get_width (view->message_label),
ply_label_get_height(view->message_label));
node = next_node;
}
}
static void
system_update (ply_boot_splash_plugin_t *plugin,
int progress)
{
ply_list_node_t *node;
if (plugin->mode != PLY_BOOT_SPLASH_MODE_UPDATES)
return;
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
ply_list_node_t *next_node;
view_t *view;
view = ply_list_node_get_data (node);
next_node = ply_list_get_next_node (plugin->views, node);
- ply_progress_animation_set_percent_done (view->progress_animation,
- (double) progress / 100.f);
+ if (view->progress_animation != NULL)
+ ply_progress_animation_set_percent_done (view->progress_animation,
+ (double) progress / 100.f);
node = next_node;
}
}
static void
display_normal (ply_boot_splash_plugin_t *plugin)
{
pause_views (plugin);
if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
hide_prompt (plugin);
plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
start_progress_animation (plugin);
redraw_views (plugin);
unpause_views (plugin);
}
static void
display_password (ply_boot_splash_plugin_t *plugin,
const char *prompt,
int bullets)
{
pause_views (plugin);
if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
stop_animation (plugin, NULL);
plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
show_password_prompt (plugin, prompt, bullets);
redraw_views (plugin);
unpause_views (plugin);
-- --
1.7.12.1 2.5.0
From 5de88b84ee949aaa80fafbf9e794bc2b9eddb6a6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 26 Oct 2015 13:28:33 -0400
Subject: [PATCH 2/2] script: only support one message at a time
That's the other themes do, and callers
expect it.
---
themes/script/script.script | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/themes/script/script.script b/themes/script/script.script
index 7ea9d5e..25a2f2b 100644
--- a/themes/script/script.script
+++ b/themes/script/script.script
@@ -125,55 +125,47 @@ progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
progress_bar.original_image = Image("progress_bar.png");
progress_bar.sprite = Sprite();
progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
progress_bar.y = Window.GetY() + Window.GetHeight() / 2 * 1.5 - progress_box.image.GetHeight() / 2 + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
fun progress_callback (duration, progress)
{
if (progress_bar.image.GetWidth () != Math.Int (progress_bar.original_image.GetWidth () * progress))
{
progress_bar.image = progress_bar.original_image.Scale(progress_bar.original_image.GetWidth(progress_bar.original_image) * progress, progress_bar.original_image.GetHeight());
progress_bar.sprite.SetImage (progress_bar.image);
}
}
Plymouth.SetBootProgressFunction(progress_callback);
#----------------------------------------- Quit --------------------------------
fun quit_callback ()
{
logo.sprite.SetOpacity (1);
}
Plymouth.SetQuitFunction(quit_callback);
#----------------------------------------- Message --------------------------------
-message_sprites = [];
-message_sprite_count = 0;
-message_sprite_y = 10;
+message_sprite = Sprite();
+message_sprite.SetPosition(10, 10, 10000);
fun display_message_callback (text)
{
my_image = Image.Text(text, 1, 1, 1);
- message_sprites[message_sprite_count] = Sprite(my_image);
- message_sprites[message_sprite_count].SetPosition(10, message_sprite_y, 10000);
- message_sprites[message_sprite_count].text = text;
- message_sprite_count++;
- message_sprite_y += my_image.GetHeight();
+ message_sprite.SetImage(my_image);
}
fun hide_message_callback (text)
{
- for (i = 0; i < message_sprite_count; i++)
- {
- if (message_sprites[i].text == text)
- message_sprites[i] = NULL;
- }
+ message_sprite = Sprite();
+ message_sprite.SetPosition(10, 10, 10000);
}
Plymouth.SetDisplayMessageFunction (display_message_callback);
Plymouth.SetHideMessageFunction (hide_message_callback);
--
2.5.0
@@ -20,30 +20,30 @@ index 2d73d66..1a67526 100644
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h +++ b/src/libply-splash-core/ply-boot-splash-plugin.h
@@ -38,6 +38,8 @@ typedef enum @@ -38,6 +38,8 @@ typedef enum
{ {
PLY_BOOT_SPLASH_MODE_BOOT_UP, PLY_BOOT_SPLASH_MODE_BOOT_UP,
PLY_BOOT_SPLASH_MODE_SHUTDOWN, PLY_BOOT_SPLASH_MODE_SHUTDOWN,
+ PLY_BOOT_SPLASH_MODE_SUSPEND, + PLY_BOOT_SPLASH_MODE_SUSPEND,
+ PLY_BOOT_SPLASH_MODE_RESUME, + PLY_BOOT_SPLASH_MODE_RESUME,
PLY_BOOT_SPLASH_MODE_UPDATES, PLY_BOOT_SPLASH_MODE_UPDATES,
PLY_BOOT_SPLASH_MODE_INVALID PLY_BOOT_SPLASH_MODE_INVALID
} ply_boot_splash_mode_t; } ply_boot_splash_mode_t;
diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
index 5c648a6..eb7791e 100644 index 5c648a6..eb7791e 100644
--- a/src/plugins/splash/script/script-lib-plymouth.c --- a/src/plugins/splash/script/script-lib-plymouth.c
+++ b/src/plugins/splash/script/script-lib-plymouth.c +++ b/src/plugins/splash/script/script-lib-plymouth.c
@@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state, @@ -70,6 +70,12 @@
case PLY_BOOT_SPLASH_MODE_SHUTDOWN: case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
obj = script_obj_new_string ("shutdown"); obj = script_obj_new_string ("shutdown");
break; break;
+ case PLY_BOOT_SPLASH_MODE_SUSPEND: + case PLY_BOOT_SPLASH_MODE_SUSPEND:
+ obj = script_obj_new_string ("suspend"); + obj = script_obj_new_string ("suspend");
+ break; + break;
+ case PLY_BOOT_SPLASH_MODE_RESUME: + case PLY_BOOT_SPLASH_MODE_RESUME:
+ obj = script_obj_new_string ("resume"); + obj = script_obj_new_string ("resume");
+ break; + break;
case PLY_BOOT_SPLASH_MODE_UPDATES: case PLY_BOOT_SPLASH_MODE_UPDATES:
obj = script_obj_new_string ("updates"); obj = script_obj_new_string ("updates");
break; break;
-- --
1.7.10.4 1.7.10.4
@@ -1,7 +1,7 @@
--- plymouth-0.8.8/themes/Makefile.am 2012-10-26 18:01:45.000000000 +0300 --- plymouth-0.8.8/themes/Makefile.am 2012-10-26 18:01:45.000000000 +0300
+++ plymouth-0.8.8-esk/themes/Makefile.am 2013-01-15 05:00:46.920416669 +0200 +++ plymouth-0.8.8-esk/themes/Makefile.am 2013-01-15 05:00:46.920416669 +0200
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-SUBDIRS = spinfinity fade-in text details solar glow script spinner -SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar
+SUBDIRS = spinfinity fade-in text details solar glow script spinner pisilinux +SUBDIRS = spinfinity fade-in text details solar glow script spinner pisilinux
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
--- plymouth-0.8.8/src/plymouthd.conf 2012-10-26 18:01:45.000000000 +0300 --- plymouth-0.8.8/src/plymouthd.conf 2012-10-26 18:01:45.000000000 +0300
@@ -13,15 +13,16 @@
+#Theme=pisilinux +#Theme=pisilinux
--- plymouth-0.8.8/src/plymouthd.defaults 2012-10-26 18:01:45.000000000 +0300 --- plymouth-0.8.8/src/plymouthd.defaults 2012-10-26 18:01:45.000000000 +0300
+++ plymouth-0.8.8-esk/src/plymouthd.defaults 2013-01-15 05:06:37.681404525 +0200 +++ plymouth-0.8.8-esk/src/plymouthd.defaults 2013-01-15 05:06:37.681404525 +0200
@@ -1,4 +1,4 @@ @@ -1,5 +1,5 @@
# Distribution defaults. Changes to this file will get overwritten during # Distribution defaults. Changes to this file will get overwritten during
# upgrades. # upgrades.
[Daemon] [Daemon]
-Theme=spinner -Theme=spinner
+Theme=pisilinux +Theme=pisilinux
ShowDelay=5
--- plymouth-0.8.8/configure.ac 2012-10-26 18:01:45.000000000 +0300 --- plymouth-0.8.8/configure.ac 2012-10-26 18:01:45.000000000 +0300
+++ plymouth-0.8.8-esk/configure.ac 2013-01-15 05:08:54.923399773 +0200 +++ plymouth-0.8.8-esk/configure.ac 2013-01-15 05:08:54.923399773 +0200
@@ -451,6 +451,7 @@ @@ -306,6 +306,7 @@
themes/glow/Makefile themes/glow/Makefile
themes/spinner/Makefile themes/spinner/Makefile
themes/script/Makefile themes/script/Makefile
@@ -6,8 +6,8 @@ Index: plymouth-0.8.3_20100929/src/libply/ply-logger.h
ply_logger_flush (logger); \ ply_logger_flush (logger); \
errno = _old_errno; \ errno = _old_errno; \
ply_logger_inject (logger, \ ply_logger_inject (logger, \
- "[%s] %45.45s:" format "\r\n", \ - "[%s:%d] %45.45s:" format "\r\n", \
- __FILE__, __func__, ##args); \ - __FILE__, __LINE__, __func__, ## args); \
+ "" format "\n", \ + "" format "\n", \
+ ##args); \ + ##args); \
ply_logger_flush (logger); \ ply_logger_flush (logger); \
@@ -5,19 +5,20 @@
/lib/libc.so.6 /lib/libc.so.6
/lib/libdl.so.2 /lib/libdl.so.2
/lib/libm.so.6 /lib/libm.so.6
/lib/libply-splash-core.so.2 /lib/libply-splash-core.so.4
/lib/libply.so.2 /lib/libply.so.4
/lib/libpthread.so.0 /lib/libpthread.so.0
/lib/librt.so.1 /lib/librt.so.1
/lib/libz.so.1 /lib/libz.so.1
/sbin/plymouthd /sbin/plymouthd
/usr/lib/libdrm.so.2 /usr/lib/libdrm.so.2
/usr/lib/libdrm_amdgpu.so.1
/usr/lib/libdrm_intel.so.1 /usr/lib/libdrm_intel.so.1
/usr/lib/libdrm_nouveau.so.2 /usr/lib/libdrm_nouveau.so.2
/usr/lib/libdrm_radeon.so.1 /usr/lib/libdrm_radeon.so.1
/usr/lib/libkms.so.1 /usr/lib/libkms.so.1
/usr/lib/libply-boot-client.so.2 /usr/lib/libply-boot-client.so.4
/usr/lib/libply-splash-graphics.so.2 /usr/lib/libply-splash-graphics.so.4
/usr/lib/libpng16.so.16 /usr/lib/libpng16.so.16
/usr/lib/liblzo2.so.2 /usr/lib/liblzo2.so.2
/usr/lib/plymouth/details.so /usr/lib/plymouth/details.so
+45 -26
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
@@ -13,41 +14,42 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Graphical Boot Animation and Logger</Summary> <Summary>Graphical Boot Animation and Logger</Summary>
<Description>plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot.</Description> <Description>plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot.</Description>
<Archive sha1sum="d0b70929bc47899e03019c3fcd681dd043d7fb8c" type="targz">http://source.pisilinux.org/1.0/plymouth-0.8.8.tar.gz</Archive> <Archive sha1sum="9ca4a9ef778338dc65698d6f854d6dd8f65c0a8b" type="tarbz2">https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.2.tar.bz2</Archive>
<Archive sha1sum="a41645e0fdc9e1f7a39b5bd0d18fbd9d04f8d3c5" type="tarxz" target="plymouth-0.8.8/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.3.tar.xz</Archive> <Archive sha1sum="a41645e0fdc9e1f7a39b5bd0d18fbd9d04f8d3c5" type="tarxz" target="plymouth-0.9.2/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.3.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile permission="0755" target="generate-flist">pisilinux/generate-flist.py</AdditionalFile> <AdditionalFile permission="0755" target="generate-flist">pisilinux/generate-flist.py</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency>kernel-headers</Dependency>
<Dependency>libdrm-devel</Dependency> <Dependency>libdrm-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>pango-devel</Dependency> <Dependency>pango-devel</Dependency>
<Dependency>graphite2-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency> <Dependency>harfbuzz-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>graphite2-devel</Dependency>
<Dependency>gtk2-devel</Dependency> <Dependency>gtk3-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>eudev-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- Pisi Linux patches--> <!-- Pisi Linux patches-->
<!--<Patch level="1">pisilinux/fix-fbdev-path.patch</Patch>--> <!--<Patch level="1">pisilinux/fix-fbdev-path.patch</Patch>-->
<Patch level="1">pisilinux/disable-source-code-tracing.patch</Patch> <!-- <Patch level="1">pisilinux/disable-source-code-tracing.patch</Patch> -->
<Patch level="1">pisilinux/adapt-theme-script.patch</Patch> <Patch level="1">pisilinux/adapt-theme-script.patch</Patch>
<Patch level="1">pisilinux/add-pisilinux-theme.patch</Patch> <Patch level="1">pisilinux/add-pisilinux-theme.patch</Patch>
<!--<Patch level="1">pisilinux/implement-suspend-modes.patch</Patch>--> <!--<Patch level="1">pisilinux/implement-suspend-modes.patch</Patch>-->
<!--MaGeia patches--> <!--MaGeia patches-->
<Patch level="1">mageia/plymouth-restore-suspend.patch</Patch> <Patch level="1">mageia/plymouth-restore-suspend.patch</Patch>
<Patch level="1">fedora/fix-crash.patch</Patch> <!-- <Patch level="1">fedora/fix-crash.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
<Name>plymouth</Name> <Name>plymouth</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev</Dependency>
<Dependency>libdrm</Dependency> <Dependency>libdrm</Dependency>
<Dependency>plymouth-core-libs</Dependency>
<Dependency>mkinitramfs</Dependency> <Dependency>mkinitramfs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/bin</Path> <Path fileType="executable">/bin</Path>
@@ -86,6 +88,9 @@
<Name>plymouth-core-libs</Name> <Name>plymouth-core-libs</Name>
<Summary>Plymouth core libraries</Summary> <Summary>Plymouth core libraries</Summary>
<Description>plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.</Description> <Description>plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.</Description>
<RuntimeDependencies>
<Dependency>eudev</Dependency>
</RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/lib/libply-splash-core.so*</Path> <Path fileType="library">/lib/libply-splash-core.so*</Path>
<Path fileType="library">/lib/libply.so*</Path> <Path fileType="library">/lib/libply.so*</Path>
@@ -97,8 +102,9 @@
<Summary>Plymouth graphics libraries</Summary> <Summary>Plymouth graphics libraries</Summary>
<Description>plymouth-graphics-libs contains the libply-splash-graphics library used by graphics Plymouth splashes.</Description> <Description>plymouth-graphics-libs contains the libply-splash-graphics library used by graphics Plymouth splashes.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">plymouth-core-libs</Dependency> <Dependency>eudev</Dependency>
<Dependency>libpng</Dependency> <Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/libply-splash-graphics.so*</Path> <Path fileType="library">/usr/lib/libply-splash-graphics.so*</Path>
@@ -121,21 +127,20 @@
<Name>plymouth-renderer-x11</Name> <Name>plymouth-renderer-x11</Name>
<Summary>An X11 renderer for debugging purposes</Summary> <Summary>An X11 renderer for debugging purposes</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">plymouth-core-libs</Dependency>
<Dependency>cairo</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>atk</Dependency> <Dependency>atk</Dependency>
<Dependency>cairo</Dependency> <Dependency>gtk3</Dependency>
<Dependency>eudev</Dependency>
<Dependency>glib2</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>gdk-pixbuf</Dependency> <Dependency>gdk-pixbuf</Dependency>
<Dependency>fontconfig</Dependency> <Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/renderers/x11*</Path> <Path fileType="library">/usr/lib/plymouth/renderers/x11*</Path>
</Files> </Files>
</Package> </Package>
<Package> <!--<Package>
<Name>plymouth-utils</Name> <Name>plymouth-utils</Name>
<Summary>Plymouth related utilities</Summary> <Summary>Plymouth related utilities</Summary>
<Description>plymouth-utils contains utilities that integrate with Plymouth including a boot log viewing application.</Description> <Description>plymouth-utils contains utilities that integrate with Plymouth including a boot log viewing application.</Description>
@@ -146,7 +151,7 @@
<Files> <Files>
<Path fileType="executable">/usr/bin/plymouth-log-viewer</Path> <Path fileType="executable">/usr/bin/plymouth-log-viewer</Path>
</Files> </Files>
</Package> </Package>-->
<Package> <Package>
<Name>plymouth-plugin-label</Name> <Name>plymouth-plugin-label</Name>
@@ -154,7 +159,10 @@
<Description>plymouth-plugin-label contains the label control plugin for Plymouth. It provides the ability to render text on graphical boot splashes using pango and cairo.</Description> <Description>plymouth-plugin-label contains the label control plugin for Plymouth. It provides the ability to render text on graphical boot splashes using pango and cairo.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>eudev</Dependency>
<Dependency>glib2</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
@@ -168,8 +176,11 @@
<Summary>Plymouth Fade-Throbber plugin</Summary> <Summary>Plymouth Fade-Throbber plugin</Summary>
<Description>plymouth-plugin-fade-throbber contains the "Fade-In" boot splash plugin for Plymouth. It features a centered image that fades in and out while other images pulsate around during system boot up.</Description> <Description>plymouth-plugin-fade-throbber contains the "Fade-In" boot splash plugin for Plymouth. It features a centered image that fades in and out while other images pulsate around during system boot up.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency>eudev</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/fade-throbber.so</Path> <Path fileType="library">/usr/lib/plymouth/fade-throbber.so</Path>
@@ -205,9 +216,11 @@
<Summary>Plymouth Throbgress plugin</Summary> <Summary>Plymouth Throbgress plugin</Summary>
<Description>plymouth-plugin-throbgress contains the "throbgress" boot splash plugin for Plymouth. It features a centered logo and animated spinner that spins repeatedly while a progress bar advances at the bottom of the screen.</Description> <Description>plymouth-plugin-throbgress contains the "throbgress" boot splash plugin for Plymouth. It features a centered logo and animated spinner that spins repeatedly while a progress bar advances at the bottom of the screen.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-plugin-label</Dependency> <Dependency release="current">plymouth-plugin-label</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/throbgress.so</Path> <Path fileType="library">/usr/lib/plymouth/throbgress.so</Path>
@@ -231,9 +244,11 @@
<Summary>Plymouth space-flares plugin</Summary> <Summary>Plymouth space-flares plugin</Summary>
<Description>plymouth-plugin-space-flares contains the "space-flares" boot splash plugin for Plymouth. It features a corner image with animated flares.</Description> <Description>plymouth-plugin-space-flares contains the "space-flares" boot splash plugin for Plymouth. It features a corner image with animated flares.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-plugin-label</Dependency> <Dependency release="current">plymouth-plugin-label</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/space-flares.so</Path> <Path fileType="library">/usr/lib/plymouth/space-flares.so</Path>
@@ -257,9 +272,11 @@
<Summary>Plymouth Two-Step plugin</Summary> <Summary>Plymouth Two-Step plugin</Summary>
<Description>plymouth-plugin-two-step contains the "two-step" boot splash plugin for Plymouth. It features a two phased boot process that starts with a progressing animation synced to boot time and finishes with a short, fast one-shot animation.</Description> <Description>plymouth-plugin-two-step contains the "two-step" boot splash plugin for Plymouth. It features a two phased boot process that starts with a progressing animation synced to boot time and finishes with a short, fast one-shot animation.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-plugin-label</Dependency> <Dependency release="current">plymouth-plugin-label</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/two-step.so</Path> <Path fileType="library">/usr/lib/plymouth/two-step.so</Path>
@@ -283,8 +300,10 @@
<Summary>Plymouth script plugin</Summary> <Summary>Plymouth script plugin</Summary>
<Description>plymouth-plugin-script contains "script" boot splash plugin for Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes.</Description> <Description>plymouth-plugin-script contains "script" boot splash plugin for Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency>eudev</Dependency>
<Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <Dependency release="current">plymouth-core-libs</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/script.so</Path> <Path fileType="library">/usr/lib/plymouth/script.so</Path>
@@ -317,8 +336,8 @@
<History> <History>
<Update release="1"> <Update release="1">
<Date>2016-04-21</Date> <Date>2016-04-18</Date>
<Version>0.8.8</Version> <Version>0.9.2</Version>
<Comment>First release</Comment> <Comment>First release</Comment>
<Name>Alihan Öztürk</Name> <Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email> <Email>alihan@pisilinux.org</Email>