plymouth: fix logo path, improve initramfs-tools hook.

srcpkgs/plymouth/files/plymouth.hook

@@ -21,8 +21,7 @@ esac
 THEME="$(/usr/sbin/plymouth-set-default-theme || true)"
 THEMES="/usr/share/plymouth/themes"
 
-if [ -n "${THEME}" ]
+if [ -n "${THEME}" ]; then
-then
 	THEME="${THEMES}/${THEME}/${THEME}.plymouth"
 else
 	exit 0
@@ -47,8 +46,7 @@ copy_exec "${MODULE}"
 mkdir -p "${DESTDIR}/${THEMES}"
 IMAGES="$(sed -n 's/^ImageDir=\(.*\)/\1/p' ${THEME})"
 # No images in text mode:
-if [ -n "${IMAGES}" ]
+if [ -n "${IMAGES}" ]; then
-then
 	cp -r "${IMAGES}" "${DESTDIR}/${THEMES}"
 fi
 
@@ -56,8 +54,7 @@ fi
 copy_exec /bin/plymouth
 copy_exec /sbin/plymouthd
 
-for PLUGIN in ${PLUGINS}
+for PLUGIN in ${PLUGINS}; do
-do
 	copy_exec ${PLUGIN_PATH}/${PLUGIN}
 done
 
@@ -72,6 +69,9 @@ case "$(basename ${THEME} .plymouth)" in
 		;;
 
 	*)
+		# XBPS logo
+		cp /usr/share/plymouth/xbps-logo.png "${DESTDIR}/usr/share/plymouth"
+
 		# copy files for font rendering
 		mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
 		mkdir -p "${DESTDIR}/etc/fonts/conf.d"
@@ -81,31 +81,20 @@ case "$(basename ${THEME} .plymouth)" in
 		cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts"
 		cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d"
 		if [ -d /usr/lib/pango/1.6.0 ]; then
-			# pre-multiarch fallback
 			PANGO_DIR=/usr/lib/pango/1.6.0
 		fi
-		mkdir -p "${DESTDIR}${PANGO_DIR}/modules"
-		mkdir -p "${DESTDIR}/etc/pango"
-		cp /etc/pango/pango.modules ${DESTDIR}/etc/pango
 		copy_exec ${PANGO_DIR}/modules/pango-basic-fc.so
 
 		# copy renderers
 		copy_exec /usr/lib/plymouth/renderers/frame-buffer.so
 		copy_exec /usr/lib/plymouth/renderers/drm.so
-
-		# add drm/fb modules
-		manual_add_modules intel-agp
-		manual_add_modules ati-agp
-		manual_add_modules i915
-		manual_add_modules radeon
 		;;
 esac
 
 # copy config files
 mkdir -p "${DESTDIR}/etc/plymouth"
 
-if [ -r /etc/plymouth/plymouthd.conf ]
+if [ -r /etc/plymouth/plymouthd.conf ]; then
-then
 	cp -a /etc/plymouth/plymouthd.conf "${DESTDIR}/etc/plymouth/"
 fi
 

srcpkgs/plymouth/template

@@ -1,6 +1,7 @@
 # Template file for 'plymouth'
 pkgname=plymouth
 version=0.8.3
+revision=1
 patch_args="-Np1"
 homepage="http://cgit.freedesktop.org/plymouth"
 distfiles="${homepage}/snapshot/$pkgname-$version.tar.bz2"
@@ -9,7 +10,7 @@ configure_args="--enable-gdm-transition
 --with-release-file=/etc/os-release --disable-static
 --localstatedir=/var --enable-pango --enable-tracing --disable-tests
 --with-system-root-install --without-rhgb-compat-link
---with-logo=/usr/share/plymouth/xbps-log.png
+--with-logo=/usr/share/plymouth/xbps-logo.png
 --with-background-color=0xffffff"
 short_desc="Graphical boot animation and logger"
 maintainer="Juan RP <xtraeme@gmail.com>"