--- PKGBUILD.old	2014-09-20 11:20:47.000000000 +0100
+++ PKGBUILD.new	2014-09-20 11:42:21.745518508 +0100
@@ -63,12 +63,12 @@
 
 package_opencl-mesa() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang')
+  depends=("libxcb" 'libcl' 'libclc' 'clang')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
-  
+
   install -m755 -d ${pkgdir}/etc
   mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
-  
+
   install -m755 -d ${pkgdir}/usr/lib
   mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe ${pkgdir}/usr/lib/
@@ -79,14 +79,14 @@
 
 package_mesa-dri() {
   pkgdesc="Mesa DRI drivers"
-  depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn')
+  depends=('libtxc_dxtn' 'expat')
   conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
 
   install -m755 -d ${pkgdir}/etc
   mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
-  
+
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   # ati-dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
@@ -96,18 +96,22 @@
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
   # svga-dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
-   
+  # swrast
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+
+
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-dri/"
 }
 
 package_mesa-vdpau() {
   pkgdesc="Mesa VDPAU drivers"
-  depends=("mesa=${pkgver}")
+  depends=('libdrm' 'libxcb' 'expat')
+  provides=('vdpau-backend')
 
   install -m755 -d ${pkgdir}/usr/lib
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
-   
+
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
 }
@@ -115,7 +119,7 @@
 package_mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification"
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 
-           'libomxil-bellagio' 'llvm-libs' 'libgl')
+           'libomxil-bellagio' 'llvm-libs' 'mesa-dri')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
@@ -127,13 +131,9 @@
   # FS#41337
   #mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
 
-  # swrast
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
-
   mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
   mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-  
+
   install -m755 -d ${pkgdir}/usr/lib/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
   mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
@@ -149,7 +149,7 @@
   depends=("mesa=${pkgver}")
   provides=("libgl=${pkgver}")
   replaces=('libgl')
- 
+
   # See FS#26284
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"