jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

plymouth: update to a git snapshot from master, merge useless subpkgs.

Browse source
This commit is contained in:
Juan RP 2012-01-11 18:29:46 +01:00
parent 12a8519580
commit bd1f56fa66
16 changed files with 33 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/plymouth/files/plymouth.hook
View file

@ -69,8 +69,8 @@ case "$(basename ${THEME} .plymouth)" in
;;
*)
# XBPS logo
cp /usr/share/plymouth/xbps-logo.png "${DESTDIR}/usr/share/plymouth"
# Void splash image
cp /usr/share/void-artwork/splash.png "${DESTDIR}/usr/share/plymouth"
# copy files for font rendering
mkdir -p "${DESTDIR}/usr/share/fonts/TTF"

4
srcpkgs/plymouth/files/plymouth.init-premount
View file

@ -33,8 +33,6 @@ if [ "${SPLASH}" = "true" ]; then
modprobe i8042
modprobe atkbd
mkdir -p /var/lib/plymouth
mkdir -p /run/plymouth
/sbin/plymouthd --mode=boot --attach-to-session --pid-file=/run/plymouth/pid
/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
/bin/plymouth --show-splash
fi

BIN
srcpkgs/plymouth/files/xbps-logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

2
srcpkgs/plymouth/libplymouth.template
View file

