plymouth, plymouth-theme-linhes: update and kill some bugs

LinHES-config: change splash detection

1 files changed, 97 insertions, 52 deletions

diff --git a/abs/core/plymouth/PKGBUILD b/abs/core/plymouth/PKGBUILD
index a9d1bde..d0849c7 100644
--- a/abs/core/plymouth/PKGBUILD
+++ b/abs/core/plymouth/PKGBUILD
@@ -1,73 +1,118 @@
 pkgname=plymouth
 pkgver=0.8.8.52.g37d2e40
 pkgrel=1
-pkgdesc="A graphical boot splash screen with kernel mode-setting support (Git verson for now)"
+pkgdesc="A graphical boot splash screen with kernel mode-setting support (Git version)"
 url="http://cgit.freedesktop.org/cgit/plymouth/"
-
 arch=('i686' 'x86_64')
 license=('GPL')
-
-depends=('libdrm' 'pango')
+depends=('libdrm' 'pango' 'v86d')
 makedepends=('git' 'docbook-xsl')
 optdepends=('ttf-dejavu')
-backup=('etc/plymouth/plymouthd.conf')
-options=('!emptydirs')
-conflicts=('plymouth-git')
+options=('!libtool' '!emptydirs')
+install=$pkgname.install
 
-source=(
-'git://anongit.freedesktop.org/plymouth'
-'plymouth.hook'
-'plymouth.install'
-'plymouth-encrypt.hook'
-'plymouth-encrypt.install'
-'arch-logo.png'
-)
+provides=('plymouth')
+conflicts=('plymouth')
+backup=('etc/plymouth/plymouthd.conf')
 
-md5sums=(
-'SKIP'
-'SKIP'
-'SKIP'
-'SKIP'
-'SKIP'
-'SKIP'
-)
+source=('git://anongit.freedesktop.org/plymouth'
+        'arch-logo.png'
+        'encrypt_hook'
+        'encrypt_install'
+        'gdm-plymouth.service'
+        'kdm-plymouth.service'
+        'kdm-unpatched-plymouth.service'
+        'lxdm-plymouth.service'
+        'lightdm-plymouth.service'
+        'slim-plymouth.service'
+        'plymouth.functions'
+        "$pkgname.install"
+        'plymouth.initcpio_hook'
+        'plymouth.initcpio_install'
+        'plymouth-quit.service'
+        'plymouth-set-default-theme.in.patch'
+        'plymouth-update-initrd.patch'
+        'plymouthd.conf'
+        'system-release')
+        
 pkgver() {
-    cd "$srcdir"/plymouth
-    git describe --always | sed 's/-/./g'
+	cd "$srcdir"/${pkgname%%-*}
+	git describe --always | sed 's/-/./g'
+}
+
+prepare() {
+	cd "$srcdir"/${pkgname%%-*}
+	
+	patch -Np0 -i ../plymouth-set-default-theme.in.patch
+	patch -Np0 -i ../plymouth-update-initrd.patch
+	
+	sed -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
+	-i src/libply-splash-graphics/ply-image.c
+	
+	test -f Makefile && make distclean
+	
+	return 0
 }
 
 build() {
-    cd "$srcdir"/plymouth
-    ./autogen.sh --prefix=/usr \
-        --exec-prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libdir=/usr/lib \
-        --libexecdir=/usr/lib \
-        --sbindir=/usr/bin \
-        --enable-drm-renderer \
-        --enable-pango \
-        --with-logo=/usr/share/plymouth/arch-logo.png \
-        --with-boot-tty=/dev/tty7 \
-        --with-shutdown-tty=/dev/tty7 \
-        --without-system-root-install
-    make
+	cd "$srcdir"/${pkgname%%-*}
+
+	./autogen.sh --prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--sbindir=/usr/bin \
+		--enable-drm-renderer \
+		--enable-tracing \
+		--enable-pango \
+		--with-gdm-autostart-file=yes \
+		--with-logo=/usr/share/plymouth/arch-logo.png \
+		--with-background-start-color-stop=0x000000 \
+		--with-background-end-color-stop=0x4D4D4D \
+		--without-rhgb-compat-link \
+		--without-system-root-install
+
+	make
 }
 
 package() {
-    cd "$srcdir"/plymouth
-    make DESTDIR="$pkgdir" install
+  cd "$srcdir"/${pkgname%%-*}
 
-    # logo
-    install -Dm644 "$srcdir"/arch-logo.png "$pkgdir/usr/share/plymouth/arch-logo.png"
+  make DESTDIR="$pkgdir" install
 
-    # remove non-arch script
-    rm "$pkgdir/usr/lib/plymouth/"*-initrd
-    rm "$pkgdir/usr/bin/plymouth-set-default-theme"
+  install -Dm644 "$srcdir/arch-logo.png"             "$pkgdir/usr/share/plymouth/arch-logo.png"
+  install -Dm644 "$srcdir/encrypt_hook"              "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
+  install -Dm644 "$srcdir/encrypt_install"           "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
+  install -Dm644 "$srcdir/plymouth.functions"        "$pkgdir/etc/rc.d/functions.d/plymouth.functions"
+  install -Dm644 "$srcdir/plymouth.initcpio_hook"    "$pkgdir/usr/lib/initcpio/hooks/plymouth"
+  install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
+  install -Dm644 "$srcdir/plymouthd.conf"            "$pkgdir/etc/plymouth/plymouthd.conf"
+  install -Dm644 "$srcdir/system-release"            "$pkgdir/etc/system-release"
 
-    # initcpio
-    install -Dm644 "$srcdir/plymouth.hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth"
-    install -Dm644 "$srcdir/plymouth.install" "$pkgdir/usr/lib/initcpio/install/plymouth"
-    install -Dm644 "$srcdir/plymouth-encrypt.hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
-    install -Dm644 "$srcdir/plymouth-encrypt.install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
+  # Plymouth<->systemd integration, including units for DMs
+  for i in {{gdm,kdm{,-unpatched},lxdm,slim,lightdm}-plymouth,plymouth-quit}.service; do
+    install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
+  done
+  
 }
+md5sums=('SKIP'
+         '65fa2763d5c9bb9f80973ea5e6e3db3e'
+         '79613b70a0a0be4c33978ef37c30f00a'
+         '65eb269910f1b81e3f0970af456394ca'
+         '34d0ed7bbcb3d0ea498de24bc17b2ee9'
+         '75ec0ac73eb9a1e3f6104df64520d431'
+         'ceec65ce58accdb270f3eaa23d794b4a'
+         '62c3b4e894330a2ca4c2b8fbcaba083c'
+         'e6d573b1913f3aa020cbde3863ee80f0'
+         '225b953976e1c824f62ba406a63c18c7'
+         'f0110fba1e77cd22c32d1727399d0b8a'
+         '95e987cfbc2d30a2cea215394eb9ac20'
+         '4f3be343eea9956bbc94d615d5f41def'
+         '7f21ba9a85733ff945c23012cff55a89'
+         '3bb0b8008edfad9e23703674341766a0'
+         '42fddd683720dbacbe6e30b4b7892f3c'
+         '412a1a89ca960370071746b0af8c0ac5'
+         '37479b134827dc307b3c55bfb2711e99'
+         'ab8a557d10f74bec5c94ed6cae34729c')