Merge mesa PKGBUILD changes, untested.

The aim is to have as small changes as practically useful.

1 files changed, 5 insertions, 34 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 82c839668..366f626c4 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -15,7 +15,7 @@ if [ "${_git}" = "true" ]; then
   else
     pkgver=9.0
 fi
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
              'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'systemd')
@@ -43,9 +43,9 @@ build() {
     cd ${srcdir}/?esa-*
 
    if [ "$CARCH" = "mips64el" ]; then
-     extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast"
+     extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau"
    else
-     extraconf="--with-gallium-drivers=r300,r600,svga,swrast --enable-gallium-llvm --with-dri-drivers=i915,i965,r200,radeon,swrast"
+     extraconf=""
    fi
 
     patch -Np1 -i $srcdir/mesa-loongson.patch
@@ -54,35 +54,10 @@ build() {
     COMMONOPTS="--prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-<<<<<<< HEAD
-    --with-gallium-drivers=$galliumdrivers \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore \
-    $extraconf
-    
-    #--enable-gbm \
-    #    --enable-gallium-svga \
-    
-  else
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-=======
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --enable-gallium-llvm \
     --enable-egl \
->>>>>>> c84b2cd310f86dc50c4f52a5907cb17652e8c87c
     --enable-gallium-egl \
     --with-egl-platforms=x11,drm \
     --enable-shared-glapi \
@@ -95,11 +70,8 @@ build() {
     --enable-gles2 \
     --enable-texture-float \
     --enable-xa \
-<<<<<<< HEAD
-    --enable-shared-dricore \
-    $extraconf
-=======
-    --enable-vdpau "
+    --enable-vdpau \
+    $extraconf "
 
 # not default:
 #    --enable-gallium-egl enable optional EGL state tracker (not required for
@@ -115,7 +87,6 @@ if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./configure \
       $COMMONOPTS
->>>>>>> c84b2cd310f86dc50c4f52a5907cb17652e8c87c
 fi
 
     make