Accepting request 840078 from home:qzhao:branches:Base:System
- Update to version: 0.9.5+git20200921+20778f2: boot-server: Handle client disconnecting while trigger pending boot-server: Ref count the connections drm: Honor modes selected by the user through video= kernel cmdline argument use resolution of higher res monitor for window size autogoo: use /proc/self/fd/0 instead of /dev/stdin main: Don't bail out of load_settings if "Theme" is missing main: switch log file when switching mode main: fix mode changing before splash is shown two-step: Center message text within labels if labels are centered drm/kms probe speedups drm: Do not unnecessarily get output info twice ply-device-manager: Only consume one udev event at a time two-step: Do not jump to end-animation on halt/reboot if it is disabled two-step: Add UseEndAnimation setting script: add Image.Crop(x, y, width, height) ply-throbber: Do not redraw when we need to stop throbbing on free ply-keymap-icon: Do not draw on free ply-capslock-icon: Do not draw on free script: add missing unref() for system update func themes: Drop UseFirmwareBackground=true from spinner/bgrt firmware-upgrade settings Fix SetSystemUpdateFunction event-loop: Remove ply_trace calls around the disconnect handler ply-terminal-session: Not use grantpt when the system shut down. to avoid system hung up. build-goo: Remove vestigial remnants of old GDM integration code. OBS-URL: https://build.opensuse.org/request/show/840078 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=273
This commit is contained in:
Git OBS Bridge
parent
cb85d4f66e
commit
d38959d6ee
@ -1,30 +1,7 @@
|
|||||||
From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git20200921+20778f2_new/configure.ac
|
||||||
From: Fabian Vogt <fvogt@suse.com>
|
--- plymouth-0.9.5+git20200921+20778f2/configure.ac 2020-10-05 21:49:25.578220035 +0800
|
||||||
Date: Mon, 25 Jan 2016 08:58:03 +0100
|
+++ plymouth-0.9.5+git20200921+20778f2_new/configure.ac 2020-10-05 22:07:57.754186183 +0800
|
||||||
Subject: [PATCH 1/2] Add label-ft plugin
|
@@ -72,6 +72,15 @@
|
||||||
|
|
||||||
This adds a FreeType-based label plugin with minimal dependencies.
|
|
||||||
Is is a replacement for the label plugin, except that it lacks support for
|
|
||||||
Unicode and different fonts families.
|
|
||||||
It's purpose is to be included in the initrd, which isn't easily possible
|
|
||||||
with the label plugin due to it's massive dependency list.
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Vogt <fvogt@suse.com>
|
|
||||||
---
|
|
||||||
configure.ac | 10 +
|
|
||||||
src/libply-splash-graphics/ply-label.c | 5 +
|
|
||||||
src/plugins/controls/Makefile.am | 6 +-
|
|
||||||
src/plugins/controls/label-ft/Makefile.am | 22 ++
|
|
||||||
src/plugins/controls/label-ft/plugin.c | 501 ++++++++++++++++++++++++++++++
|
|
||||||
5 files changed, 543 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 src/plugins/controls/label-ft/Makefile.am
|
|
||||||
create mode 100644 src/plugins/controls/label-ft/plugin.c
|
|
||||||
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-17 19:58:07.106444425 +0200
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -69,6 +69,15 @@ if test x$enable_pango = xyes; then
|
|
||||||
AC_SUBST(PANGO_LIBS)
|
AC_SUBST(PANGO_LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -40,7 +17,7 @@ Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|||||||
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes)
|
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes)
|
||||||
AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes])
|
AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes])
|
||||||
|
|
||||||
@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile
|
@@ -312,6 +321,7 @@
|
||||||
src/plugins/splash/script/Makefile
|
src/plugins/splash/script/Makefile
|
||||||
src/plugins/controls/Makefile
|
src/plugins/controls/Makefile
|
||||||
src/plugins/controls/label/Makefile
|
src/plugins/controls/label/Makefile
|
||||||
@ -48,11 +25,10 @@ Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|||||||
src/Makefile
|
src/Makefile
|
||||||
src/client/ply-boot-client.pc
|
src/client/ply-boot-client.pc
|
||||||
src/client/Makefile
|
src/client/Makefile
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c 2019-06-05 15:56:08.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c 2020-10-05 22:04:02.927286375 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200
|
@@ -96,8 +96,13 @@
|
||||||
@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe
|
|
||||||
|
|
||||||
get_plugin_interface_function_t get_label_plugin_interface;
|
get_plugin_interface_function_t get_label_plugin_interface;
|
||||||
|
|
||||||
@ -62,28 +38,13 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
|
|||||||
+ /* ...and the FreeType based one after that, it is not a complete substitute (yet). */
|
+ /* ...and the FreeType based one after that, it is not a complete substitute (yet). */
|
||||||
+ if (label->module_handle == NULL)
|
+ if (label->module_handle == NULL)
|
||||||
+ label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label-ft.so");
|
+ label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label-ft.so");
|
||||||
+
|
+
|
||||||
if (label->module_handle == NULL)
|
if (label->module_handle == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.am
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.am 1970-01-01 08:00:00.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.am 2020-10-05 21:31:47.608636002 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -1,4 +1,8 @@
|
|
||||||
+SUBDIRS =
|
|
||||||
if ENABLE_PANGO
|
|
||||||
-SUBDIRS = label
|
|
||||||
+SUBDIRS += label
|
|
||||||
+endif
|
|
||||||
+if ENABLE_FREETYPE
|
|
||||||
+SUBDIRS += label-ft
|
|
||||||
endif
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -0,0 +1,22 @@
|
@@ -0,0 +1,22 @@
|
||||||
+AM_CPPFLAGS = -I$(top_srcdir) \
|
+AM_CPPFLAGS = -I$(top_srcdir) \
|
||||||
+ -I$(srcdir)/../../../libply \
|
+ -I$(srcdir)/../../../libply \
|
||||||
@ -107,10 +68,766 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile
|
|||||||
+label_ft_la_SOURCES = $(srcdir)/plugin.c
|
+label_ft_la_SOURCES = $(srcdir)/plugin.c
|
||||||
+
|
+
|
||||||
+MAINTAINERCLEANFILES = Makefile.in
|
+MAINTAINERCLEANFILES = Makefile.in
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.in plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.in
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/Makefile.in 1970-01-01 08:00:00.000000000 +0800
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/Makefile.in 2020-10-05 21:31:54.332697346 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 2018-08-17 19:58:59.703026810 +0200
|
@@ -0,0 +1,753 @@
|
||||||
|
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||||
|
+# @configure_input@
|
||||||
|
+
|
||||||
|
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||||
|
+
|
||||||
|
+# This Makefile.in is free software; the Free Software Foundation
|
||||||
|
+# gives unlimited permission to copy and/or distribute it,
|
||||||
|
+# with or without modifications, as long as this notice is preserved.
|
||||||
|
+
|
||||||
|
+# This program is distributed in the hope that it will be useful,
|
||||||
|
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
|
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
+# PARTICULAR PURPOSE.
|
||||||
|
+
|
||||||
|
+@SET_MAKE@
|
||||||
|
+
|
||||||
|
+VPATH = @srcdir@
|
||||||
|
+am__is_gnu_make = { \
|
||||||
|
+ if test -z '$(MAKELEVEL)'; then \
|
||||||
|
+ false; \
|
||||||
|
+ elif test -n '$(MAKE_HOST)'; then \
|
||||||
|
+ true; \
|
||||||
|
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||||
|
+ true; \
|
||||||
|
+ else \
|
||||||
|
+ false; \
|
||||||
|
+ fi; \
|
||||||
|
+}
|
||||||
|
+am__make_running_with_option = \
|
||||||
|
+ case $${target_option-} in \
|
||||||
|
+ ?) ;; \
|
||||||
|
+ *) echo "am__make_running_with_option: internal error: invalid" \
|
||||||
|
+ "target option '$${target_option-}' specified" >&2; \
|
||||||
|
+ exit 1;; \
|
||||||
|
+ esac; \
|
||||||
|
+ has_opt=no; \
|
||||||
|
+ sane_makeflags=$$MAKEFLAGS; \
|
||||||
|
+ if $(am__is_gnu_make); then \
|
||||||
|
+ sane_makeflags=$$MFLAGS; \
|
||||||
|
+ else \
|
||||||
|
+ case $$MAKEFLAGS in \
|
||||||
|
+ *\\[\ \ ]*) \
|
||||||
|
+ bs=\\; \
|
||||||
|
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||||
|
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||||
|
+ esac; \
|
||||||
|
+ fi; \
|
||||||
|
+ skip_next=no; \
|
||||||
|
+ strip_trailopt () \
|
||||||
|
+ { \
|
||||||
|
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||||
|
+ }; \
|
||||||
|
+ for flg in $$sane_makeflags; do \
|
||||||
|
+ test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||||
|
+ case $$flg in \
|
||||||
|
+ *=*|--*) continue;; \
|
||||||
|
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||||
|
+ -*I?*) strip_trailopt 'I';; \
|
||||||
|
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||||
|
+ -*O?*) strip_trailopt 'O';; \
|
||||||
|
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||||
|
+ -*l?*) strip_trailopt 'l';; \
|
||||||
|
+ -[dEDm]) skip_next=yes;; \
|
||||||
|
+ -[JT]) skip_next=yes;; \
|
||||||
|
+ esac; \
|
||||||
|
+ case $$flg in \
|
||||||
|
+ *$$target_option*) has_opt=yes; break;; \
|
||||||
|
+ esac; \
|
||||||
|
+ done; \
|
||||||
|
+ test $$has_opt = yes
|
||||||
|
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||||
|
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||||
|
+pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
|
+pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
+pkglibdir = $(libdir)/@PACKAGE@
|
||||||
|
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||||
|
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||||
|
+install_sh_DATA = $(install_sh) -c -m 644
|
||||||
|
+install_sh_PROGRAM = $(install_sh) -c
|
||||||
|
+install_sh_SCRIPT = $(install_sh) -c
|
||||||
|
+INSTALL_HEADER = $(INSTALL_DATA)
|
||||||
|
+transform = $(program_transform_name)
|
||||||
|
+NORMAL_INSTALL = :
|
||||||
|
+PRE_INSTALL = :
|
||||||
|
+POST_INSTALL = :
|
||||||
|
+NORMAL_UNINSTALL = :
|
||||||
|
+PRE_UNINSTALL = :
|
||||||
|
+POST_UNINSTALL = :
|
||||||
|
+build_triplet = @build@
|
||||||
|
+host_triplet = @host@
|
||||||
|
+subdir = src/plugins/controls/label-ft
|
||||||
|
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
|
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
|
||||||
|
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
|
||||||
|
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
|
||||||
|
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
|
||||||
|
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||||
|
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
||||||
|
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
|
||||||
|
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
|
||||||
|
+ $(top_srcdir)/configure.ac
|
||||||
|
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
|
+ $(ACLOCAL_M4)
|
||||||
|
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
|
||||||
|
+mkinstalldirs = $(install_sh) -d
|
||||||
|
+CONFIG_HEADER = $(top_builddir)/config.h
|
||||||
|
+CONFIG_CLEAN_FILES =
|
||||||
|
+CONFIG_CLEAN_VPATH_FILES =
|
||||||
|
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||||
|
+am__vpath_adj = case $$p in \
|
||||||
|
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||||
|
+ *) f=$$p;; \
|
||||||
|
+ esac;
|
||||||
|
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
||||||
|
+am__install_max = 40
|
||||||
|
+am__nobase_strip_setup = \
|
||||||
|
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
||||||
|
+am__nobase_strip = \
|
||||||
|
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
||||||
|
+am__nobase_list = $(am__nobase_strip_setup); \
|
||||||
|
+ for p in $$list; do echo "$$p $$p"; done | \
|
||||||
|
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
||||||
|
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
||||||
|
+ if (++n[$$2] == $(am__install_max)) \
|
||||||
|
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
||||||
|
+ END { for (dir in files) print dir, files[dir] }'
|
||||||
|
+am__base_list = \
|
||||||
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
||||||
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||||||
|
+am__uninstall_files_from_dir = { \
|
||||||
|
+ test -z "$$files" \
|
||||||
|
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
||||||
|
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||||
|
+ $(am__cd) "$$dir" && rm -f $$files; }; \
|
||||||
|
+ }
|
||||||
|
+am__installdirs = "$(DESTDIR)$(plugindir)"
|
||||||
|
+LTLIBRARIES = $(plugin_LTLIBRARIES)
|
||||||
|
+am__DEPENDENCIES_1 =
|
||||||
|
+label_ft_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||||
|
+ ../../../libply/libply.la \
|
||||||
|
+ ../../../libply-splash-core/libply-splash-core.la \
|
||||||
|
+ ../../../libply-splash-graphics/libply-splash-graphics.la
|
||||||
|
+am_label_ft_la_OBJECTS = label_ft_la-plugin.lo
|
||||||
|
+label_ft_la_OBJECTS = $(am_label_ft_la_OBJECTS)
|
||||||
|
+AM_V_lt = $(am__v_lt_@AM_V@)
|
||||||
|
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||||
|
+am__v_lt_0 = --silent
|
||||||
|
+am__v_lt_1 =
|
||||||
|
+label_ft_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
|
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(label_ft_la_CFLAGS) \
|
||||||
|
+ $(CFLAGS) $(label_ft_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
+AM_V_P = $(am__v_P_@AM_V@)
|
||||||
|
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||||
|
+am__v_P_0 = false
|
||||||
|
+am__v_P_1 = :
|
||||||
|
+AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||||
|
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||||
|
+am__v_GEN_0 = @echo " GEN " $@;
|
||||||
|
+am__v_GEN_1 =
|
||||||
|
+AM_V_at = $(am__v_at_@AM_V@)
|
||||||
|
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||||
|
+am__v_at_0 = @
|
||||||
|
+am__v_at_1 =
|
||||||
|
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||||
|
+depcomp = $(SHELL) $(top_srcdir)/build-tools/depcomp
|
||||||
|
+am__maybe_remake_depfiles = depfiles
|
||||||
|
+am__depfiles_remade = ./$(DEPDIR)/label_ft_la-plugin.Plo
|
||||||
|
+am__mv = mv -f
|
||||||
|
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||||
|
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
|
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
|
||||||
|
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||||
|
+ $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
+AM_V_CC = $(am__v_CC_@AM_V@)
|
||||||
|
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
|
||||||
|
+am__v_CC_0 = @echo " CC " $@;
|
||||||
|
+am__v_CC_1 =
|
||||||
|
+CCLD = $(CC)
|
||||||
|
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
|
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||||
|
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
|
||||||
|
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||||
|
+am__v_CCLD_0 = @echo " CCLD " $@;
|
||||||
|
+am__v_CCLD_1 =
|
||||||
|
+SOURCES = $(label_ft_la_SOURCES)
|
||||||
|
+DIST_SOURCES = $(label_ft_la_SOURCES)
|
||||||
|
+am__can_run_installinfo = \
|
||||||
|
+ case $$AM_UPDATE_INFO_DIR in \
|
||||||
|
+ n|no|NO) false;; \
|
||||||
|
+ *) (install-info --version) >/dev/null 2>&1;; \
|
||||||
|
+ esac
|
||||||
|
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||||
|
+# Read a list of newline-separated strings from the standard input,
|
||||||
|
+# and print each of them once, without duplicates. Input order is
|
||||||
|
+# *not* preserved.
|
||||||
|
+am__uniquify_input = $(AWK) '\
|
||||||
|
+ BEGIN { nonempty = 0; } \
|
||||||
|
+ { items[$$0] = 1; nonempty = 1; } \
|
||||||
|
+ END { if (nonempty) { for (i in items) print i; }; } \
|
||||||
|
+'
|
||||||
|
+# Make sure the list of sources is unique. This is necessary because,
|
||||||
|
+# e.g., the same source file might be shared among _SOURCES variables
|
||||||
|
+# for different programs/libraries.
|
||||||
|
+am__define_uniq_tagged_files = \
|
||||||
|
+ list='$(am__tagged_files)'; \
|
||||||
|
+ unique=`for i in $$list; do \
|
||||||
|
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
|
+ done | $(am__uniquify_input)`
|
||||||
|
+ETAGS = etags
|
||||||
|
+CTAGS = ctags
|
||||||
|
+am__DIST_COMMON = $(srcdir)/Makefile.in \
|
||||||
|
+ $(top_srcdir)/build-tools/depcomp
|
||||||
|
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
+ACLOCAL = @ACLOCAL@
|
||||||
|
+AMTAR = @AMTAR@
|
||||||
|
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
|
+AR = @AR@
|
||||||
|
+AUTOCONF = @AUTOCONF@
|
||||||
|
+AUTOHEADER = @AUTOHEADER@
|
||||||
|
+AUTOMAKE = @AUTOMAKE@
|
||||||
|
+AWK = @AWK@
|
||||||
|
+CC = @CC@
|
||||||
|
+CCDEPMODE = @CCDEPMODE@
|
||||||
|
+CFLAGS = @CFLAGS@
|
||||||
|
+CPP = @CPP@
|
||||||
|
+CPPFLAGS = @CPPFLAGS@
|
||||||
|
+CURSES_LIBS = @CURSES_LIBS@
|
||||||
|
+CYGPATH_W = @CYGPATH_W@
|
||||||
|
+DBUS_CFLAGS = @DBUS_CFLAGS@
|
||||||
|
+DBUS_LIBS = @DBUS_LIBS@
|
||||||
|
+DEFS = @DEFS@
|
||||||
|
+DEPDIR = @DEPDIR@
|
||||||
|
+DLLTOOL = @DLLTOOL@
|
||||||
|
+DRM_CFLAGS = @DRM_CFLAGS@
|
||||||
|
+DRM_LIBS = @DRM_LIBS@
|
||||||
|
+DSYMUTIL = @DSYMUTIL@
|
||||||
|
+DUMPBIN = @DUMPBIN@
|
||||||
|
+ECHO_C = @ECHO_C@
|
||||||
|
+ECHO_N = @ECHO_N@
|
||||||
|
+ECHO_T = @ECHO_T@
|
||||||
|
+EGREP = @EGREP@
|
||||||
|
+EXEEXT = @EXEEXT@
|
||||||
|
+FGREP = @FGREP@
|
||||||
|
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
|
||||||
|
+FREETYPE_LIBS = @FREETYPE_LIBS@
|
||||||
|
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||||
|
+GMSGFMT = @GMSGFMT@
|
||||||
|
+GMSGFMT_015 = @GMSGFMT_015@
|
||||||
|
+GREP = @GREP@
|
||||||
|
+GTK_CFLAGS = @GTK_CFLAGS@
|
||||||
|
+GTK_LIBS = @GTK_LIBS@
|
||||||
|
+IMAGE_CFLAGS = @IMAGE_CFLAGS@
|
||||||
|
+IMAGE_LIBS = @IMAGE_LIBS@
|
||||||
|
+INSTALL = @INSTALL@
|
||||||
|
+INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
|
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||||
|
+INTLLIBS = @INTLLIBS@
|
||||||
|
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
||||||
|
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
|
||||||
|
+LD = @LD@
|
||||||
|
+LDFLAGS = @LDFLAGS@
|
||||||
|
+LIBICONV = @LIBICONV@
|
||||||
|
+LIBINTL = @LIBINTL@
|
||||||
|
+LIBOBJS = @LIBOBJS@
|
||||||
|
+LIBS = @LIBS@
|
||||||
|
+LIBTOOL = @LIBTOOL@
|
||||||
|
+LIPO = @LIPO@
|
||||||
|
+LN_S = @LN_S@
|
||||||
|
+LTLIBICONV = @LTLIBICONV@
|
||||||
|
+LTLIBINTL = @LTLIBINTL@
|
||||||
|
+LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
+LT_AGE = @LT_AGE@
|
||||||
|
+LT_CURRENT = @LT_CURRENT@
|
||||||
|
+LT_REVISION = @LT_REVISION@
|
||||||
|
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||||
|
+MAINT = @MAINT@
|
||||||
|
+MAKEINFO = @MAKEINFO@
|
||||||
|
+MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||||
|
+MKDIR_P = @MKDIR_P@
|
||||||
|
+MSGFMT = @MSGFMT@
|
||||||
|
+MSGFMT_015 = @MSGFMT_015@
|
||||||
|
+MSGMERGE = @MSGMERGE@
|
||||||
|
+NM = @NM@
|
||||||
|
+NMEDIT = @NMEDIT@
|
||||||
|
+OBJDUMP = @OBJDUMP@
|
||||||
|
+OBJEXT = @OBJEXT@
|
||||||
|
+OTOOL = @OTOOL@
|
||||||
|
+OTOOL64 = @OTOOL64@
|
||||||
|
+PACKAGE = @PACKAGE@
|
||||||
|
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
+PACKAGE_NAME = @PACKAGE_NAME@
|
||||||
|
+PACKAGE_STRING = @PACKAGE_STRING@
|
||||||
|
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||||
|
+PACKAGE_URL = @PACKAGE_URL@
|
||||||
|
+PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
|
+PANGO_CFLAGS = @PANGO_CFLAGS@
|
||||||
|
+PANGO_LIBS = @PANGO_LIBS@
|
||||||
|
+PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
|
+PKG_CONFIG = @PKG_CONFIG@
|
||||||
|
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||||
|
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||||
|
+PLYMOUTH_CFLAGS = @PLYMOUTH_CFLAGS@
|
||||||
|
+PLYMOUTH_CLIENT_DIR = @PLYMOUTH_CLIENT_DIR@
|
||||||
|
+PLYMOUTH_CONF_DIR = @PLYMOUTH_CONF_DIR@
|
||||||
|
+PLYMOUTH_DAEMON_DIR = @PLYMOUTH_DAEMON_DIR@
|
||||||
|
+PLYMOUTH_DATADIR = @PLYMOUTH_DATADIR@
|
||||||
|
+PLYMOUTH_LIBDIR = @PLYMOUTH_LIBDIR@
|
||||||
|
+PLYMOUTH_LIBEXECDIR = @PLYMOUTH_LIBEXECDIR@
|
||||||
|
+PLYMOUTH_LIBS = @PLYMOUTH_LIBS@
|
||||||
|
+PLYMOUTH_LOGO_FILE = @PLYMOUTH_LOGO_FILE@
|
||||||
|
+PLYMOUTH_PLUGIN_PATH = @PLYMOUTH_PLUGIN_PATH@
|
||||||
|
+PLYMOUTH_POLICY_DIR = @PLYMOUTH_POLICY_DIR@
|
||||||
|
+PLYMOUTH_RUNTIME_DIR = @PLYMOUTH_RUNTIME_DIR@
|
||||||
|
+PLYMOUTH_RUNTIME_THEME_PATH = @PLYMOUTH_RUNTIME_THEME_PATH@
|
||||||
|
+PLYMOUTH_THEME_PATH = @PLYMOUTH_THEME_PATH@
|
||||||
|
+POSUB = @POSUB@
|
||||||
|
+RANLIB = @RANLIB@
|
||||||
|
+RELEASE_FILE = @RELEASE_FILE@
|
||||||
|
+SED = @SED@
|
||||||
|
+SET_MAKE = @SET_MAKE@
|
||||||
|
+SHELL = @SHELL@
|
||||||
|
+STRIP = @STRIP@
|
||||||
|
+SYSTEMD_ASK_PASSWORD_AGENT = @SYSTEMD_ASK_PASSWORD_AGENT@
|
||||||
|
+SYSTEMD_UNIT_DIR = @SYSTEMD_UNIT_DIR@
|
||||||
|
+UDEVADM = @UDEVADM@
|
||||||
|
+UDEV_CFLAGS = @UDEV_CFLAGS@
|
||||||
|
+UDEV_LIBS = @UDEV_LIBS@
|
||||||
|
+USE_NLS = @USE_NLS@
|
||||||
|
+VERSION = @VERSION@
|
||||||
|
+XGETTEXT = @XGETTEXT@
|
||||||
|
+XGETTEXT_015 = @XGETTEXT_015@
|
||||||
|
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
|
||||||
|
+XSLTPROC = @XSLTPROC@
|
||||||
|
+abs_builddir = @abs_builddir@
|
||||||
|
+abs_srcdir = @abs_srcdir@
|
||||||
|
+abs_top_builddir = @abs_top_builddir@
|
||||||
|
+abs_top_srcdir = @abs_top_srcdir@
|
||||||
|
+ac_ct_AR = @ac_ct_AR@
|
||||||
|
+ac_ct_CC = @ac_ct_CC@
|
||||||
|
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||||
|
+am__include = @am__include@
|
||||||
|
+am__leading_dot = @am__leading_dot@
|
||||||
|
+am__quote = @am__quote@
|
||||||
|
+am__tar = @am__tar@
|
||||||
|
+am__untar = @am__untar@
|
||||||
|
+background_color = @background_color@
|
||||||
|
+background_end_color = @background_end_color@
|
||||||
|
+background_start_color = @background_start_color@
|
||||||
|
+bindir = @bindir@
|
||||||
|
+build = @build@
|
||||||
|
+build_alias = @build_alias@
|
||||||
|
+build_cpu = @build_cpu@
|
||||||
|
+build_os = @build_os@
|
||||||
|
+build_vendor = @build_vendor@
|
||||||
|
+builddir = @builddir@
|
||||||
|
+datadir = @datadir@
|
||||||
|
+datarootdir = @datarootdir@
|
||||||
|
+docdir = @docdir@
|
||||||
|
+dvidir = @dvidir@
|
||||||
|
+exec_prefix = @exec_prefix@
|
||||||
|
+host = @host@
|
||||||
|
+host_alias = @host_alias@
|
||||||
|
+host_cpu = @host_cpu@
|
||||||
|
+host_os = @host_os@
|
||||||
|
+host_vendor = @host_vendor@
|
||||||
|
+htmldir = @htmldir@
|
||||||
|
+includedir = @includedir@
|
||||||
|
+infodir = @infodir@
|
||||||
|
+install_sh = @install_sh@
|
||||||
|
+libdir = @libdir@
|
||||||
|
+libexecdir = @libexecdir@
|
||||||
|
+localedir = @localedir@
|
||||||
|
+localstatedir = @localstatedir@
|
||||||
|
+logofile = @logofile@
|
||||||
|
+mandir = @mandir@
|
||||||
|
+mkdir_p = @mkdir_p@
|
||||||
|
+oldincludedir = @oldincludedir@
|
||||||
|
+pdfdir = @pdfdir@
|
||||||
|
+plymouthclientdir = @plymouthclientdir@
|
||||||
|
+plymouthdaemondir = @plymouthdaemondir@
|
||||||
|
+plymouthruntimedir = @plymouthruntimedir@
|
||||||
|
+prefix = @prefix@
|
||||||
|
+program_transform_name = @program_transform_name@
|
||||||
|
+psdir = @psdir@
|
||||||
|
+sbindir = @sbindir@
|
||||||
|
+sharedstatedir = @sharedstatedir@
|
||||||
|
+srcdir = @srcdir@
|
||||||
|
+sysconfdir = @sysconfdir@
|
||||||
|
+target_alias = @target_alias@
|
||||||
|
+top_build_prefix = @top_build_prefix@
|
||||||
|
+top_builddir = @top_builddir@
|
||||||
|
+top_srcdir = @top_srcdir@
|
||||||
|
+AM_CPPFLAGS = -I$(top_srcdir) \
|
||||||
|
+ -I$(srcdir)/../../../libply \
|
||||||
|
+ -I$(srcdir)/../../../libply-splash-core \
|
||||||
|
+ -I$(srcdir)/../../../libply-splash-graphics \
|
||||||
|
+ -I$(srcdir)/../../.. \
|
||||||
|
+ -I$(srcdir)/../.. \
|
||||||
|
+ -I$(srcdir)/.. \
|
||||||
|
+ -I$(srcdir)
|
||||||
|
+
|
||||||
|
+plugindir = $(libdir)/plymouth
|
||||||
|
+plugin_LTLIBRARIES = label-ft.la
|
||||||
|
+label_ft_la_CFLAGS = $(PLYMOUTH_CFLAGS) $(FREETYPE_CFLAGS)
|
||||||
|
+label_ft_la_LDFLAGS = -module -avoid-version -export-dynamic
|
||||||
|
+label_ft_la_LIBADD = $(PLYMOUTH_LIBS) $(FREETYPE_LIBS) \
|
||||||
|
+ ../../../libply/libply.la \
|
||||||
|
+ ../../../libply-splash-core/libply-splash-core.la \
|
||||||
|
+ ../../../libply-splash-graphics/libply-splash-graphics.la
|
||||||
|
+
|
||||||
|
+label_ft_la_SOURCES = $(srcdir)/plugin.c
|
||||||
|
+MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
+all: all-am
|
||||||
|
+
|
||||||
|
+.SUFFIXES:
|
||||||
|
+.SUFFIXES: .c .lo .o .obj
|
||||||
|
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
|
+ @for dep in $?; do \
|
||||||
|
+ case '$(am__configure_deps)' in \
|
||||||
|
+ *$$dep*) \
|
||||||
|
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
||||||
|
+ && { if test -f $@; then exit 0; else break; fi; }; \
|
||||||
|
+ exit 1;; \
|
||||||
|
+ esac; \
|
||||||
|
+ done; \
|
||||||
|
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/controls/label-ft/Makefile'; \
|
||||||
|
+ $(am__cd) $(top_srcdir) && \
|
||||||
|
+ $(AUTOMAKE) --gnu src/plugins/controls/label-ft/Makefile
|
||||||
|
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
|
+ @case '$?' in \
|
||||||
|
+ *config.status*) \
|
||||||
|
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||||
|
+ *) \
|
||||||
|
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||||
|
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||||
|
+ esac;
|
||||||
|
+
|
||||||
|
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
|
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
+
|
||||||
|
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
|
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
|
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
+$(am__aclocal_m4_deps):
|
||||||
|
+
|
||||||
|
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
|
||||||
|
+ @$(NORMAL_INSTALL)
|
||||||
|
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
|
||||||
|
+ list2=; for p in $$list; do \
|
||||||
|
+ if test -f $$p; then \
|
||||||
|
+ list2="$$list2 $$p"; \
|
||||||
|
+ else :; fi; \
|
||||||
|
+ done; \
|
||||||
|
+ test -z "$$list2" || { \
|
||||||
|
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
|
||||||
|
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
|
||||||
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
|
||||||
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+uninstall-pluginLTLIBRARIES:
|
||||||
|
+ @$(NORMAL_UNINSTALL)
|
||||||
|
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
|
||||||
|
+ for p in $$list; do \
|
||||||
|
+ $(am__strip_dir) \
|
||||||
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
|
||||||
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
+clean-pluginLTLIBRARIES:
|
||||||
|
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
|
||||||
|
+ @list='$(plugin_LTLIBRARIES)'; \
|
||||||
|
+ locs=`for p in $$list; do echo $$p; done | \
|
||||||
|
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
|
||||||
|
+ sort -u`; \
|
||||||
|
+ test -z "$$locs" || { \
|
||||||
|
+ echo rm -f $${locs}; \
|
||||||
|
+ rm -f $${locs}; \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+label-ft.la: $(label_ft_la_OBJECTS) $(label_ft_la_DEPENDENCIES) $(EXTRA_label_ft_la_DEPENDENCIES)
|
||||||
|
+ $(AM_V_CCLD)$(label_ft_la_LINK) -rpath $(plugindir) $(label_ft_la_OBJECTS) $(label_ft_la_LIBADD) $(LIBS)
|
||||||
|
+
|
||||||
|
+mostlyclean-compile:
|
||||||
|
+ -rm -f *.$(OBJEXT)
|
||||||
|
+
|
||||||
|
+distclean-compile:
|
||||||
|
+ -rm -f *.tab.c
|
||||||
|
+
|
||||||
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label_ft_la-plugin.Plo@am__quote@ # am--include-marker
|
||||||
|
+
|
||||||
|
+$(am__depfiles_remade):
|
||||||
|
+ @$(MKDIR_P) $(@D)
|
||||||
|
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||||
|
+
|
||||||
|
+am--depfiles: $(am__depfiles_remade)
|
||||||
|
+
|
||||||
|
+.c.o:
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
|
||||||
|
+
|
||||||
|
+.c.obj:
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
||||||
|
+
|
||||||
|
+.c.lo:
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
||||||
|
+
|
||||||
|
+label_ft_la-plugin.lo: $(srcdir)/plugin.c
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(label_ft_la_CFLAGS) $(CFLAGS) -MT label_ft_la-plugin.lo -MD -MP -MF $(DEPDIR)/label_ft_la-plugin.Tpo -c -o label_ft_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c
|
||||||
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/label_ft_la-plugin.Tpo $(DEPDIR)/label_ft_la-plugin.Plo
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/plugin.c' object='label_ft_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
|
||||||
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(label_ft_la_CFLAGS) $(CFLAGS) -c -o label_ft_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c
|
||||||
|
+
|
||||||
|
+mostlyclean-libtool:
|
||||||
|
+ -rm -f *.lo
|
||||||
|
+
|
||||||
|
+clean-libtool:
|
||||||
|
+ -rm -rf .libs _libs
|
||||||
|
+
|
||||||
|
+ID: $(am__tagged_files)
|
||||||
|
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
|
||||||
|
+tags: tags-am
|
||||||
|
+TAGS: tags
|
||||||
|
+
|
||||||
|
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||||
|
+ set x; \
|
||||||
|
+ here=`pwd`; \
|
||||||
|
+ $(am__define_uniq_tagged_files); \
|
||||||
|
+ shift; \
|
||||||
|
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||||
|
+ test -n "$$unique" || unique=$$empty_fix; \
|
||||||
|
+ if test $$# -gt 0; then \
|
||||||
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
+ "$$@" $$unique; \
|
||||||
|
+ else \
|
||||||
|
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
+ $$unique; \
|
||||||
|
+ fi; \
|
||||||
|
+ fi
|
||||||
|
+ctags: ctags-am
|
||||||
|
+
|
||||||
|
+CTAGS: ctags
|
||||||
|
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||||
|
+ $(am__define_uniq_tagged_files); \
|
||||||
|
+ test -z "$(CTAGS_ARGS)$$unique" \
|
||||||
|
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||||
|
+ $$unique
|
||||||
|
+
|
||||||
|
+GTAGS:
|
||||||
|
+ here=`$(am__cd) $(top_builddir) && pwd` \
|
||||||
|
+ && $(am__cd) $(top_srcdir) \
|
||||||
|
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
||||||
|
+cscopelist: cscopelist-am
|
||||||
|
+
|
||||||
|
+cscopelist-am: $(am__tagged_files)
|
||||||
|
+ list='$(am__tagged_files)'; \
|
||||||
|
+ case "$(srcdir)" in \
|
||||||
|
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
||||||
|
+ *) sdir=$(subdir)/$(srcdir) ;; \
|
||||||
|
+ esac; \
|
||||||
|
+ for i in $$list; do \
|
||||||
|
+ if test -f "$$i"; then \
|
||||||
|
+ echo "$(subdir)/$$i"; \
|
||||||
|
+ else \
|
||||||
|
+ echo "$$sdir/$$i"; \
|
||||||
|
+ fi; \
|
||||||
|
+ done >> $(top_builddir)/cscope.files
|
||||||
|
+
|
||||||
|
+distclean-tags:
|
||||||
|
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||||
|
+
|
||||||
|
+distdir: $(BUILT_SOURCES)
|
||||||
|
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||||
|
+
|
||||||
|
+distdir-am: $(DISTFILES)
|
||||||
|
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
+ list='$(DISTFILES)'; \
|
||||||
|
+ dist_files=`for file in $$list; do echo $$file; done | \
|
||||||
|
+ sed -e "s|^$$srcdirstrip/||;t" \
|
||||||
|
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
|
||||||
|
+ case $$dist_files in \
|
||||||
|
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
|
||||||
|
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
|
||||||
|
+ sort -u` ;; \
|
||||||
|
+ esac; \
|
||||||
|
+ for file in $$dist_files; do \
|
||||||
|
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||||
|
+ if test -d $$d/$$file; then \
|
||||||
|
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||||
|
+ if test -d "$(distdir)/$$file"; then \
|
||||||
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
+ fi; \
|
||||||
|
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||||
|
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
+ fi; \
|
||||||
|
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
+ else \
|
||||||
|
+ test -f "$(distdir)/$$file" \
|
||||||
|
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
||||||
|
+ || exit 1; \
|
||||||
|
+ fi; \
|
||||||
|
+ done
|
||||||
|
+check-am: all-am
|
||||||
|
+check: check-am
|
||||||
|
+all-am: Makefile $(LTLIBRARIES)
|
||||||
|
+installdirs:
|
||||||
|
+ for dir in "$(DESTDIR)$(plugindir)"; do \
|
||||||
|
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||||
|
+ done
|
||||||
|
+install: install-am
|
||||||
|
+install-exec: install-exec-am
|
||||||
|
+install-data: install-data-am
|
||||||
|
+uninstall: uninstall-am
|
||||||
|
+
|
||||||
|
+install-am: all-am
|
||||||
|
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||||
|
+
|
||||||
|
+installcheck: installcheck-am
|
||||||
|
+install-strip:
|
||||||
|
+ if test -z '$(STRIP)'; then \
|
||||||
|
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
+ install; \
|
||||||
|
+ else \
|
||||||
|
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||||
|
+ fi
|
||||||
|
+mostlyclean-generic:
|
||||||
|
+
|
||||||
|
+clean-generic:
|
||||||
|
+
|
||||||
|
+distclean-generic:
|
||||||
|
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||||
|
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
||||||
|
+
|
||||||
|
+maintainer-clean-generic:
|
||||||
|
+ @echo "This command is intended for maintainers to use"
|
||||||
|
+ @echo "it deletes files that may require special tools to rebuild."
|
||||||
|
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||||
|
+clean: clean-am
|
||||||
|
+
|
||||||
|
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
|
||||||
|
+ mostlyclean-am
|
||||||
|
+
|
||||||
|
+distclean: distclean-am
|
||||||
|
+ -rm -f ./$(DEPDIR)/label_ft_la-plugin.Plo
|
||||||
|
+ -rm -f Makefile
|
||||||
|
+distclean-am: clean-am distclean-compile distclean-generic \
|
||||||
|
+ distclean-tags
|
||||||
|
+
|
||||||
|
+dvi: dvi-am
|
||||||
|
+
|
||||||
|
+dvi-am:
|
||||||
|
+
|
||||||
|
+html: html-am
|
||||||
|
+
|
||||||
|
+html-am:
|
||||||
|
+
|
||||||
|
+info: info-am
|
||||||
|
+
|
||||||
|
+info-am:
|
||||||
|
+
|
||||||
|
+install-data-am: install-pluginLTLIBRARIES
|
||||||
|
+
|
||||||
|
+install-dvi: install-dvi-am
|
||||||
|
+
|
||||||
|
+install-dvi-am:
|
||||||
|
+
|
||||||
|
+install-exec-am:
|
||||||
|
+
|
||||||
|
+install-html: install-html-am
|
||||||
|
+
|
||||||
|
+install-html-am:
|
||||||
|
+
|
||||||
|
+install-info: install-info-am
|
||||||
|
+
|
||||||
|
+install-info-am:
|
||||||
|
+
|
||||||
|
+install-man:
|
||||||
|
+
|
||||||
|
+install-pdf: install-pdf-am
|
||||||
|
+
|
||||||
|
+install-pdf-am:
|
||||||
|
+
|
||||||
|
+install-ps: install-ps-am
|
||||||
|
+
|
||||||
|
+install-ps-am:
|
||||||
|
+
|
||||||
|
+installcheck-am:
|
||||||
|
+
|
||||||
|
+maintainer-clean: maintainer-clean-am
|
||||||
|
+ -rm -f ./$(DEPDIR)/label_ft_la-plugin.Plo
|
||||||
|
+ -rm -f Makefile
|
||||||
|
+maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||||
|
+
|
||||||
|
+mostlyclean: mostlyclean-am
|
||||||
|
+
|
||||||
|
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
|
||||||
|
+ mostlyclean-libtool
|
||||||
|
+
|
||||||
|
+pdf: pdf-am
|
||||||
|
+
|
||||||
|
+pdf-am:
|
||||||
|
+
|
||||||
|
+ps: ps-am
|
||||||
|
+
|
||||||
|
+ps-am:
|
||||||
|
+
|
||||||
|
+uninstall-am: uninstall-pluginLTLIBRARIES
|
||||||
|
+
|
||||||
|
+.MAKE: install-am install-strip
|
||||||
|
+
|
||||||
|
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||||
|
+ clean-generic clean-libtool clean-pluginLTLIBRARIES \
|
||||||
|
+ cscopelist-am ctags ctags-am distclean distclean-compile \
|
||||||
|
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
|
||||||
|
+ dvi-am html html-am info info-am install install-am \
|
||||||
|
+ install-data install-data-am install-dvi install-dvi-am \
|
||||||
|
+ install-exec install-exec-am install-html install-html-am \
|
||||||
|
+ install-info install-info-am install-man install-pdf \
|
||||||
|
+ install-pdf-am install-pluginLTLIBRARIES install-ps \
|
||||||
|
+ install-ps-am install-strip installcheck installcheck-am \
|
||||||
|
+ installdirs maintainer-clean maintainer-clean-generic \
|
||||||
|
+ mostlyclean mostlyclean-compile mostlyclean-generic \
|
||||||
|
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||||
|
+ uninstall-am uninstall-pluginLTLIBRARIES
|
||||||
|
+
|
||||||
|
+.PRECIOUS: Makefile
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
+# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
+.NOEXPORT:
|
||||||
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/plugin.c plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/plugin.c
|
||||||
|
--- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/label-ft/plugin.c 1970-01-01 08:00:00.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/label-ft/plugin.c 2020-10-05 21:31:47.608636002 +0800
|
||||||
@@ -0,0 +1,507 @@
|
@@ -0,0 +1,507 @@
|
||||||
+/* ply-label.c - label control
|
+/* ply-label.c - label control
|
||||||
+ *
|
+ *
|
||||||
@ -619,3 +1336,16 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
|
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
|
||||||
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/Makefile.am
|
||||||
|
--- plymouth-0.9.5+git20200921+20778f2/src/plugins/controls/Makefile.am 2018-12-27 01:23:09.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/plugins/controls/Makefile.am 2020-10-05 21:59:39.941168232 +0800
|
||||||
|
@@ -1,4 +1,8 @@
|
||||||
|
+SUBDIRS =
|
||||||
|
if ENABLE_PANGO
|
||||||
|
-SUBDIRS = label
|
||||||
|
+SUBDIRS += label
|
||||||
|
+endif
|
||||||
|
+if ENABLE_FREETYPE
|
||||||
|
+SUBDIRS += label-ft
|
||||||
|
endif
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in
|
||||||
--- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800
|
--- plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in 2020-10-05 23:05:13.055563514 +0800
|
||||||
+++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800
|
+++ plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in 2020-10-05 23:08:35.098420945 +0800
|
||||||
@@ -433,6 +433,15 @@
|
@@ -461,6 +461,15 @@
|
||||||
inst_recur "${PLYMOUTH_IMAGE_DIR}"
|
inst_recur "${PLYMOUTH_IMAGE_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -14,6 +14,6 @@ diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.i
|
|||||||
+ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf
|
+ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf
|
||||||
+fi
|
+fi
|
||||||
+
|
+
|
||||||
if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
|
if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
|
||||||
cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
|
cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,22 +1,7 @@
|
|||||||
From 99ee02fe20ae53323fe5756416e6a7d96a3baf8a Mon Sep 17 00:00:00 2001
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c
|
||||||
From: Fabian Vogt <fvogt@suse.com>
|
--- plymouth-0.9.5+git20200921+20778f2/src/libply-splash-graphics/ply-label.c 2020-10-05 23:11:23.011964608 +0800
|
||||||
Date: Thu, 21 Jan 2016 10:39:21 +0100
|
+++ plymouth-0.9.5+git20200921+20778f2_new/src/libply-splash-graphics/ply-label.c 2020-10-05 23:17:39.139340680 +0800
|
||||||
Subject: [PATCH 1/3] ply-label: Don't crash if label plugin fails
|
@@ -130,6 +130,15 @@
|
||||||
|
|
||||||
The label plugin's create_control function can return NULL if allocation
|
|
||||||
failed, for example, but ply-label.c ignores that and uses the NULL control,
|
|
||||||
causing various SEGVs.
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Vogt <fvogt@suse.com>
|
|
||||||
---
|
|
||||||
src/libply-splash-graphics/ply-label.c | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
|
|
||||||
===================================================================
|
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:59:33.203397962 +0200
|
|
||||||
@@ -130,6 +130,15 @@ ply_label_load_plugin (ply_label_t *labe
|
|
||||||
|
|
||||||
label->control = label->plugin_interface->create_control ();
|
label->control = label->plugin_interface->create_control ();
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09
|
|
||||||
size 5774076
|
|
||||||
3
plymouth-0.9.5+git20200921+20778f2.tar.xz
Normal file
3
plymouth-0.9.5+git20200921+20778f2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:94992774a910191206f44dda3c014c5c2908e24c0d3558a6d9ed4e8aa95c74bd
|
||||||
|
size 6750692
|
||||||
@ -1,13 +1,12 @@
|
|||||||
Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git20200921+20778f2_new/configure.ac
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20200921+20778f2/configure.ac 2020-07-18 15:27:12.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20200921+20778f2_new/configure.ac 2020-10-02 21:41:46.998308963 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:07.106444425 +0200
|
@@ -154,7 +154,7 @@
|
||||||
@@ -150,7 +150,7 @@ if test x$with_system_root_install = xye
|
|
||||||
else
|
|
||||||
plymouthclientdir=$bindir
|
plymouthclientdir=$bindir
|
||||||
plymouthdaemondir=$sbindir
|
plymouthdaemondir=$sbindir
|
||||||
- plymouthruntimedir=$localstatedir/run/plymouth
|
if (test -z "${plymouthruntimedir}"); then
|
||||||
+ plymouthruntimedir=/run/plymouth
|
- plymouthruntimedir=$localstatedir/run/plymouth
|
||||||
|
+ plymouthruntimedir=/run/plymouth
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST(plymouthclientdir)
|
AC_SUBST(plymouthclientdir)
|
||||||
AC_SUBST(plymouthdaemondir)
|
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in
|
diff -Nura plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20200921+20778f2/scripts/plymouth-populate-initrd.in 2020-04-11 14:22:34.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20200921+20778f2_new/scripts/plymouth-populate-initrd.in 2020-10-02 21:34:54.588764052 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in 2018-08-17 19:57:27.334004329 +0200
|
@@ -414,8 +414,8 @@
|
||||||
@@ -386,8 +386,8 @@ done
|
ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH"
|
||||||
[ -z "$INITRDDIR" ] && usage error
|
|
||||||
|
|
||||||
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
|
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
|
||||||
-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
|
-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
|
||||||
|
|||||||
@ -1,3 +1,32 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
|
- Update to version: 0.9.5+git20200921+20778f2:
|
||||||
|
boot-server: Handle client disconnecting while trigger pending
|
||||||
|
boot-server: Ref count the connections
|
||||||
|
drm: Honor modes selected by the user through video= kernel cmdline argument
|
||||||
|
use resolution of higher res monitor for window size
|
||||||
|
autogoo: use /proc/self/fd/0 instead of /dev/stdin
|
||||||
|
main: Don't bail out of load_settings if "Theme" is missing
|
||||||
|
main: switch log file when switching mode
|
||||||
|
main: fix mode changing before splash is shown
|
||||||
|
two-step: Center message text within labels if labels are centered
|
||||||
|
drm/kms probe speedups
|
||||||
|
drm: Do not unnecessarily get output info twice
|
||||||
|
ply-device-manager: Only consume one udev event at a time
|
||||||
|
two-step: Do not jump to end-animation on halt/reboot if it is disabled
|
||||||
|
two-step: Add UseEndAnimation setting
|
||||||
|
script: add Image.Crop(x, y, width, height)
|
||||||
|
ply-throbber: Do not redraw when we need to stop throbbing on free
|
||||||
|
ply-keymap-icon: Do not draw on free
|
||||||
|
ply-capslock-icon: Do not draw on free
|
||||||
|
script: add missing unref() for system update func
|
||||||
|
themes: Drop UseFirmwareBackground=true from spinner/bgrt firmware-upgrade settings
|
||||||
|
Fix SetSystemUpdateFunction
|
||||||
|
event-loop: Remove ply_trace calls around the disconnect handler
|
||||||
|
ply-terminal-session: Not use grantpt when the system shut down. to avoid sytem hung up.
|
||||||
|
build-goo: Remove vestigial remnants of old GDM integration code.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 28 16:32:43 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Mon Sep 28 16:32:43 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
||||||
|
|
||||||
Name: plymouth
|
Name: plymouth
|
||||||
Version: 0.9.5+git20190908+3abfab2
|
Version: 0.9.5+git20200921+20778f2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Graphical Boot Animation and Logger
|
Summary: Graphical Boot Animation and Logger
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -44,14 +44,14 @@ Patch2: plymouth-correct-runtime-dir.patch
|
|||||||
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
||||||
Patch3: plymouth-manpages.patch
|
Patch3: plymouth-manpages.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
|
# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
|
||||||
Patch4: plymouth-avoid-umount-hanging-shutdown.patch
|
# Patch4: plymouth-avoid-umount-hanging-shutdown.patch
|
||||||
# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap.
|
# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap.
|
||||||
Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
|
Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
|
||||||
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1000: 0001-Add-label-ft-plugin.patch
|
Patch1000: 0001-Add-label-ft-plugin.patch
|
||||||
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
||||||
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
#uo PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1002: 0003-fix_null_deref.patch
|
Patch1002: 0003-fix_null_deref.patch
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
@ -85,7 +85,6 @@ Requires: systemd >= 186
|
|||||||
Requires(post): coreutils
|
Requires(post): coreutils
|
||||||
Requires(post): plymouth-scripts = %{version}
|
Requires(post): plymouth-scripts = %{version}
|
||||||
Requires(postun): coreutils
|
Requires(postun): coreutils
|
||||||
Recommends: plymouth-plugin-label-ft
|
|
||||||
Suggests: plymouth-plugin-label
|
Suggests: plymouth-plugin-label
|
||||||
Provides: bootsplash = 3.5
|
Provides: bootsplash = 3.5
|
||||||
Obsoletes: bootsplash < 3.5
|
Obsoletes: bootsplash < 3.5
|
||||||
@ -223,20 +222,6 @@ This package contains the "Fade-In" boot splash plugin for
|
|||||||
Plymouth. It features a centered image that fades in and out
|
Plymouth. It features a centered image that fades in and out
|
||||||
while other images pulsate around during system boot up.
|
while other images pulsate around during system boot up.
|
||||||
|
|
||||||
%package plugin-throbgress
|
|
||||||
Summary: Plymouth "Throbgress" plugin
|
|
||||||
Group: System/Base
|
|
||||||
Requires: %{name}-plugin-label = %{version}
|
|
||||||
Requires: libply%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
|
||||||
|
|
||||||
%description plugin-throbgress
|
|
||||||
This package 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.
|
|
||||||
|
|
||||||
%package plugin-space-flares
|
%package plugin-space-flares
|
||||||
Summary: Plymouth "space-flares" plugin
|
Summary: Plymouth "space-flares" plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
@ -305,7 +290,6 @@ while stars twinkle around the logo during system boot up.
|
|||||||
%package theme-spinfinity
|
%package theme-spinfinity
|
||||||
Summary: Plymouth "Spinfinity" theme
|
Summary: Plymouth "Spinfinity" theme
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: %{name}-plugin-throbgress = %{version}
|
|
||||||
Requires(post): %{name}-scripts
|
Requires(post): %{name}-scripts
|
||||||
Requires(pre): %{name}
|
Requires(pre): %{name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -532,6 +516,7 @@ fi
|
|||||||
%dir %{_libdir}/plymouth/renderers
|
%dir %{_libdir}/plymouth/renderers
|
||||||
%dir %{_sysconfdir}/plymouth
|
%dir %{_sysconfdir}/plymouth
|
||||||
%ghost %{_sysconfdir}/plymouth/plymouthd.conf
|
%ghost %{_sysconfdir}/plymouth/plymouthd.conf
|
||||||
|
/etc/logrotate.d/bootlog
|
||||||
%{plymouthdaemon_execdir}/plymouthd
|
%{plymouthdaemon_execdir}/plymouthd
|
||||||
%{plymouthclient_execdir}/plymouth
|
%{plymouthclient_execdir}/plymouth
|
||||||
/bin/plymouth
|
/bin/plymouth
|
||||||
@ -607,15 +592,17 @@ fi
|
|||||||
%{_datadir}/plymouth/themes/fade-in/star.png
|
%{_datadir}/plymouth/themes/fade-in/star.png
|
||||||
%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth
|
%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth
|
||||||
|
|
||||||
%files plugin-throbgress
|
|
||||||
%{_libdir}/plymouth/throbgress.so
|
|
||||||
|
|
||||||
%files theme-spinfinity
|
%files theme-spinfinity
|
||||||
%dir %{_datadir}/plymouth/themes/spinfinity
|
%dir %{_datadir}/plymouth/themes/spinfinity
|
||||||
%{_datadir}/plymouth/themes/spinfinity/box.png
|
%{_datadir}/plymouth/themes/spinfinity/box.png
|
||||||
%{_datadir}/plymouth/themes/spinfinity/bullet.png
|
%{_datadir}/plymouth/themes/spinfinity/bullet.png
|
||||||
%{_datadir}/plymouth/themes/spinfinity/entry.png
|
%{_datadir}/plymouth/themes/spinfinity/entry.png
|
||||||
%{_datadir}/plymouth/themes/spinfinity/lock.png
|
%{_datadir}/plymouth/themes/spinfinity/lock.png
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/capslock.png
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/header-image.png
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/keyboard.png
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/keymap-render.png
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/animation-0001.png
|
||||||
%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png
|
%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png
|
||||||
%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth
|
%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user