Merge branch 'master' of ../current

Conflicts:
	source/x11/libdrm/FrugalBuild
	source/x11/mesa/FrugalBuild
	source/xmultimedia/vlc/FrugalBuild

diff --cc source/x11/libdrm/FrugalBuild
index fbbc2e9,d2296fb..e8114d1
--- 1/source/x11/libdrm/FrugalBuild
--- 2/source/x11/libdrm/FrugalBuild
+++ b/source/x11/libdrm/FrugalBuild
@@@ -4,11 -4,11 +4,11 @@@
  USE_DEVEL=${USE_DEVEL:-"n"}
  
  pkgname=libdrm
 -pkgver=2.4.35
 -pkgrel=2
 +pkgver=2.4.37
 +pkgrel=1
  pkgdesc="X.Org Userspace interface to kernel DRM services"
  url="http://xorg.freedesktop.org/"
- depends=('libpciaccess' 'libpthread-stubs' 'udev')
+ depends=('libpciaccess' 'libpthread-stubs' 'systemd>=188')
  archs=('i686' 'x86_64' 'arm')
  groups=('x11' 'xorg-core' 'xorg-libs')
  if Fuse $USE_DEVEL; then

diff --cc source/x11/mesa/FrugalBuild
Simple merge

diff --cc source/xmultimedia/vlc/FrugalBuild
Simple merge