Merge branch 'testing'

1 files changed, 78 insertions, 90 deletions

diff --git a/abs/core/plymouth/PKGBUILD b/abs/core/plymouth/PKGBUILD
index 34c40c5..6126d4f 100644
--- a/abs/core/plymouth/PKGBUILD
+++ b/abs/core/plymouth/PKGBUILD
@@ -1,130 +1,118 @@
-# Maintainer:  M0Rf30 <morfeo89@hotmail.it>
-# Contributor: PirateJonno <j@skurvy.no-ip.org>
-# Contributor: Det <nimetonmaili at gmail dot com>
-# Contributor: Biginoz <biginoz _at_ free _point_ fr>
-# Based on plymouth-git: http://aur.archlinux.org/packages.php?ID=26117
-
 pkgname=plymouth
-pkgver=0.8.8
-pkgrel=3
-pkgdesc="A graphical boot splash screen with kernel mode-setting support"
+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')
-url="http://freedesktop.org/wiki/Software/Plymouth"
 license=('GPL')
-depends=('libdrm' 'pango'  'gtk2')
+depends=('libdrm' 'pango' 'v86d')
+makedepends=('git' 'docbook-xsl')
+optdepends=('ttf-dejavu')
 options=('!libtool' '!emptydirs')
-install=${pkgname}.install
-backup=('etc/plymouth/plymouthd.conf')
+install=$pkgname.install
+groups=('base')
 provides=('plymouth')
-conflicts=('plymouth-git')
-source=("http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2"
-	'arch-logo.png'
-        "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-i686/encrypt_hook"
-        'encrypt_hook.patch'
-        "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-i686/encrypt_install"
-        'encrypt_install.patch'
+conflicts=('plymouth')
+backup=('etc/plymouth/plymouthd.conf')
+
+source=('git://anongit.freedesktop.org/plymouth'
+        'arch-logo.png'
+        'encrypt_hook'
+        'encrypt_install'
         'gdm-plymouth.service'
         'kdm-plymouth.service'
         'kdm-unpatched-plymouth.service'
-        'lightdm-plymouth.service'
         'lxdm-plymouth.service'
+        'lightdm-plymouth.service'
+        'slim-plymouth.service'
         'plymouth.functions'
+        "$pkgname.install"
         'plymouth.initcpio_hook'
         'plymouth.initcpio_install'
-        'plymouth-pid.patch'
         'plymouth-quit.service'
         'plymouth-set-default-theme.in.patch'
         'plymouth-update-initrd.patch'
         'plymouthd.conf'
-        'system-release'
-        'systemd-unit-dir.patch'
-	'udevadm.patch'
-)
+        'system-release')
+        
+pkgver() {
+	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 
-   msg "Applying Patches..."
-
-  msg2 "Fixing encrypt HOOK"
-  #patch -p0 -i encrypt_hook.patch --follow-symlinks
-  #patch -p0 -i encrypt_install.patch --follow-symlinks
-  
-  
-  cd $srcdir/$pkgname-$pkgver
-  msg2 "Setting a human-readable error for '# plymouth-set-default-theme -R'"
-  patch -p0 -i ../plymouth-set-default-theme.in.patch
-
-  msg2 "Fixing updating initrd"
-  patch -p0 -i ../plymouth-update-initrd.patch
-
-  msg2 "Changing PID file to /run/plymouth.pid"
-  patch -p1 -i ../plymouth-pid.patch
-
-  msg2 "Changing udevadm path"
-  patch -p1 -i ../udevadm.patch  
-
-  msg2 "Changing SYSTEMD_UNIT_DIR to /usr/lib/systemd/system/"
-  patch -p0 -i ../systemd-unit-dir.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
-
-  msg "Starting make..."
-
-    ./configure --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --libexecdir=/usr/lib \
-    --enable-tracing \
-    --without-rhgb-compat-link \
-    --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 \
-    --enable-systemd-integration \
-    --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/$pkgname-$pkgver
+  cd "$srcdir"/${pkgname%%-*}
 
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png"
-  install -Dm644 ../../encrypt_hook "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
-  install -Dm644 ../../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/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"
+  install -Dm644 "$srcdir/plymouthd.conf"            "$pkgdir/etc/plymouth/plymouthd.conf"
+  install -Dm644 "$srcdir/system-release"            "$pkgdir/etc/system-release"
 
   # Plymouth<->systemd integration, including units for DMs
-  for i in {{gdm,kdm{,-unpatched},lightdm,lxdm}-plymouth,plymouth-quit}.service; do
+  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=('38f5e613e5ab17806b950cee2d0d0d4e'
+md5sums=('SKIP'
          '65fa2763d5c9bb9f80973ea5e6e3db3e'
-         'c970831d733ca42e20415005967e7843'
-         '59f703eafd1aee4ca5782a523d412a46'
-         '21c45f9cab3e0b5165f68358884fbd0f'
-         'cdee5ae4c4087181e80fe14061b7d604'
+         '79613b70a0a0be4c33978ef37c30f00a'
+         '65eb269910f1b81e3f0970af456394ca'
          '34d0ed7bbcb3d0ea498de24bc17b2ee9'
          '75ec0ac73eb9a1e3f6104df64520d431'
          'ceec65ce58accdb270f3eaa23d794b4a'
-         'e6d573b1913f3aa020cbde3863ee80f0'
          '62c3b4e894330a2ca4c2b8fbcaba083c'
-         'a1763999bc3282771e712765c9427d77'
+         'e6d573b1913f3aa020cbde3863ee80f0'
+         '225b953976e1c824f62ba406a63c18c7'
+         'f0110fba1e77cd22c32d1727399d0b8a'
+         '95e987cfbc2d30a2cea215394eb9ac20'
          '4f3be343eea9956bbc94d615d5f41def'
-         'e606ce14ceace727c2f13758e371a4ed'
-         '761f5090dc999e50b4572138347c775b'
+         '7f21ba9a85733ff945c23012cff55a89'
          '3bb0b8008edfad9e23703674341766a0'
          '42fddd683720dbacbe6e30b4b7892f3c'
-         'c2a0cf5a499d6c14723461166a24ede7'
+         '412a1a89ca960370071746b0af8c0ac5'
          '37479b134827dc307b3c55bfb2711e99'
-         'ab8a557d10f74bec5c94ed6cae34729c'
-         '30acbfc7722fb62ee464b8fec32b5cfd'
-         '89014b04513d61e0085e7a0c9924c183')
+         'ab8a557d10f74bec5c94ed6cae34729c')