From bd1f56fa6659b0f513573df658ea116458ab5e88 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Jan 2012 18:29:46 +0100 Subject: [PATCH] plymouth: update to a git snapshot from master, merge useless subpkgs. --- srcpkgs/plymouth/files/plymouth.hook | 4 +- srcpkgs/plymouth/files/plymouth.init-premount | 4 +- srcpkgs/plymouth/files/xbps-logo.png | Bin 3294 -> 0 bytes srcpkgs/plymouth/libplymouth.template | 2 - ...efault-framebuffer-device-to-dev-fb0.patch | 5 +- srcpkgs/plymouth/patches/03-awk.patch | 23 ---- srcpkgs/plymouth/patches/04-stderr.patch | 128 ------------------ .../plymouth/patches/05-default-theme.patch | 21 --- srcpkgs/plymouth/patches/06-tty.patch | 18 --- srcpkgs/plymouth/patches/07-return-code.patch | 15 -- srcpkgs/plymouth/plymouth-drm.rshlibs | 10 -- srcpkgs/plymouth/plymouth-drm.template | 14 -- srcpkgs/plymouth/plymouth-x11.rshlibs | 22 --- srcpkgs/plymouth/plymouth-x11.template | 16 --- srcpkgs/plymouth/plymouth.rshlibs | 13 ++ srcpkgs/plymouth/template | 27 ++-- 16 files changed, 33 insertions(+), 289 deletions(-) delete mode 100644 srcpkgs/plymouth/files/xbps-logo.png delete mode 100644 srcpkgs/plymouth/patches/03-awk.patch delete mode 100644 srcpkgs/plymouth/patches/04-stderr.patch delete mode 100644 srcpkgs/plymouth/patches/05-default-theme.patch delete mode 100644 srcpkgs/plymouth/patches/06-tty.patch delete mode 100644 srcpkgs/plymouth/patches/07-return-code.patch delete mode 100644 srcpkgs/plymouth/plymouth-drm.rshlibs delete mode 100644 srcpkgs/plymouth/plymouth-drm.template delete mode 100644 srcpkgs/plymouth/plymouth-x11.rshlibs delete mode 100644 srcpkgs/plymouth/plymouth-x11.template diff --git a/srcpkgs/plymouth/files/plymouth.hook b/srcpkgs/plymouth/files/plymouth.hook index 17452446eff..29effc08cd8 100644 --- a/srcpkgs/plymouth/files/plymouth.hook +++ b/srcpkgs/plymouth/files/plymouth.hook @@ -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" diff --git a/srcpkgs/plymouth/files/plymouth.init-premount b/srcpkgs/plymouth/files/plymouth.init-premount index 0675c61e2bd..eaacfb6387f 100644 --- a/srcpkgs/plymouth/files/plymouth.init-premount +++ b/srcpkgs/plymouth/files/plymouth.init-premount @@ -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 diff --git a/srcpkgs/plymouth/files/xbps-logo.png b/srcpkgs/plymouth/files/xbps-logo.png deleted file mode 100644 index 076b7b9137a6523fd76428089aeb02e9047e2323..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3294 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 W#yfzx8tCoALI%@@YvDBPBL4%pI#9X* diff --git a/srcpkgs/plymouth/libplymouth.template b/srcpkgs/plymouth/libplymouth.template index e0d56d771b2..55f5405c21e 100644 --- a/srcpkgs/plymouth/libplymouth.template +++ b/srcpkgs/plymouth/libplymouth.template @@ -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 diff --git a/srcpkgs/plymouth/patches/02-set-default-framebuffer-device-to-dev-fb0.patch b/srcpkgs/plymouth/patches/02-set-default-framebuffer-device-to-dev-fb0.patch index 2d315ab21a2..2c446d9eeb2 100644 --- a/srcpkgs/plymouth/patches/02-set-default-framebuffer-device-to-dev-fb0.patch +++ b/srcpkgs/plymouth/patches/02-set-default-framebuffer-device-to-dev-fb0.patch @@ -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" diff --git a/srcpkgs/plymouth/patches/03-awk.patch b/srcpkgs/plymouth/patches/03-awk.patch deleted file mode 100644 index 4724ad9797f..00000000000 --- a/srcpkgs/plymouth/patches/03-awk.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Daniel Baumann -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 () diff --git a/srcpkgs/plymouth/patches/04-stderr.patch b/srcpkgs/plymouth/patches/04-stderr.patch deleted file mode 100644 index 0dafcc17960..00000000000 --- a/srcpkgs/plymouth/patches/04-stderr.patch +++ /dev/null @@ -1,128 +0,0 @@ -Author: Daniel Baumann -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 - diff --git a/srcpkgs/plymouth/patches/05-default-theme.patch b/srcpkgs/plymouth/patches/05-default-theme.patch deleted file mode 100644 index 585518f5e32..00000000000 --- a/srcpkgs/plymouth/patches/05-default-theme.patch +++ /dev/null @@ -1,21 +0,0 @@ -Author: Daniel Baumann -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 diff --git a/srcpkgs/plymouth/patches/06-tty.patch b/srcpkgs/plymouth/patches/06-tty.patch deleted file mode 100644 index 283a2bb43ab..00000000000 --- a/srcpkgs/plymouth/patches/06-tty.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Julien Cristau -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; diff --git a/srcpkgs/plymouth/patches/07-return-code.patch b/srcpkgs/plymouth/patches/07-return-code.patch deleted file mode 100644 index db2594b8ab6..00000000000 --- a/srcpkgs/plymouth/patches/07-return-code.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Michael Prokop -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 - diff --git a/srcpkgs/plymouth/plymouth-drm.rshlibs b/srcpkgs/plymouth/plymouth-drm.rshlibs deleted file mode 100644 index 720f92f109c..00000000000 --- a/srcpkgs/plymouth/plymouth-drm.rshlibs +++ /dev/null @@ -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 diff --git a/srcpkgs/plymouth/plymouth-drm.template b/srcpkgs/plymouth/plymouth-drm.template deleted file mode 100644 index bda8d9c6af4..00000000000 --- a/srcpkgs/plymouth/plymouth-drm.template +++ /dev/null @@ -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 -} diff --git a/srcpkgs/plymouth/plymouth-x11.rshlibs b/srcpkgs/plymouth/plymouth-x11.rshlibs deleted file mode 100644 index 357d6f7669c..00000000000 --- a/srcpkgs/plymouth/plymouth-x11.rshlibs +++ /dev/null @@ -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 diff --git a/srcpkgs/plymouth/plymouth-x11.template b/srcpkgs/plymouth/plymouth-x11.template deleted file mode 100644 index 0433c7db718..00000000000 --- a/srcpkgs/plymouth/plymouth-x11.template +++ /dev/null @@ -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 -} diff --git a/srcpkgs/plymouth/plymouth.rshlibs b/srcpkgs/plymouth/plymouth.rshlibs index 4a2af7acb39..ec34ee769aa 100644 --- a/srcpkgs/plymouth/plymouth.rshlibs +++ b/srcpkgs/plymouth/plymouth.rshlibs @@ -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 diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 5bd3d90c291..44333e5e6c3 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -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 " 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 }