Revert "plymouth: update to 0.9.0"

This reverts commit d5cb134735305134af8410f00768adf4b5254c91.

1 files changed, 65 insertions, 55 deletions

diff --git a/abs/core/plymouth/PKGBUILD b/abs/core/plymouth/PKGBUILD
index 2563333..6126d4f 100644
--- a/abs/core/plymouth/PKGBUILD
+++ b/abs/core/plymouth/PKGBUILD
@@ -1,84 +1,74 @@
-#
-# Maintainer: Damian01w <damian01w@gmail.com>
-# Maintainer: Padfoot <padfoot@exemail.com.au>
-#
-
 pkgname=plymouth
-pkgver=0.9.0
-pkgrel=5
-pkgdesc="A graphical boot splash screen with kernel mode-setting support"
-url="http://www.freedesktop.org/wiki/Software/Plymouth/"
-
+pkgver=0.8.8.52.g37d2e40
+pkgrel=4
+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' 'v86d')
-makedepends=('docbook-xsl')
+makedepends=('git' 'docbook-xsl')
 optdepends=('ttf-dejavu')
-
 options=('!libtool' '!emptydirs')
-
+install=$pkgname.install
+groups=('base')
 provides=('plymouth')
-conflicts=('plymouth-git')
+conflicts=('plymouth')
 backup=('etc/plymouth/plymouthd.conf')
 
-source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2" 
+source=('git://anongit.freedesktop.org/plymouth'
         'arch-logo.png'
-        'plymouth.encrypt_hook'
-        'plymouth.encrypt_install'
+        '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-start.service'
-        'plymouth-quit.service.in.patch'
+        'plymouth-quit.service'
         'plymouth-set-default-theme.in.patch'
-        'plymouth-update-initrd.patch')
+        'plymouth-update-initrd.patch'
+        'plymouthd.conf'
+        'system-release')
         
-md5sums=('147150705417f025d036304e97e33c9c'
-         '65fa2763d5c9bb9f80973ea5e6e3db3e'
-         'fbdd5d04e3089a214b9056357434df86'
-         '65eb269910f1b81e3f0970af456394ca'
-         'e336aa51a5b781026ce541c046ee9131'
-         'dcacff05835053242f52b9e375248ec3'
-         '22130f7e6b20d2a43dbed924de75180b'
-         '870ea3e63c6989e2badf79d1fbafa914'
-         'fb2eb948e2198cfb54cc2b710a05ee61'
-         '32f04fdbd1eb94ade30d1e63fdcdd9b5'
-         'a6dca3d57fd38b875d0520ec033dbf66'
-         '78340207f7391c682601b1b36baed14d'
-         '165a39dbedcc6e123c8ca05d5b4b2e25'
-         'f79edbbb30c71b0dbcd102c7dd31660b'
-         '0357775c16b5f90f1af485e6a4c80a9e')
+pkgver() {
+	cd "$srcdir"/${pkgname%%-*}
+	git describe --always | sed 's/-/./g'
+}
 
 prepare() {
-	cd "$srcdir"/${pkgname}-${pkgver}
+	cd "$srcdir"/${pkgname%%-*}
+	
+	patch -Np0 -i ../plymouth-set-default-theme.in.patch
+	patch -Np0 -i ../plymouth-update-initrd.patch
 	
-	patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch
-	patch -p1 -i $srcdir/plymouth-update-initrd.patch
-	patch -p1 -i $srcdir/plymouth-quit.service.in.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"/${pkgname}-${pkgver}
-	
-	LDFLAGS="$LDFLAGS -ludev" ./configure --prefix=/usr \
+	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 \
+		--enable-drm-renderer \
 		--enable-tracing \
 		--enable-pango \
-		--enable-gtk=no \
-		--with-release-file=/etc/os-release \
+		--with-gdm-autostart-file=yes \
 		--with-logo=/usr/share/plymouth/arch-logo.png \
-		--with-background-color=0x000000 \
 		--with-background-start-color-stop=0x000000 \
 		--with-background-end-color-stop=0x4D4D4D \
 		--without-rhgb-compat-link \
@@ -88,21 +78,41 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/${pkgname}-${pkgver}
+  cd "$srcdir"/${pkgname%%-*}
 
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/arch-logo.png"             "$pkgdir/usr/share/plymouth/arch-logo.png"
-  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"
+  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"
 
-  for i in {gdm,kdm,lxdm,slim,lightdm}-plymouth.service; do
+  # 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
-
-  install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service"
-  cp "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
+  
 }
-
+md5sums=('SKIP'
+         '65fa2763d5c9bb9f80973ea5e6e3db3e'
+         '79613b70a0a0be4c33978ef37c30f00a'
+         '65eb269910f1b81e3f0970af456394ca'
+         '34d0ed7bbcb3d0ea498de24bc17b2ee9'
+         '75ec0ac73eb9a1e3f6104df64520d431'
+         'ceec65ce58accdb270f3eaa23d794b4a'
+         '62c3b4e894330a2ca4c2b8fbcaba083c'
+         'e6d573b1913f3aa020cbde3863ee80f0'
+         '225b953976e1c824f62ba406a63c18c7'
+         'f0110fba1e77cd22c32d1727399d0b8a'
+         '95e987cfbc2d30a2cea215394eb9ac20'
+         '4f3be343eea9956bbc94d615d5f41def'
+         '7f21ba9a85733ff945c23012cff55a89'
+         '3bb0b8008edfad9e23703674341766a0'
+         '42fddd683720dbacbe6e30b4b7892f3c'
+         '412a1a89ca960370071746b0af8c0ac5'
+         '37479b134827dc307b3c55bfb2711e99'
+         'ab8a557d10f74bec5c94ed6cae34729c')