Sat Sep 8 00:04:17 UTC 2012

1 files changed, 324 insertions, 179 deletions

diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index e4f96e5ae..d2d0d4bbe 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -17,15 +17,22 @@ true && pkgname=(
   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.git20120906
-true && pkgrel=1
+true && pkgver=9.0.0.git20120907
+true && pkgrel=2
 _mesaver=9.0
 arch=(
   i686
@@ -33,20 +40,27 @@ arch=(
   mips64el
 )
 makedepends=(
-  clang
-  dri2proto
-  git
-  glproto-git
-  imake
-  libdrm-git
-  libxdamage
-  libxml2
-  libxxf86vm
-  libxvmc
-  llvm
-  python2
-  wayland
-) # wine for d3d1x api
+  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
+)
 license=(
   MIT
   Khronos
@@ -102,14 +116,16 @@ build() {
     --enable-shared-glapi \
     --enable-texture-float \
     --enable-xa \
+    --enable-xorg \
     --enable-xvmc \
+    --enable-vdpau \
     --with-clang-libdir=/usr/lib \
     --with-egl-platforms=drm,x11,wayland \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-dri-drivers=i915,i965,r200,nouveau,radeon,swrast \
-    --with-gallium-drivers=r300,r600,nouveau,swrast
+    --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
+    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast
     #--enable-d3d1x \
-  echo -e "\ninstall: " >> src/mesa/drivers/osmesa/Makefile
+    #--enable-va \
   make
 }
 
@@ -118,16 +134,16 @@ package_khrplatform-devel-git() {
     khrplatform-devel
   )
   provides=(
-    khrplatform-devel=${_mesaver}
+    khrplatform-devel=$_mesaver
   )
   pkgdesc='Khronos platform development package'
 
   cd $srcdir/build
   install -m755 -d $pkgdir/usr/include/KHR
   install -m755 -d $pkgdir/usr/share/licenses/khrplatform-devel
-  bin/minstall include/KHR/khrplatform.h $pkgdir/usr/include/KHR
-  bin/minstall docs/COPYING              $pkgdir/usr/share/licenses/khrplatform-devel
-  bin/minstall docs/license.html         $pkgdir/usr/share/licenses/khrplatform-devel
+  install -Dm644 include/KHR/khrplatform.h $pkgdir/usr/include/KHR
+  install -Dm644 docs/COPYING              $pkgdir/usr/share/licenses/khrplatform-devel
+  install -Dm644 docs/license.html         $pkgdir/usr/share/licenses/khrplatform-devel
 }
 
 package_libcl-libre-git() {
@@ -140,9 +156,11 @@ package_libcl-libre-git() {
   )
   conflicts=(
     libcl
+    libcl-libre
   )
   provides=(
     libcl
+    libcl-libre
   )
   replaces=(
     libcl
@@ -152,13 +170,13 @@ package_libcl-libre-git() {
   make -C $srcdir/build/src/gallium/targets/opencl DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/opencl
+ #install -m755 -d $pkgdir/usr/lib/opencl
   install -m755 -d $pkgdir/usr/share/licenses/libcl
-  #bin/minstall src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib
-  #bin/minstall lib/libOpenCL.so*                       $pkgdir/usr/lib
-  #bin/minstall src/gallium/targets/pipe-loader/*.so    $pkgdir/usr/lib/opencl
-  bin/minstall docs/COPYING                            $pkgdir/usr/share/licenses/libcl
-  bin/minstall docs/license.html                       $pkgdir/usr/share/licenses/libcl
+ #install -Dm644 src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib
+ #install -Dm644 lib/libOpenCL.so*                       $pkgdir/usr/lib
+ #install -Dm644 src/gallium/targets/pipe-loader/*.so    $pkgdir/usr/lib/opencl
+  install -Dm644 docs/COPYING                            $pkgdir/usr/share/licenses/libcl
+  install -Dm644 docs/license.html                       $pkgdir/usr/share/licenses/libcl
 }
 
 package_libegl-wayland-git() {
@@ -172,32 +190,32 @@ package_libegl-wayland-git() {
   )
   conflicts=(
     libegl
-    libegl-git
     libegl-wayland
   )
   provides=(
     libegl=$_mesaver
-    libegl-git=$_mesaver
+    libegl-wayland=$_mesaver
   )
   pkgdesc='Mesa EGL libraries and headers, with wayland Support'
 
-  #make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
+  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
+  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
-  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/libegl
-  bin/minstall docs/COPYING           $pkgdir/usr/share/licenses/libegl
-  bin/minstall docs/license.html      $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 lib/egl/egl_gallium.so $pkgdir/usr/lib/egl
+ #install -Dm644 src/egl/main/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_libgbm-git() {
@@ -217,22 +235,22 @@ package_libgbm-git() {
   )
   pkgdesc='Mesa GBM libraries and header'
 
-  #make -C $srcdir/build/src/gbm                 DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gbm                 DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  install -m755 -d $pkgdir/usr/lib/include
-  install -m755 -d $pkgdir/usr/lib/gbm
-  install -m755 -d $pkgdir/usr/lib/pkgconfig
+ #install -m755 -d $pkgdir/usr/lib/include
+ #install -m755 -d $pkgdir/usr/lib/gbm
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/licenses/libgbm
-  bin/minstall src/gbm/main/gbm.h                         $pkgdir/usr/include
-  bin/minstall src/gbm/libgbm.la                          $pkgdir/usr/lib
-  bin/minstall lib/libgbm.so*                             $pkgdir/usr/lib
-  bin/minstall src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm
-  bin/minstall src/gallium/targets/pipe-loader/*.so       $pkgdir/usr/lib/gbm
-  bin/minstall src/gbm/main/gbm.pc                        $pkgdir/usr/lib/pkgconfig
-  bin/minstall docs/COPYING                               $pkgdir/usr/share/licenses/libgbm
-  bin/minstall docs/license.html                          $pkgdir/usr/share/licenses/libgbm
+ #install -Dm644 src/gbm/main/gbm.h                         $pkgdir/usr/include
+ #install -Dm644 src/gbm/libgbm.la                          $pkgdir/usr/lib
+ #install -Dm644 lib/libgbm.so*                             $pkgdir/usr/lib
+ #install -Dm644 src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm
+ #install -Dm644 src/gallium/targets/pipe-loader/*.so       $pkgdir/usr/lib/gbm
+ #install -Dm644 src/gbm/main/gbm.pc                        $pkgdir/usr/lib/pkgconfig
+  install -Dm644 docs/COPYING                               $pkgdir/usr/share/licenses/libgbm
+  install -Dm644 docs/license.html                          $pkgdir/usr/share/licenses/libgbm
 }
 
 package_libgl-gallium-git() {
@@ -246,30 +264,30 @@ package_libgl-gallium-git() {
   )
   conflicts=(
     libgl
-    libgl-git
+    libgl-gallium
   )
   provides=(
     libgl=$_mesaver
-    libgl-git=$_mesaver
+    libgl-gallium=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer'
 
-  #make -C $srcdir/build/src/glx                        DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/mesa/libdricore            DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/glx                        DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mesa/libdricore            DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
   install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
-  bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
-  bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
-  bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
-  bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
-  bin/minstall lib/gallium/swrast_dri.so                 $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall docs/libGL.txt                            $pkgdir/usr/share/doc/libgl
-  bin/minstall docs/COPYING                              $pkgdir/usr/share/licenses/libgl
-  bin/minstall docs/license.html                         $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
 }
 
 package_libgl-git() {
@@ -283,31 +301,31 @@ package_libgl-git() {
   )
   conflicts=(
     libgl
-    libgl-gallium-git
+    libgl-gallium
   )
   provides=(
     libgl=$_mesaver
-    libgl-gallium-git=$_mesaver
+    libgl-gallium=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer'
 
-  #make -C $srcdir/build/src/glx                     DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/mesa/libdricore         DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/glx                     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mesa/libdricore         DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
   install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
-  bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
-  bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
-  bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
-  bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
-  bin/minstall src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall lib/swrast_dri.so                         $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall docs/libGL.txt                            $pkgdir/usr/share/doc/libgl
-  bin/minstall docs/COPYING                              $pkgdir/usr/share/licenses/libgl
-  bin/minstall docs/license.html                         $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
 }
 
 package_libglapi-git() {
@@ -325,12 +343,12 @@ package_libglapi-git() {
   make -C $srcdir/build/src/mapi/shared-glapi DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib
+ #install -m755 -d $pkgdir/usr/lib
   install -m755 -d $pkgdir/usr/share/licenses/libglapi
-  #bin/minstall src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib
-  #bin/minstall lib/libglapi.so*                  $pkgdir/usr/lib
-  bin/minstall docs/COPYING                      $pkgdir/usr/share/licenses/libglapi
-  bin/minstall docs/license.html                 $pkgdir/usr/share/licenses/libglapi
+ #install -Dm644 src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib
+ #install -Dm644 lib/libglapi.so*                  $pkgdir/usr/lib
+  install -Dm644 docs/COPYING                      $pkgdir/usr/share/licenses/libglapi
+  install -Dm644 docs/license.html                 $pkgdir/usr/share/licenses/libglapi
 }
 
 package_libgles-git() {
@@ -347,23 +365,23 @@ package_libgles-git() {
   )
   pkgdesc='Mesa GLES libraries and headers'
 
-  #make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  install -m755 -d $pkgdir/usr/include/GLES
-  install -m755 -d $pkgdir/usr/include/GLES2
-  install -m755 -d $pkgdir/usr/lib/pkgconfig
+ #install -m755 -d $pkgdir/usr/include/GLES
+ #install -m755 -d $pkgdir/usr/include/GLES2
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/licenses/libgles
-  bin/minstall include/GLES/*                  $pkgdir/usr/include/GLES
-  bin/minstall include/GLES2/*                 $pkgdir/usr/include/GLES2
-  bin/minstall src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib
-  bin/minstall src/mapi/es2api/libGLESv2.la    $pkgdir/usr/lib
-  bin/minstall lib/libGLESv*.so*               $pkgdir/usr/lib
-  bin/minstall src/mapi/es1api/glesv1_cm.pc    $pkgdir/usr/lib/pkgconfig
-  bin/minstall src/mapi/es2api/glesv2.pc       $pkgdir/usr/lib/pkgconfig
-  bin/minstall docs/COPYING                    $pkgdir/usr/share/licenses/libgles
-  bin/minstall docs/license.html               $pkgdir/usr/share/licenses/libgles
+ #install -Dm644 include/GLES/*                  $pkgdir/usr/include/GLES
+ #install -Dm644 include/GLES2/*                 $pkgdir/usr/include/GLES2
+ #install -Dm644 src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib
+ #install -Dm644 src/mapi/es2api/libGLESv2.la    $pkgdir/usr/lib
+ #install -Dm644 lib/libGLESv*.so*               $pkgdir/usr/lib
+ #install -Dm644 src/mapi/es1api/glesv1_cm.pc    $pkgdir/usr/lib/pkgconfig
+ #install -Dm644 src/mapi/es2api/glesv2.pc       $pkgdir/usr/lib/pkgconfig
+  install -Dm644 docs/COPYING                    $pkgdir/usr/share/licenses/libgles
+  install -Dm644 docs/license.html               $pkgdir/usr/share/licenses/libgles
 }
 
 package_libvg-git() {
@@ -381,17 +399,17 @@ package_libvg-git() {
   make -C $srcdir/build/src/mapi/vgapi DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/include/VG
-  #install -m755 -d $pkgdir/usr/lib/pkgconfig
-  #install -m755 -d $pkgdir/usr/share/doc/libvg
+ #install -m755 -d $pkgdir/usr/include/VG
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
+  install -m755 -d $pkgdir/usr/share/doc/libvg
   install -m755 -d $pkgdir/usr/share/licenses/libvg
-  #bin/minstall include/VG/*                $pkgdir/usr/include/VG
-  #bin/minstall src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib
-  #bin/minstall lib/libOpenVG.so*           $pkgdir/usr/lib
-  #bin/minstall src/mapi/vgapi/vg.pc        $pkgdir/usr/lib/pkgconfig
-  #bin/minstall docs/openvg.html            $pkgdir/usr/share/doc/libvg
-  bin/minstall docs/COPYING                $pkgdir/usr/share/licenses/libvg
-  bin/minstall docs/license.html           $pkgdir/usr/share/licenses/libvg
+ #install -Dm644 include/VG/*                $pkgdir/usr/include/VG
+ #install -Dm644 src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib
+ #install -Dm644 lib/libOpenVG.so*           $pkgdir/usr/lib
+ #install -Dm644 src/mapi/vgapi/vg.pc        $pkgdir/usr/lib/pkgconfig
+  install -Dm644 docs/openvg.html            $pkgdir/usr/share/doc/libvg
+  install -Dm644 docs/COPYING                $pkgdir/usr/share/licenses/libvg
+  install -Dm644 docs/license.html           $pkgdir/usr/share/licenses/libvg
 }
 
 package_libwayland-egl-git() {
@@ -409,13 +427,13 @@ package_libwayland-egl-git() {
   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/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/licenses/libwayland
-  #bin/minstall src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib
-  #bin/minstall lib/libwayland-egl.so*                        $pkgdir/usr/lib
-  #bin/minstall src/egl/wayland/wayland-egl/wayland-egl.pc    $pkgdir/usr/lib/pkgconfig
-  bin/minstall docs/COPYING                                  $pkgdir/usr/share/licenses/libwayland
-  bin/minstall docs/license.html                             $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() {
@@ -436,15 +454,15 @@ package_osmesa-git() {
   make -C $srcdir/build/src/mesa/drivers/osmesa DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/pkgconfig
-  #install -m755 -d $pkgdir/usr/share/doc/osmesa
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
+  install -m755 -d $pkgdir/usr/share/doc/osmesa
   install -m755 -d $pkgdir/usr/share/licenses/osmesa
-  #bin/minstall src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib
-  #bin/minstall lib/libOSMesa.so*                    $pkgdir/usr/lib
-  #bin/minstall src/mesa/drivers/osmesa/osmesa.pc    $pkgdir/usr/lib/pkgconfig
-  #bin/minstall docs/osmesa.html                     $pkgdir/usr/share/doc/osmesa
-  bin/minstall docs/COPYING                         $pkgdir/usr/share/licenses/osmesa
-  bin/minstall docs/license.html                    $pkgdir/usr/share/licenses/osmesa
+ #install -Dm644 src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib
+ #install -Dm644 lib/libOSMesa.so*                    $pkgdir/usr/lib
+ #install -Dm644 src/mesa/drivers/osmesa/osmesa.pc    $pkgdir/usr/lib/pkgconfig
+  install -Dm644 docs/osmesa.html                     $pkgdir/usr/share/doc/osmesa
+  install -Dm644 docs/COPYING                         $pkgdir/usr/share/licenses/osmesa
+  install -Dm644 docs/license.html                    $pkgdir/usr/share/licenses/osmesa
 }
 
 package_ati-dri-git() {
@@ -458,26 +476,69 @@ package_ati-dri-git() {
   provides=(
     ati-dri=$_mesaver
   )
-  pkgdesc='Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon'
+  pkgdesc='Mesa DRI radeon/r200 + Gallium3D r300,r600,radeonsi drivers for AMD/ATI Radeon'
 
-  # classic mesa driver for R300 r300_dri.so
-  #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 driver for R300 r300_dri.so
-  #make -C $srcdir/build/src/gallium/targets/dri-r300 DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/dri-r600 DESTDIR=$pkgdir install
+  # 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
+  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/dri
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
   install -m755 -d $pkgdir/usr/share/licenses/ati-dri
-  # classic mesa driver for R300 r300_dri.so
-  bin/minstall lib/r200_dri.so         $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall lib/radeon_dri.so       $pkgdir/usr/lib/xorg/modules/dri
-  # gallium3D driver for R300 r300_dri.so
-  bin/minstall lib/gallium/r300_dri.so $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall lib/gallium/r600_dri.so $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall docs/COPYING            $pkgdir/usr/share/licenses/ati-dri
-  bin/minstall docs/license.html       $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
+ #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
+}
+
+package_intel-gallium-dri-git() {
+  depends=(
+    libgl-git
+  )
+  conflicts=(
+    intel-dri
+    intel-gallium-dri
+  )
+  provides=(
+    intel-dri=$_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
+  install -Dm644 docs/license.html                        $pkgdir/usr/share/licenses/intel-dri
 }
 
 package_intel-dri-git() {
@@ -486,22 +547,26 @@ package_intel-dri-git() {
   )
   conflicts=(
     intel-dri
+    intel-gallium-dri
   )
   provides=(
     intel-dri=$_mesaver
+    intel-gallium-dri=$_mesaver
   )
   pkgdesc='Mesa DRI drivers for Intel'
 
-  #make -C $srcdir/build/src/mesa/drivers/dri/i915 DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/mesa/drivers/dri/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/dri
   install -m755 -d $pkgdir/usr/share/licenses/intel-dri
-  bin/minstall lib/i915_dri.so   $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall lib/i965_dri.so   $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall docs/COPYING      $pkgdir/usr/share/licenses/intel-dri
-  bin/minstall docs/license.html $pkgdir/usr/share/licenses/intel-dri
+ #install -Dm644 src/mesa/drivers/dri/i915/i915_dri.la       $pkgdir/usr/lib/xorg/modules/dri
+ #install -Dm644 src/mesa/drivers/dri/i915/.libs/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri
+ #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
+  install -Dm644 docs/license.html                           $pkgdir/usr/share/licenses/intel-dri
 }
 
 package_nouveau-dri-git() {
@@ -517,17 +582,94 @@ package_nouveau-dri-git() {
   pkgdesc='Mesa classic DRI + Gallium3D drivers for Nouveau'
 
   # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  #make -C $srcdir/build/src/mesa/drivers/dri/nouveau    DESTDIR=$pkgdir install
+  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/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/dri
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers
   install -m755 -d $pkgdir/usr/share/licenses/nouveau-dri
-  bin/minstall lib/nouveau_vieux_dri.so   $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall lib/gallium/nouveau_dri.so $pkgdir/usr/lib/xorg/modules/dri
-  bin/minstall docs/COPYING               $pkgdir/usr/share/licenses/nouveau-dri
-  bin/minstall docs/license.html          $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-vdpau-git() {
+  depends=(
+    gcc-libs
+    libdrm-git
+    libx11
+  )
+  conflicts=(
+    ati-vdpau
+  )
+  provides=(
+    ati-vdpau=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D VDPAU libraries for ATI'
+
+  make -C $srcdir/build/src/gallium/targets/vdpau-r300     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/vdpau-r600     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/vdpau-radeonsi DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/vdpau
+  install -m755 -d $pkgdir/usr/share/licenses/ati-vdpau
+ #install -Dm644 lib/gallium/libvdpau_r*00.so*     $pkgdir/usr/lib/vdpau
+ #install -Dm644 lib/gallium/libvdpau_radeonsi.so* $pkgdir/usr/lib/vdpau
+  install -Dm644 docs/COPYING                      $pkgdir/usr/share/licenses/ati-vdpau
+  install -Dm644 docs/license.html                 $pkgdir/usr/share/licenses/ati-vdpau
+}
+
+package_nouveau-vdpau-git() {
+  depends=(
+    gcc-libs
+    libdrm-git
+    libx11
+  )
+  conflicts=(
+    nouveau-vdpau
+  )
+  provides=(
+    nouveau-vdpau=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D XvMC library for Nouveau'
+
+  make -C $srcdir/build/src/gallium/targets/vdpau-nouveau DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/vdpau
+  install -m755 -d $pkgdir/usr/share/licenses/nouveau-vdpau
+ #install -Dm644 lib/gallium/libvdpau_nouveau.so* $pkgdir/usr/lib/vdpau
+  install -Dm644 docs/COPYING                     $pkgdir/usr/share/licenses/nouveau-vdpau
+  install -Dm644 docs/license.html                $pkgdir/usr/share/licenses/nouveau-vdpau
+}
+
+package_soft-vdpau-git() {
+  depends=(
+    gcc-libs
+  )
+  conflicts=(
+    soft-vdpau
+  )
+  provides=(
+    soft-vdpau=$_mesaver
+  )
+  pkgdesc='Mesa Gallium3D XvMC library for Software Rasterizer'
+
+  make -C $srcdir/build/src/gallium/targets/vdpau-softpipe DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/vdpau
+  install -m755 -d $pkgdir/usr/share/licenses/soft-vdpau
+ #install -Dm644 lib/gallium/libvdpau_softpipe.so* $pkgdir/usr/lib/vdpau
+  install -Dm644 docs/COPYING                      $pkgdir/usr/share/licenses/soft-vdpau
+  install -Dm644 docs/license.html                 $pkgdir/usr/share/licenses/soft-vdpau
 }
 
 package_ati-xvmc-git() {
@@ -544,15 +686,15 @@ package_ati-xvmc-git() {
   )
   pkgdesc='Mesa Gallium3D XvMC libraries for ATI'
 
-  make -C $srcdir/build/src/gallium/targets/xvmc-r300 DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/xvmc-r600 DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/xvmc-r300     DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/xvmc-r600     DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib
+ #install -m755 -d $pkgdir/usr/lib
   install -m755 -d $pkgdir/usr/share/licenses/ati-xvmc
-  #bin/minstall lib/gallium/libXvMCr?00.so* $pkgdir/usr/lib
-  bin/minstall docs/COPYING                $pkgdir/usr/share/licenses/libxvmc
-  bin/minstall docs/license.html           $pkgdir/usr/share/licenses/libxvmc
+ #install -Dm644 lib/gallium/libXvMCr*00.so*     $pkgdir/usr/lib
+  install -Dm644 docs/COPYING                    $pkgdir/usr/share/licenses/ati-xvmc
+  install -Dm644 docs/license.html               $pkgdir/usr/share/licenses/ati-xvmc
 }
 
 package_nouveau-xvmc-git() {
@@ -572,11 +714,11 @@ package_nouveau-xvmc-git() {
   make -C $srcdir/build/src/gallium/targets/xvmc-nouveau DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib
+ #install -m755 -d $pkgdir/usr/lib
   install -m755 -d $pkgdir/usr/share/licenses/nouveau-xvmc
-  #bin/minstall lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib
-  bin/minstall docs/COPYING                   $pkgdir/usr/share/licenses/nouveau-xvmc
-  bin/minstall docs/license.html              $pkgdir/usr/share/licenses/nouveau-xvmc
+ #install -Dm644 lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib
+  install -Dm644 docs/COPYING                   $pkgdir/usr/share/licenses/nouveau-xvmc
+  install -Dm644 docs/license.html              $pkgdir/usr/share/licenses/nouveau-xvmc
 }
 
 package_soft-xvmc-git() {
@@ -596,11 +738,11 @@ package_soft-xvmc-git() {
   make -C $srcdir/build/src/gallium/targets/xvmc-softpipe DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib
+ #install -m755 -d $pkgdir/usr/lib
   install -m755 -d $pkgdir/usr/share/licenses/soft-xvmc
-  #bin/minstall lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib
-  bin/minstall docs/COPYING                    $pkgdir/usr/share/licenses/soft-xvmc
-  bin/minstall docs/license.html               $pkgdir/usr/share/licenses/soft-xvmc
+ #install -Dm644 lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib
+  install -Dm644 docs/COPYING                    $pkgdir/usr/share/licenses/soft-xvmc
+  install -Dm644 docs/license.html               $pkgdir/usr/share/licenses/soft-xvmc
 }
 
 package_mesa-git() {
@@ -613,6 +755,9 @@ package_mesa-git() {
     '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'
@@ -630,11 +775,11 @@ package_mesa-git() {
 
   cd $srcdir/build
   make DESTDIR=$pkgdir install
-  rm -fr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h}
-  rm -fr $pkgdir/usr/lib/{egl,gbm,opencl,xorg}
-  rm -f  $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*}
-  rm -f  $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc}
+  rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h}
+  rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg}
+  rm -fv  $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*}
+  rm -fv  $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc}
   install -m755 -d $pkgdir/usr/share/licenses/mesa
-  bin/minstall docs/COPYING      $pkgdir/usr/share/licenses/mesa
-  bin/minstall docs/license.html $pkgdir/usr/share/licenses/mesa
+  install -Dm644 docs/COPYING      $pkgdir/usr/share/licenses/mesa
+  install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa
 }