Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

7 files changed, 638 insertions, 309 deletions

diff --git a/libre/libdrm-libre/COPYING b/libre/libdrm-libre/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/libre/libdrm-libre/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/libre/libdrm-libre/PKGBUILD b/libre/libdrm-libre/PKGBUILD
new file mode 100644
index 000000000..1746710cb
--- /dev/null
+++ b/libre/libdrm-libre/PKGBUILD
@@ -0,0 +1,90 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=libdrm-libre
+pkgver=2.4.39
+pkgrel=1
+pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)'
+arch=(
+  i686
+  x86_64
+  mips64el
+:)
+license=(
+  MIT
+)
+depends=(
+  libpciaccess
+  )
+makedepends=(
+  cairo
+  valgrind
+)
+options=(
+  !libtool
+)
+url=http://dri.freedesktop.org/
+provides=(
+  ${pkgname%-libre}=$pkgver
+  ${pkgname%-libre}-git
+  $pkgname-git
+)
+conflicts=(
+  ${pkgname%-libre}
+  ${pkgname%-libre}-git
+  $pkgname-git
+  ${pkgname%-libre}-new
+  ${pkgname%-libre}-nouveau
+  ${pkgname%-libre}-old
+)
+replaces=(
+  ${pkgname%-libre}
+  ${pkgname%-libre}-git
+  ${pkgname%-libre}-new
+  ${pkgname%-libre}-nouveau
+)
+
+source=(
+  http://dri.freedesktop.org/${pkgname%-libre}/${pkgname%-libre}-$pkgver.tar.bz2
+  COPYING
+)
+sha512sums=(
+  51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f
+  b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
+)
+
+build() {
+  cd ${pkgname%-libre}-$pkgver
+
+  sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \
+    configure.ac
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    exynos/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;/	@PTHREADSTUBS_LIBS@ /d' \
+    intel/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    nouveau/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    omap/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    radeon/Makefile.am
+
+  #libtoolize --force
+  autoreconf --force --install
+  ./configure --prefix=/usr \
+    --disable-vmwgfx-experimental-api \
+    --enable-udev
+  make V=0
+}
+
+check() {
+cd ${pkgname%-libre}-$pkgver
+  make -k check
+}
+
+package() {
+cd ${pkgname%-libre}-$pkgver
+  make DESTDIR=$pkgdir install
+  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
+  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre}
+}
diff --git a/pcr/libdrm-git/PKGBUILD b/pcr/libdrm-git/PKGBUILD
deleted file mode 100644
index 823631073..000000000
--- a/pcr/libdrm-git/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Arch libdrm Maintainers:
-#	Jan de Groot
-#	Andreas Radke
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=libdrm-git
-pkgver=20120905
-pkgrel=2
-pkgdesc='Userspace interface to kernel DRM services'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  MIT
-)
-depends=(
-  libpciaccess
-  )
-makedepends=(
-  cairo
-  git
-  valgrind
-)
-options=(
-  !libtool
-)
-url=http://dri.freedesktop.org/
-provides=(
-  ${pkgname%-git}
-  ${pkgname%-git}-nouveau1
-)
-conflicts=(
-  ${pkgname%-git}
-  ${pkgname%-git}-nouveau1
-)
-
-_gitroot=git://git.freedesktop.org/git/mesa/drm
-_gitname=drm
-
-build() {
-  cd $srcdir
-  msg 'Connecting to GIT server....'
-
-  if [[ -d $_gitname ]]; then
-    cd $_gitname && git pull origin
-    msg 'The local files are updated.'
-  else
-    git clone $_gitroot $_gitname
-  fi
-
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting build...'
-
-  rm -rf $srcdir}/$_gitname-build
-  git clone $srcdir/$_gitname $srcdir/$_gitname-build
-  cd $srcdir/$_gitname-build
-
-  sed -i 's/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)//' configure.ac
-
-  ./autogen.sh
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-nouveau \
-      --enable-vmwgfx
-  make V=1
-}
-
-check() {
-  cd $srcdir/$_gitname-build
-  make -k check
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  make DESTDIR=$pkgdir install
-}
diff --git a/pcr/libdrm-libre-git/COPYING b/pcr/libdrm-libre-git/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/pcr/libdrm-libre-git/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/pcr/libdrm-libre-git/PKGBUILD b/pcr/libdrm-libre-git/PKGBUILD
new file mode 100644
index 000000000..37c7066fc
--- /dev/null
+++ b/pcr/libdrm-libre-git/PKGBUILD
@@ -0,0 +1,113 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=libdrm-libre-git
+pkgver=20120909
+_pkgver=2.4.39
+pkgrel=1
+pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  MIT
+)
+depends=(
+  libpciaccess
+  )
+makedepends=(
+  cairo
+  git
+  valgrind
+)
+options=(
+  !libtool
+)
+url=http://dri.freedesktop.org/
+provides=(
+  ${pkgname%-libre-git}=$_pkgver
+  ${pkgname%-libre-git}-libre=$_pkgver
+  ${pkgname%-libre-git}-git
+  ${pkgname%-libre-git}-nouveau1
+)
+conflicts=(
+  ${pkgname%-libre-git}
+  ${pkgname%-libre-git}-libre
+  ${pkgname%-libre-git}-git
+  ${pkgname%-libre-git}-new
+  ${pkgname%-libre-git}-nouveau
+  ${pkgname%-libre-git}-nouveau1
+  ${pkgname%-libre-git}-old
+)
+replaces=(
+  ${pkgname%-libre-git}
+  ${pkgname%-libre-git}-git
+  ${pkgname%-libre-git}-new
+  ${pkgname%-libre-git}-nouveau
+)
+source=(
+  COPYING
+)
+sha512sums=(
+  b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
+)
+
+_gitroot=git://git.freedesktop.org/git/mesa/drm
+_gitname=drm
+
+build() {
+  cd $srcdir
+  msg 'Connecting to GIT server....'
+
+  if [[ -d $_gitname ]]; then
+    cd $_gitname && git pull origin
+    msg 'The local files are updated.'
+  else
+    git clone $_gitroot $_gitname
+  fi
+
+  msg 'GIT checkout done or server timeout'
+  msg 'Starting build...'
+
+  rm -rf $srcdir}/$_gitname-build
+  git clone $srcdir/$_gitname $srcdir/$_gitname-build
+  cd $srcdir/$_gitname-build
+
+  sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \
+    configure.ac
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    exynos/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;/	@PTHREADSTUBS_LIBS@ /d' \
+    intel/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    nouveau/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    omap/Makefile.am
+  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
+    radeon/Makefile.am
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+      --disable-vmwgfx \
+      --enable-exynos-experimental-api \
+      --enable-intel \
+      --enable-nouveau \
+      --enable-omap-experimental-api \
+      --enable-radeon \
+      --enable-udev
+  make V=0
+}
+
+check() {
+  cd $srcdir/$_gitname-build
+  make -k check
+}
+
+package() {
+  cd $srcdir/$_gitname-build
+  make DESTDIR=$pkgdir install
+  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre-git}
+  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre-git}
+}
diff --git a/pcr/libegl-git/PKGBUILD b/pcr/libegl-git/PKGBUILD
deleted file mode 100644
index aa48ab5a3..000000000
--- a/pcr/libegl-git/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=libegl-git
-true && pkgver=9.0.0.git20120906
-true && pkgrel=1
-_mesaver=9.0
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-makedepends=(
-  clang
-  dri2proto
-  git
-  glproto-git
-  imake
-  libdrm-git
-  libxdamage
-  libxml2
-  libxxf86vm
-  python2
-)
-license=(
-  MIT
-  Khronos
-  LGPL
-)
-depends=(
-  khrplatform-devel-git
-  libgbm-git
-  libxext
-  libxfixes
-  libvg-git
-)
-conflicts=(
-  ${pkgname%-git}
-  ${pkgname%-git}-wayland
-  ${pkgname%-git}-wayland-git
-)
-provides=(
-  ${pkgname%-git}=$_mesaver
-  ${pkgname%-git}-wayland-git=$_mesaver
-)
-pkgdesc='Mesa EGL libraries and headers'
-url=http://mesa3d.sourceforge.net
-#source=(
-#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-#)
-#sha512sums=(
-#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
-#)
-
-_gitroot=git://anongit.freedesktop.org/git/mesa/mesa
-_gitname=mesa
-
-build() {
-  msg 'Connecting to git.freedesktop.org GIT server....'
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-  else
-    git clone $_gitroot --depth 1
-  fi
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting make...'
-
-  cd $srcdir
-
-  # Cleanup and prepare the build dir
-  [ -d build ] && rm -rf build
-  cp -r $_gitname build
-  cd build
-
-  #cd $srcdir/Mesa-$pkgver
-
-  autoreconf -vfi
-  ./autogen.sh --prefix=/usr \
-    --enable-egl \
-    --enable-gallium-egl \
-    --enable-gallium-gbm \
-    --enable-gbm \
-    --enable-openvg \
-    --with-clang-libdir=/usr/lib \
-  make
-}
-
-package() {
-  #make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
-
-  cd $srcdir/build
-  install -m755 -d $pkgdir/usr/include/EGL
-  install -m755 -d $pkgdir/usr/lib/egl
-  install -m755 -d $pkgdir/usr/lib/pkgconfig
-  install -m755 -d $pkgdir/usr/share/doc/${pkgname%-git}
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git}
-  bin/minstall include/EGL/*          $pkgdir/usr/include/EGL
-  bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib
-  bin/minstall lib/libEGL.so*         $pkgdir/usr/lib
-  bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl
-  bin/minstall src/egl/main/egl.pc    $pkgdir/usr/lib/pkgconfig
-  bin/minstall docs/egl.html          $pkgdir/usr/share/doc/${pkgname%-git}
-  bin/minstall docs/COPYING           $pkgdir/usr/share/licenses/${pkgname%-git}
-  bin/minstall docs/license.html      $pkgdir/usr/share/licenses/${pkgname%-git}
-}
diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index d2d0d4bbe..8b8a5c7dd 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -1,5 +1,12 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
+_d3d1x=false
+_openvg=true
+_va=false
+_vdpau=true
+_wayland=false
+_xorg=true
+_xvmc=true
 pkgbase=mesa-git
 pkgname=(
   mesa-git
@@ -7,32 +14,61 @@ pkgname=(
 true && pkgname=(
   khrplatform-devel-git
   libcl-libre-git
-  libegl-wayland-git
   libgbm-git
   libgl-gallium-git
   libgl-git
   libglapi-git
   libgles-git
-  libvg-git
-  libwayland-egl-git
   osmesa-git
   ati-dri-git
   intel-gallium-dri-git
   intel-dri-git
   nouveau-dri-git
- #ati-va-git
- #nouveau-va-git
- #soft-va-git
-  ati-vdpau-git
-  nouveau-vdpau-git
-  soft-vdpau-git
-  ati-xvmc-git
-  nouveau-xvmc-git
-  soft-xvmc-git
   mesa-git
 )
-true && pkgver=9.0.0.git20120907
-true && pkgrel=2
+if [ $_openvg = true ]; then
+  pkgname+=(   
+    libvg-git
+  ) 
+fi
+if [ $_va = true ]; then
+  pkgname+=(
+    ati-va-git 
+    soft-va-git
+  )
+fi
+if [ $_vdpau = true ]; then
+  pkgname+=(
+    ati-vdpau-git
+    nouveau-vdpau-git
+    soft-vdpau-git
+  )
+fi
+if [ $_wayland = true ]; then
+  pkgname+=(
+    libegl-wayland-git
+  )
+else
+  pkgname+=(    
+    libegl-git
+  )
+fi
+if [ $_xorg = true ]; then
+  pkgname+=(
+    ati-xorg-git
+    intel-xorg-git
+    nouveau-xorg-git
+  )
+fi
+if [ $_xvmc = true ]; then
+  pkgname+=(
+    ati-xvmc-git
+    nouveau-xvmc-git
+    soft-xvmc-git
+  )
+fi
+true && pkgver=9.0.0.git20120908
+true && pkgrel=1
 _mesaver=9.0
 arch=(
   i686
@@ -40,39 +76,61 @@ arch=(
   mips64el
 )
 makedepends=(
-  clang             # needed for compilation
-  git               # needed for git source
-  glproto-git       # needed for compilation
-  imake             # needed for compilation
-  libdrm-git        # needed for compilation
-  libgbm-git        # needed for 'make install' (ld error)
-  libgl-git         # needed for 'make install' (ld error)
- #libva             # for va support
-  libvdpau          # for vdpau support
-  libvg-git         # needed for 'make install' (ld error)
-  libxdamage        # needed for compilation
-  libxml2           # needed for compilation
-  libxxf86vm        # needed for compilation
-  libxvmc           # for xvmc support
-  llvm              # for llvm support
-  python2           # needed for compilation
-  wayland           # for wayland support
- #wine              # for d3d1x api support
-  xf86driproto      # needed for compilation error
-  xorg-server-devel # for xorg suport
+  clang               # needed for compilation
+  git                 # needed for git source
+  glproto-git         # needed for compilation
+  imake               # needed for compilation
+  libdrm-git          # needed for compilation
+  libgbm-git          # needed for 'make install' (ld error)
+  libgl-git           # needed for 'make install' (ld error)
+  libxdamage          # needed for compilation
+  libxml2             # needed for compilation
+  libxxf86vm          # needed for compilation
+  llvm                # for llvm support
+  python2             # needed for compilation
 )
+if [ $_d3d1x = true ]; then
+  makedepends+=(
+    wine
+  )
+fi
+if [ $_openvg = true ]; then
+  makedepends+=(
+    libvg-git         # needed for 'make install' (ld error)
+  )
+fi
+if [ $_va = true ]; then
+  makedepends+=(
+    libva
+  )
+fi
+if [ $_vdpau = true ]; then
+  makedepends+=(
+    libvdpau
+  )
+fi
+if [ $_wayland = true ]; then
+  makedepends+=(
+    wayland
+  )
+fi
+if [ $_xorg = true ]; then
+  makedepends+=(
+    xf86driproto
+    xorg-server-devel
+  )
+fi
+if [ $_xvmc = true ]; then
+  makedepends+=(
+    libxvmc
+  )
+fi
 license=(
   MIT
   Khronos
   LGPL
 )
 url=http://mesa3d.sourceforge.net
-#source=(
-#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-#)
-#sha512sums=(
-#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
-#)
 
 _gitroot=git://anongit.freedesktop.org/git/${pkgbase%-git}/${pkgbase%-git}
 _gitname=${pkgbase%-git}
@@ -96,8 +154,30 @@ build() {
 
   #cd $srcdir/Mesa-$pkgver
 
-  autoreconf -vfi
+  if [ $_d3d1x = true ]; then
+    D3D1X_FLAG=--enable-d3d1x
+  fi
+  if [ $_openvg = true ]; then
+    OPENVG_FLAG=--enable-openvg
+  fi
+  if [ $_va = true ]; then
+    VA_FLAG=--enable-va
+  fi
+  if [ $_vdpau = true ]; then
+    VDPAU_FLAG=--enable-vdpau
+  fi
+  if [ $_wayland = true ]; then
+    WAYLAND_FLAG=--with-egl-platforms=drm,x11,wayland
+  fi
+  if [ $_xorg = true ]; then
+    XORG_FLAG=--enable-xorg
+  fi
+  if [ $_xvmc = true ]; then
+    XVMC_FLAG=--enable-xvmc
+  fi
+
   ./autogen.sh --prefix=/usr \
+    $D3D1X_FLAG \
     --enable-dri \
     --enable-egl \
     --enable-gallium-egl \
@@ -110,23 +190,23 @@ build() {
     --enable-glx \
     --enable-glx-tls \
     --enable-opencl \
-    --enable-openvg \
+    --enable-opengl \
+    $OPENVG_FLAG \
     --enable-osmesa \
     --enable-r600-llvm-compiler \
     --enable-shared-glapi \
     --enable-texture-float \
+    $VA_FLAG \
+    $VDPAU_FLAG \
     --enable-xa \
-    --enable-xorg \
-    --enable-xvmc \
-    --enable-vdpau \
+    $XORG_FLAG \
+    $XVMC_FLAG \
+    $WAYLAND_FLAG \
     --with-clang-libdir=/usr/lib \
-    --with-egl-platforms=drm,x11,wayland \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
     --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast
-    #--enable-d3d1x \
-    #--enable-va \
-  make
+  make V=0
 }
 
 package_khrplatform-devel-git() {
@@ -152,7 +232,8 @@ package_libcl-libre-git() {
     libdrm-git
     libffi
     libxcb
-    udev
+    systemd
+   #udev
   )
   conflicts=(
     libcl
@@ -185,15 +266,20 @@ package_libegl-wayland-git() {
     libgbm-git
     libxext
     libxfixes
-    libvg-git
     wayland
   )
+  if [ $_openvg = true ]; then
+    depends+=(
+      libvg-git
+    )
+  fi
   conflicts=(
     libegl
     libegl-wayland
   )
   provides=(
     libegl=$_mesaver
+    libegl-git=$_mesaver
     libegl-wayland=$_mesaver
   )
   pkgdesc='Mesa EGL libraries and headers, with wayland Support'
@@ -208,6 +294,52 @@ package_libegl-wayland-git() {
  #install -m755 -d $pkgdir/usr/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/doc/libegl
   install -m755 -d $pkgdir/usr/share/licenses/libegl
+ #install -Dm644 include/EGL/*                                 $pkgdir/usr/include/EGL
+ #install -Dm644 src/egl/main/libEGL.la                        $pkgdir/usr/lib
+ #install -Dm644 lib/libEGL.so*                                $pkgdir/usr/lib
+ #install -Dm644 src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib
+ #install -Dm644 lib/libwayland-egl.so*                        $pkgdir/usr/lib
+ #install -Dm644 lib/egl/egl_gallium.so                        $pkgdir/usr/lib/egl
+ #install -Dm644 src/egl/main/egl.pc                           $pkgdir/usr/lib/pkgconfig
+ #install -Dm644 src/egl/wayland/wayland-egl/wayland-egl.pc    $pkgdir/usr/lib/pkgconfig
+  install -Dm644 docs/egl.html                                 $pkgdir/usr/share/doc/libegl
+  install -Dm644 docs/COPYING                                  $pkgdir/usr/share/licenses/libegl
+  install -Dm644 docs/license.html                             $pkgdir/usr/share/licenses/libegl
+}
+
+package_libegl-git() {
+  depends=(
+    khrplatform-devel-git
+    libgbm-git
+    libxext
+    libxfixes
+  )
+  if [ $_openvg = true ]; then
+    depends+=(
+      libvg-git
+    )
+  fi
+  conflicts=(
+    libegl
+    libegl-wayland
+  )
+  provides=(
+    libegl=$_mesaver
+    libegl-git=$_mesaver
+    libegl-wayland=$_mesaver
+  )
+  pkgdesc='Mesa EGL libraries and headers'
+
+  make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+  rm -fvr $pkgdir/usr/include/KHR
+ #install -m755 -d $pkgdir/usr/include/EGL
+ #install -m755 -d $pkgdir/usr/lib/egl
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
+  install -m755 -d $pkgdir/usr/share/doc/libegl
+  install -m755 -d $pkgdir/usr/share/licenses/libegl
  #install -Dm644 include/EGL/*          $pkgdir/usr/include/EGL
  #install -Dm644 src/egl/main/libEGL.la $pkgdir/usr/lib
  #install -Dm644 lib/libEGL.so*         $pkgdir/usr/lib
@@ -225,7 +357,8 @@ package_libgbm-git() {
     libffi
     libglapi-git
     libxcb
-    udev
+    systemd
+   #udev
   )
   conflicts=(
     libgbm
@@ -268,6 +401,7 @@ package_libgl-gallium-git() {
   )
   provides=(
     libgl=$_mesaver
+    libgl-git=$_mesaver
     libgl-gallium=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer'
@@ -278,16 +412,19 @@ package_libgl-gallium-git() {
 
   cd $srcdir/build
  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/lib/xorg/modules/extensions
   install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
- #install -Dm644 src/glx/libGL.la                   $pkgdir/usr/lib
- #install -Dm644 lib/libGL.so*                      $pkgdir/usr/lib
- #install -Dm644 src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib
- #install -Dm644 lib/libdricore*.so*                $pkgdir/usr/lib
- #install -Dm644 lib/gallium/swrast_dri.so          $pkgdir/usr/lib/xorg/modules/dri
-  install -Dm644 docs/libGL.txt                     $pkgdir/usr/share/doc/libgl
-  install -Dm644 docs/COPYING                       $pkgdir/usr/share/licenses/libgl
-  install -Dm644 docs/license.html                  $pkgdir/usr/share/licenses/libgl
+ #ln -s libdricore$_mesaver.so.1.0.0 $pkgdir/usr/lib/libdricore.so
+  ln -s libglx.xorg                  $pkgdir/usr/lib/xorg/modules/extensions/libglx.so
+ #install -Dm644 src/glx/libGL.la                           $pkgdir/usr/lib
+ #install -Dm644 lib/libGL.so*                              $pkgdir/usr/lib
+ #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib
+ #install -Dm644 lib/libdricore$_mesaver.so*                $pkgdir/usr/lib
+ #install -Dm644 lib/gallium/swrast_dri.so                  $pkgdir/usr/lib/xorg/modules/dri
+  install -Dm644 docs/libGL.txt                             $pkgdir/usr/share/doc/libgl
+  install -Dm644 docs/COPYING                               $pkgdir/usr/share/licenses/libgl
+  install -Dm644 docs/license.html                          $pkgdir/usr/share/licenses/libgl
 }
 
 package_libgl-git() {
@@ -306,6 +443,7 @@ package_libgl-git() {
   provides=(
     libgl=$_mesaver
     libgl-gallium=$_mesaver
+    libgl-gallium-git=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer'
 
@@ -315,17 +453,20 @@ package_libgl-git() {
 
   cd $srcdir/build
  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/lib/xorg/modules/extensions
   install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
- #install -Dm644 src/glx/libGL.la                          $pkgdir/usr/lib
- #install -Dm644 lib/libGL.so*                             $pkgdir/usr/lib
- #install -Dm644 src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
- #install -Dm644 lib/libdricore*.so*                       $pkgdir/usr/lib
- #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri
- #install -Dm644 lib/swrast_dri.so                         $pkgdir/usr/lib/xorg/modules/dri
-  install -Dm644 docs/libGL.txt                            $pkgdir/usr/share/doc/libgl
-  install -Dm644 docs/COPYING                              $pkgdir/usr/share/licenses/libgl
-  install -Dm644 docs/license.html                         $pkgdir/usr/share/licenses/libgl
+ #ln -s libdricore$_mesaver.so.1.0.0 $pkgdir/usr/lib/libdricore.so
+  ln -s libglx.xorg                  $pkgdir/usr/lib/xorg/modules/extensions/libglx.so
+ #install -Dm644 src/glx/libGL.la                           $pkgdir/usr/lib
+ #install -Dm644 lib/libGL.so*                              $pkgdir/usr/lib
+ #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib
+ #install -Dm644 lib/libdricore$_mesaver.so*                $pkgdir/usr/lib
+ #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la  $pkgdir/usr/lib/xorg/modules/dri
+ #install -Dm644 lib/swrast_dri.so                          $pkgdir/usr/lib/xorg/modules/dri
+  install -Dm644 docs/libGL.txt                             $pkgdir/usr/share/doc/libgl
+  install -Dm644 docs/COPYING                               $pkgdir/usr/share/licenses/libgl
+  install -Dm644 docs/license.html                          $pkgdir/usr/share/licenses/libgl
 }
 
 package_libglapi-git() {
@@ -412,30 +553,6 @@ package_libvg-git() {
   install -Dm644 docs/license.html           $pkgdir/usr/share/licenses/libvg
 }
 
-package_libwayland-egl-git() {
-  depends=(
-    glibc
-  )
-  conflicts=(
-    libwayland-egl
-  )
-  provides=(
-    libwayland-egl=$_mesaver
-  )
-  pkgdesc='Mesa Wayland-EGL library'
-
-  make -C $srcdir/build/src/egl/wayland/wayland-egl DESTDIR=$pkgdir install
-
-  cd $srcdir/build
- #install -m755 -d $pkgdir/usr/lib/pkgconfig
-  install -m755 -d $pkgdir/usr/share/licenses/libwayland
- #install -Dm644 src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib
- #install -Dm644 lib/libwayland-egl.so*                        $pkgdir/usr/lib
- #install -Dm644 src/egl/wayland/wayland-egl/wayland-egl.pc    $pkgdir/usr/lib/pkgconfig
-  install -Dm644 docs/COPYING                                  $pkgdir/usr/share/licenses/libwayland
-  install -Dm644 docs/license.html                             $pkgdir/usr/share/licenses/libwayland
-}
-
 package_osmesa-git() {
   depends=(
     mesa-git
@@ -481,32 +598,23 @@ package_ati-dri-git() {
   # classic mesa driver for radeon,r200
   make -C $srcdir/build/src/mesa/drivers/dri/r200         DESTDIR=$pkgdir install
   make -C $srcdir/build/src/mesa/drivers/dri/radeon       DESTDIR=$pkgdir install
-  # gallium3D (dri) driver for r300,r600,radeonsi
+  # gallium3D driver for r300,r600,radeonsi
   make -C $srcdir/build/src/gallium/targets/dri-r300      DESTDIR=$pkgdir install
   make -C $srcdir/build/src/gallium/targets/dri-r600      DESTDIR=$pkgdir install
   make -C $srcdir/build/src/gallium/targets/dri-radeonsi  DESTDIR=$pkgdir install
-  # gallium3D (xorg) driver for r300,r600g,radeonsi 
-  make -C $srcdir/build/src/gallium/targets/xorg-r300     DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/xorg-r600     DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/xorg-radeonsi DESTDIR=$pkgdir install
 
   cd $srcdir/build
  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
- #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
   install -m755 -d $pkgdir/usr/share/licenses/ati-dri
   # classic mesa driver for radeon,r200
  #install -Dm644 src/mesa/drivers/dri/r200/r200_dri.la     $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/r200_dri.so                           $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 src/mesa/drivers/dri/radeon/radeon_dri.la $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/radeon_dri.so                         $pkgdir/usr/lib/xorg/modules/dri
-  # gallium3D (dri) driver for r300,r600,radeonsi
+  # gallium3D driver for r300,r600,radeonsi
  #install -Dm644 lib/gallium/r300_dri.so                   $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/gallium/r600_dri.so                   $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/gallium/radeonsi_dri.so               $pkgdir/usr/lib/xorg/modules/dri
-  # gallium3D (xorg) driver for r300,r600g,radeonsi
- #install -Dm644 lib/gallium/r300_drv.so                   $pkgdir/usr/lib/xorg/modules/drivers
- #install -Dm644 lib/gallium/r600g_drv.so                  $pkgdir/usr/lib/xorg/modules/drivers
- #install -Dm644 lib/gallium/radeonsi_drv.so               $pkgdir/usr/lib/xorg/modules/drivers
   install -Dm644 docs/COPYING                              $pkgdir/usr/share/licenses/ati-dri
   install -Dm644 docs/license.html                         $pkgdir/usr/share/licenses/ati-dri
 }
@@ -521,20 +629,18 @@ package_intel-gallium-dri-git() {
   )
   provides=(
     intel-dri=$_mesaver
+    intel-dri-git=$_mesaver
     intel-gallium-dri=$_mesaver
   )
   pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )'
 
   make -C $srcdir/build/src/gallium/targets/dri-i915  DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/xorg-i915 DESTDIR=$pkgdir install
   make -C $srcdir/build/src/mesa/drivers/dri/i965     DESTDIR=$pkgdir install
 
   cd $srcdir/build
  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
- #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
   install -m755 -d $pkgdir/usr/share/licenses/intel-dri
  #install -Dm644 src/gallium/targets/dri-i915/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri
- #install -Dm644 lib/modesetting_drv.so                   $pkgdir/usr/lib/xorg/modules/drivers
  #install -Dm644 src/mesa/drivers/dri/i965/i965_dri.la    $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/i965_dri.so                          $pkgdir/usr/lib/xorg/modules/dri
   install -Dm644 docs/COPYING                             $pkgdir/usr/share/licenses/intel-dri
@@ -552,6 +658,7 @@ package_intel-dri-git() {
   provides=(
     intel-dri=$_mesaver
     intel-gallium-dri=$_mesaver
+    intel-gallium-dri-git=$_mesaver
   )
   pkgdesc='Mesa DRI drivers for Intel'
 
@@ -585,20 +692,64 @@ package_nouveau-dri-git() {
   make -C $srcdir/build/src/mesa/drivers/dri/nouveau     DESTDIR=$pkgdir install
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
   make -C $srcdir/build/src/gallium/targets/dri-nouveau  DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/xorg-nouveau DESTDIR=$pkgdir install
 
   cd $srcdir/build
  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
- #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
   install -m755 -d $pkgdir/usr/share/licenses/nouveau-dri
  #install -Dm644 src/mesa/drivers/dri/nouveau/nouveau_vieux_dri.la $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/nouveau_vieux_dri.so                          $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/gallium/nouveau_dri.so                        $pkgdir/usr/lib/xorg/modules/dri
- #install -Dm644 lib/gallium/nouveau2_drv.so                       $pkgdir/usr/lib/xorg/modules/drivers
   install -Dm644 docs/COPYING                                      $pkgdir/usr/share/licenses/nouveau-dri
   install -Dm644 docs/license.html                                 $pkgdir/usr/share/licenses/nouveau-dri
 }
 
+package_ati-va-git() {
+  depends=(
+    glibc
+  )
+  conflicts=(
+    ati-va
+  )
+  provides=(
+    ati-va=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D VA library for ATI'
+
+  make -C $srcdir/build/src/gallium/targets/va-r300     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/va-r600     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/va-radeonsi DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/va
+  install -m755 -d $pkgdir/usr/share/licenses/ati-va
+ #install -Dm644 lib/gallium/libva_r*00.so*     $pkgdir/usr/lib/va
+ #install -Dm644 lib/gallium/libva_radeonsi.so* $pkgdir/usr/lib/va
+  install -Dm644 docs/COPYING                   $pkgdir/usr/share/licenses/ati-va
+  install -Dm644 docs/license.html              $pkgdir/usr/share/licenses/ati-va
+}
+
+package_soft-va-git() {
+  depends=(
+    glibc
+  )
+  conflicts=(
+    soft-va
+  )
+  provides=(
+    soft-va=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D VA library for Software Rasterizer'
+
+  make -C $srcdir/build/src/gallium/targets/va-softpipe DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/va
+  install -m755 -d $pkgdir/usr/share/licenses/soft-va
+ #install -Dm644 lib/gallium/libva_softpipe.so* $pkgdir/usr/lib/va
+  install -Dm644 docs/COPYING                   $pkgdir/usr/share/licenses/soft-va
+  install -Dm644 docs/license.html              $pkgdir/usr/share/licenses/soft-va
+}
+
 package_ati-vdpau-git() {
   depends=(
     gcc-libs
@@ -638,7 +789,7 @@ package_nouveau-vdpau-git() {
   provides=(
     nouveau-vdpau=$_mesaver
   )
-  pkgdesc='Mesa Gallium3D XvMC library for Nouveau'
+  pkgdesc='Mesa Gallium3D VDPAU library for Nouveau'
 
   make -C $srcdir/build/src/gallium/targets/vdpau-nouveau DESTDIR=$pkgdir install
 
@@ -660,7 +811,7 @@ package_soft-vdpau-git() {
   provides=(
     soft-vdpau=$_mesaver
   )
-  pkgdesc='Mesa Gallium3D XvMC library for Software Rasterizer'
+  pkgdesc='Mesa Gallium3D VDPAU library for Software Rasterizer'
 
   make -C $srcdir/build/src/gallium/targets/vdpau-softpipe DESTDIR=$pkgdir install
 
@@ -672,6 +823,80 @@ package_soft-vdpau-git() {
   install -Dm644 docs/license.html                 $pkgdir/usr/share/licenses/soft-vdpau
 }
 
+package_ati-xorg-git() {
+  depends=(
+    gcc-libs
+    libdrm-git
+  )
+  conflicts=(
+    ati-xorg
+  )
+  provides=(
+    ati-xorg=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D Xorg Drivers for ATI'
+
+  make -C $srcdir/build/src/gallium/targets/xorg-r300     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/xorg-r600     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/xorg-radeonsi DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
+  install -m755 -d $pkgdir/usr/share/licenses/ati-xorg
+  # gallium3D driver for r300,r600g,radeonsi
+ #install -Dm644 lib/gallium/r300_drv.so                   $pkgdir/usr/lib/xorg/modules/drivers
+ #install -Dm644 lib/gallium/r600g_drv.so                  $pkgdir/usr/lib/xorg/modules/drivers
+ #install -Dm644 lib/gallium/radeonsi_drv.so               $pkgdir/usr/lib/xorg/modules/drivers
+  install -Dm644 docs/COPYING                              $pkgdir/usr/share/licenses/ati-xorg
+  install -Dm644 docs/license.html                         $pkgdir/usr/share/licenses/ati-xorg
+}
+
+package_intel-xorg-git() {
+  depends=(
+    gcc-libs
+    libdrm-git
+  )
+  conflicts=(
+    intel-xorg
+  )
+  provides=(
+    intel-xorg=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D Xorg Drivers for Intel'
+
+  make -C $srcdir/build/src/gallium/targets/xorg-i915 DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
+  install -m755 -d $pkgdir/usr/share/licenses/intel-xorg
+ #install -Dm644 lib/modesetting_drv.so                   $pkgdir/usr/lib/xorg/modules/drivers
+  install -Dm644 docs/COPYING                             $pkgdir/usr/share/licenses/intel-xorg
+  install -Dm644 docs/license.html                        $pkgdir/usr/share/licenses/intel-xorg
+}
+
+package_nouveau-xorg-git() {
+  depends=(
+    gcc-libs
+    libdrm-git
+  )
+  conflicts=(
+    nouveau-xorg
+  )
+  provides=(
+    nouveau-xorg=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D Xorg Drivers for Nouveau'
+
+  make -C $srcdir/build/src/gallium/targets/xorg-nouveau DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
+  install -m755 -d $pkgdir/usr/share/licenses/nouveau-xorg
+ #install -Dm644 lib/gallium/nouveau2_drv.so                       $pkgdir/usr/lib/xorg/modules/drivers
+  install -Dm644 docs/COPYING                                      $pkgdir/usr/share/licenses/nouveau-xorg
+  install -Dm644 docs/license.html                                 $pkgdir/usr/share/licenses/nouveau-xorg
+}
+
 package_ati-xvmc-git() {
   depends=(
     gcc-libs
@@ -750,19 +975,11 @@ package_mesa-git() {
     dri2proto
     glproto-git
     libgl-git
+    libglu-git
   )
   optdepends=(
-    'ati-dri-git: for ATI Video Hardware'
-    'intel-dri-git: for Intel Video Hardware'
-    'nouveau-dri-git: for nVidia Video Hardware'
-    'ati-vdpau-git: for VDPAU on ATI Video Hardware'
-    'nouveau-vdpau-git: for VDPAU on nVidia Video Hardware'
-    'soft-vdpau-git: for VDPAU on DRI Software Rasterizer'
-    'ati-xvmc-git: for X11 Video Motion Compensation on ATI Video Hardware'
-    'nouveau-xvmc-git: for X11 Video Motion Compensation on nVidia Video Hardware'
-    'soft-xvmc-git: for X11 Video Motion Compensation on DRI Software Rasterizer'
     'libcl: for OpenCL Graphics Video Hardware Support'
-    'libwayland-egl-git: for Wayland Desktop Graphics'
+    'libegl-wayland-git: for Wayland Desktop Graphics'
     'opengl-man-pages: for the OpenGL API man pages'
   )
   conflicts=(