Try to fix mesa build errors due to mips64el changes.

1 files changed, 11 insertions, 35 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 7b8d4c4d6..e43a4acda 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -18,9 +18,9 @@ if [ "${_git}" = "true" ]; then
 fi
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('glproto>=1.4.15' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
+makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
-[[ "$CARCH" != "mips64el" ]] && makedepends+=('libdrm>=2.4.30' 'dri2proto>=2.6' 'llvm')
+[[ "$CARCH" != "mips64el" ]] && makedepends+=('dri2proto>=2.6' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE)
@@ -34,46 +34,27 @@ if [ "${_git}" = "true" ]; then
 	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
 )
 fi
-source+=(mesa-7.5-mips-wmb.patch mesa-loongson.patch)
+source+=(mesa-loongson.patch)
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '24eeebf66971809d8f40775a379b36c9'
-         'c7788f2495060bf133771aef6ad25929'
          '598c24dccfcdcc99c07d883f7c09f36a')
 
 build() {
     cd ${srcdir}/?esa-*
 
+   if [ "$CARCH" = "mips64el" ]; then
+     extraconf="--with-gallium-drivers=swrast"
+   else
+     extraconf="--with-gallium-drivers=r300,r600,nouveau,svga,swrast --enable-gallium-llvm --enable-dri --enable-shared-dricore"
+   fi
 
-if [ "$CARCH" = "mips64el" ]; then
-    # WMB for MIPS patch from Fedora and Gentoo
-    patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch
     patch -Np1 -i $srcdir/mesa-loongson.patch
-
-      configure=configure
-    if [ ! -f configure ]; then
-      autoreconf -vfi
-      configure=autogen.sh 
-    fi
-
-    ./${configure} --prefix=/usr \
-    --enable-glx-tls \
-    --with-driver=xlib \
-    --enable-xcb \
-    --disable-glut \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --disable-gallium-egl
-else
 if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
-    --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
-    --enable-dri \
     --enable-glx \
     --enable-osmesa \
     --enable-gles1 \
@@ -81,7 +62,7 @@ if [ "${_git}" = "true" ]; then
     --enable-egl \
     --enable-texture-float \
     --enable-xa \
-    --enable-shared-dricore
+    $extraconf
     
     #    --enable-gallium-svga \
     
@@ -89,11 +70,8 @@ if [ "${_git}" = "true" ]; then
      autoreconf -vfi
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
-    --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
-    --enable-dri \
     --enable-glx \
     --enable-osmesa \
     --enable-gles1 \
@@ -101,8 +79,7 @@ if [ "${_git}" = "true" ]; then
     --enable-egl \
     --enable-texture-float \
     --enable-xa \
-    --enable-shared-dricore
-fi
+    $extraconf
 fi
 
   make
@@ -177,9 +154,8 @@ package_libgles() {
 }
 
 package_libegl() {
-  depends=('libglapi' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
+  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
-  [[ "$CARCH" != "mips64el" ]] && depends+=('libdrm')
 
   cd ${srcdir}/?esa-*   
   make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install