@ -1,13 +1,11 @@
# Template file for 'libplymouth'.
#
revision=1
short_desc="${short_desc} - shared libraries"
long_desc="
${long_desc}
This package includes the shared libraries provided by plymouth."
do_install()
{
vmove "lib/*.so*" lib

5
srcpkgs/plymouth/patches/02-set-default-framebuffer-device-to-dev-fb0.patch
View file

@ -3,9 +3,8 @@ Description:
Set default framebuffer device to /dev/fb0 instead of /dev/fb which doesn't
exist by default (Closes: #573724).
diff -Naurp plymouth.orig//src/plugins/renderers/frame-buffer/plugin.c plymouth/src/plugins/renderers/frame-buffer/plugin.c
--- plymouth.orig//src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:22:53.066407620 +0100
+++ plymouth/src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:23:21.861484753 +0100
--- src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:22:53.066407620 +0100
+++ src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:23:21.861484753 +0100
@@ -56,7 +56,7 @@
#include "ply-renderer-plugin.h"

23
srcpkgs/plymouth/patches/03-awk.patch
View file

@ -1,23 +0,0 @@
Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
Description: Hack to fix awk call.
diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts/plymouth-set-default-theme.in
--- plymouth.orig/scripts/plymouth-set-default-theme.in 2010-03-27 16:29:57.000000000 +0100
+++ plymouth/scripts/plymouth-set-default-theme.in 2010-03-28 22:58:10.000000000 +0200
@@ -45,15 +45,7 @@ function list_themes ()
function read_theme_name_from_file ()
{
echo $(grep -v '^#' $1 2> /dev/null |
- awk '
- BEGIN {
- RS="[[][[:blank:]]*[^[:space:]]+[:blank:]*[]\n]";
- FS="[=[:space:]]+";
- OFS="";
- ORS=""
- }
- $1 ~/Theme/ { print $2 }
- ')
+ awk -F= '/Theme=/ { print $2 }')
}
function get_default_theme ()

128
srcpkgs/plymouth/patches/04-stderr.patch
View file

@ -1,128 +0,0 @@
Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
Description:
Use fd for stdout instead of device, since the latter may not always exist,
e.g. in chroots (Closes: #581649).
diff -Naurp plymouth.orig/scripts/plymouth-populate-initrd.in plymouth/scripts/plymouth-populate-initrd.in
--- plymouth.orig/scripts/plymouth-populate-initrd.in 2010-05-14 19:22:15.000000000 +0200
+++ plymouth/scripts/plymouth-populate-initrd.in 2010-05-14 19:23:25.000000000 +0200
@@ -38,7 +38,7 @@ function usage() {
local output="/dev/stdout"
local rc=0
if [ "$1" == "error" ]; then
- output="/dev/stderr"
+ output=">&2"
rc=1
fi
@@ -84,14 +84,14 @@ inst ${PLYMOUTH_POLICYDIR}/plymouthd.def
inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR
if [ -z "$PLYMOUTH_THEME_NAME" ]; then
- echo "No default plymouth plugin is set" > /dev/stderr
+ echo "No default plymouth plugin is set" >&2
exit 1
fi
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
- echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
+ echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2
exit 1
fi
diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts/plymouth-set-default-theme.in
--- plymouth.orig/scripts/plymouth-set-default-theme.in 2010-05-14 19:22:15.000000000 +0200
+++ plymouth/scripts/plymouth-set-default-theme.in 2010-05-14 19:23:04.000000000 +0200
@@ -79,14 +79,14 @@ while [ $# -gt 0 ]; do
-l|--list)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify --list or a theme name, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --list or a theme name, not both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_RESET -ne 0 ]; then
- echo "You can only specify --reset or --list, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or --list, not both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -99,14 +99,14 @@ while [ $# -gt 0 ]; do
-r|--reset|default)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify --reset or a theme name, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or a theme name, not both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_LIST -ne 0 ]; then
- echo "You can only specify --reset or --list, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or --list, not both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -119,20 +119,20 @@ while [ $# -gt 0 ]; do
*)
if [ -n "$THEME_NAME" ]; then
- echo "You can only specify one theme at a time" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify one theme at a time" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_RESET -ne 0 ]; then
- echo "You can only specify --reset or a theme name, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --reset or a theme name, not both" >&2
+ echo $(usage) >&2
exit 1
fi
if [ $DO_LIST -ne 0 ]; then
- echo "You can only specify --list or a theme name, not both" > /dev/stderr
- echo $(usage) > /dev/stderr
+ echo "You can only specify --list or a theme name, not both" >&2
+ echo $(usage) >&2
exit 1
fi
@@ -158,7 +158,7 @@ if [ $DO_RESET -eq 0 ] && [ $DO_INITRD_R
fi
if [ `id -u` -ne 0 ]; then
- echo "This program must be run as root" > /dev/stderr
+ echo "This program must be run as root" >&2
exit 1
fi
@@ -169,14 +169,14 @@ if [ $DO_RESET -ne 0 ]; then
fi
if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
- echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" > /dev/stderr
+ echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" >&2
exit 1
fi
MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
if [ ! -e ${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so ]; then
- echo "${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" > /dev/stderr
+ echo "${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" >&2
exit 1
fi

21
srcpkgs/plymouth/patches/05-default-theme.patch
View file

@ -1,21 +0,0 @@
Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
Description: Ship configuration file with default theme set (Closes: #594999).
diff -Naurp plymouth.orig/src/plymouthd.conf plymouth/src/plymouthd.conf
--- plymouth.orig/src/plymouthd.conf 2010-06-04 18:55:14.000000000 +0200
+++ plymouth/src/plymouthd.conf 2010-09-10 21:35:55.945741477 +0200
@@ -1,3 +1,3 @@
# Administrator customizations go in this file
-#[Daemon]
-#Theme=fade-in
+[Daemon]
+Theme=text
diff -Naurp plymouth.orig/src/plymouthd.defaults plymouth/src/plymouthd.defaults
--- plymouth.orig/src/plymouthd.defaults 2010-06-04 18:55:14.000000000 +0200
+++ plymouth/src/plymouthd.defaults 2010-09-10 21:35:05.466754551 +0200
@@ -1,4 +1,4 @@
# Distribution defaults. Changes to this file will get overwritten during
# upgrades.
[Daemon]
-Theme=fade-in
+Theme=text

18
srcpkgs/plymouth/patches/06-tty.patch
View file

@ -1,18 +0,0 @@
Author: Julien Cristau <jcristau@debian.org>
Description:
Cherry-pick "[terminal] don't stomp over original tty lock settings". Prevents
setting tty1 in 'echo' mode after boot (Closes: 595178).
diff -Naurp plymouth.orig/src/libply-splash-core/ply-terminal.c plymouth/src/libply-splash-core/ply-terminal.c
--- plymouth.orig/src/libply-splash-core/ply-terminal.c 2010-09-14 21:16:57.185256706 +0200
+++ plymouth/src/libply-splash-core/ply-terminal.c 2010-10-13 17:58:48.752970212 +0200
@@ -188,7 +188,8 @@ ply_terminal_set_unbuffered_input (ply_t
if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
return false;
- if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
+ if (!terminal->original_locked_term_attributes_saved &&
+ ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
{
terminal->original_locked_term_attributes = locked_term_attributes;
terminal->original_locked_term_attributes_saved = true;

15
srcpkgs/plymouth/patches/07-return-code.patch
View file

@ -1,15 +0,0 @@
Author: Michael Prokop <mika@debian.org>
Description: Fixing wrong return code of plymouth-set-default-theme (Closes: #605018).
diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts/plymouth-set-default-theme.in
--- plymouth.orig/scripts/plymouth-set-default-theme.in 2011-09-08 15:03:24.212396867 +0200
+++ plymouth/scripts/plymouth-set-default-theme.in 2011-09-08 15:04:41.011888522 +0200
@@ -179,5 +179,7 @@ grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFD
sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf
-[ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
+if [ $DO_INITRD_REBUILD -ne 0 ] ; then
+ (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
+fi

10
srcpkgs/plymouth/plymouth-drm.rshlibs
View file

@ -1,10 +0,0 @@
libdrm_intel.so.1
libdrm.so.2
libdrm_radeon.so.1
libdrm_nouveau.so.1
libply-splash-core.so.2
libply.so.2
libm.so.6
librt.so.1
libdl.so.2
libc.so.6

14
srcpkgs/plymouth/plymouth-drm.template
View file

@ -1,14 +0,0 @@
# Template file for 'plymouth-drm'.
#
revision=1
short_desc="${short_desc} - DRM renderer"
long_desc="${long_desc}
This package contains the DRM renderer."
Add_dependency run plymouth
do_install()
{
vmove usr/lib/plymouth/renderers/drm.so usr/lib/plymouth/renderers
}

22
srcpkgs/plymouth/plymouth-x11.rshlibs
View file

@ -1,22 +0,0 @@
libgtk-x11-2.0.so.0
libgdk-x11-2.0.so.0
libpango-1.0.so.0
libgobject-2.0.so.0
libglib-2.0.so.0
libpthread.so.0
libc.so.6
libatk-1.0.so.0
libgio-2.0.so.0
libpangoft2-1.0.so.0
libpangocairo-1.0.so.0
libgdk_pixbuf-2.0.so.0
libcairo.so.2
libfreetype.so.6
libfontconfig.so.1
libgmodule-2.0.so.0
libgthread-2.0.so.0
libply-splash-core.so.2
libply.so.2
libm.so.6
librt.so.1
libdl.so.2

16
srcpkgs/plymouth/plymouth-x11.template
View file

@ -1,16 +0,0 @@
# Template file for 'plymouth-x11'.
#
revision=1
short_desc="${short_desc} - X11 renderer and log viewer"
long_desc="${long_desc}
This package contains the x11 renderer and the log viewer."
Add_dependency run plymouth
do_install()
{
vmove usr/bin/plymouth-log-viewer usr/bin
vmove usr/lib/plymouth/renderers/x11.so usr/lib/plymouth/renderers
vmove usr/share/gdm usr/share
}

13
srcpkgs/plymouth/plymouth.rshlibs
View file

@ -14,3 +14,16 @@ librt.so.1
libdl.so.2
libpthread.so.0
libc.so.6
libgtk-x11-2.0.so.0
libgdk-x11-2.0.so.0
libatk-1.0.so.0
libgio-2.0.so.0
libpangoft2-1.0.so.0
libgdk_pixbuf-2.0.so.0
libfreetype.so.6
libfontconfig.so.1
libdrm_intel.so.1
libdrm_radeon.so.1
libdrm_nouveau.so.1
libdrm.so.2
libkms.so.1

27
srcpkgs/plymouth/template
View file

@ -1,28 +1,32 @@
# Template file for 'plymouth'
pkgname=plymouth
version=0.8.3
revision=3
patch_args="-Np1"
version=20120111
homepage="http://cgit.freedesktop.org/plymouth"
distfiles="${homepage}/snapshot/$pkgname-$version.tar.bz2"
#distfiles="${homepage}/snapshot/$pkgname-$version.tar.bz2"
distfiles="http://xbps.nopcode.org/distfiles/plymouth-$version.tar.xz"
build_style=gnu-configure
configure_args="--enable-gdm-transition
--with-release-file=/etc/os-release --disable-static
--enable-pango --enable-tracing --disable-tests
--with-system-root-install --without-rhgb-compat-link
--with-logo=/usr/share/plymouth/xbps-logo.png
configure_args="--enable-pango --enable-libdrm_intel --enable-libdrm_radeon
--enable-libdrm_nouveau --enable-libkms --enable-gdm-transition
--enable-systemd-integration --with-system-root-install
--with-release-file=/etc/os-release --disable-tests --disable-static
--without-rhgb-compat-link --with-logo=/usr/share/void-artwork/splash.png
--with-background-color=0xffffff"
short_desc="Graphical boot animation and logger"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
checksum=2e51abbc087228f7910302334755d0190fc9e923eae9992150adb0f6cccc9077
checksum=f819a53d810633b2c93069d95681cf2440c65e411e360ab170eba36d76e46de3
long_desc="
Plymouth is an application that runs very early in the boot process
(even before the root filesystem is mounted!) that provides a graphical
boot animation while the boot process happens in the background."
subpackages="libplymouth ${pkgname}-x11 ${pkgname}-drm ${pkgname}-devel"
subpackages="libplymouth ${pkgname}-devel"
conf_files="/etc/plymouth/plymouthd.conf"
make_dirs="
/var/lib/plymouth 0755 root root
/var/spool/plymouth 0755 root root"
Add_dependency run void-artwork
Add_dependency build automake
Add_dependency build pkg-config
@ -44,5 +48,4 @@ post_install() {
usr/share/initramfs-tools/scripts/init-bottom plymouth
vinstall ${FILESDIR}/plymouth.init-premount 755 \
usr/share/initramfs-tools/scripts/init-premount plymouth
vinstall ${FILESDIR}/xbps-logo.png 644 usr/share/plymouth
}