Fix mesa, make changes smaller.

2 files changed, 14 insertions, 30 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 705d96cd4..4670d4f7a 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -36,14 +36,18 @@ if [ "${_git}" = "true" ]; then
 )
 fi
 source+=(mesa-loongson.patch)
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         'c452ed3392468170726c004c2f4e02ca'
+         'cc5ee15e306b8c15da6a478923797171'
+         '598c24dccfcdcc99c07d883f7c09f36a')
 
 build() {
     cd ${srcdir}/?esa-*
 
    if [ "$CARCH" = "mips64el" ]; then
-     extraconf="--with-gallium-drivers=swrast"
+     extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast"
    else
-     extraconf="--with-gallium-drivers=r300,r600,nouveau,svga,swrast --enable-gallium-llvm --enable-dri --enable-shared-dricore"
+     extraconf="--with-gallium-drivers=r300,r600,svga,swrast --enable-gallium-llvm --with-dri-drivers=i915,i965,r200,radeon,swrast"
    fi
 
     patch -Np1 -i $srcdir/mesa-loongson.patch
@@ -53,9 +57,12 @@ if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-gallium-drivers=$galliumdrivers \
+    --enable-gallium-egl \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
+    --enable-dri \
     --enable-glx \
     --enable-osmesa \
     --enable-gles1 \
@@ -63,6 +70,7 @@ if [ "${_git}" = "true" ]; then
     --enable-egl \
     --enable-texture-float \
     --enable-xa \
+    --enable-shared-dricore \
     $extraconf
     
     #--enable-gbm \
@@ -72,13 +80,11 @@ if [ "${_git}" = "true" ]; then
      autoreconf -vfi
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,swrast \
-    --enable-gallium-llvm \
     --enable-gallium-egl \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
+    --enable-dri \
     --enable-glx \
     --enable-osmesa \
     --enable-gles1 \
@@ -86,6 +92,7 @@ if [ "${_git}" = "true" ]; then
     --enable-egl \
     --enable-texture-float \
     --enable-xa \
+    --enable-shared-dricore \
     $extraconf
 fi
 
@@ -93,18 +100,15 @@ fi
 }
 
 package_libgl() {
-  depends=('libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
+  depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-#  replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-  [[ "$CARCH" != "mips64el" ]] && depends+=('libdrm>=2.4.31')
+  #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
 
   cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib"
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
 
   bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
-
-  if [ "$CARCH" != "mips64el" ]; then
   bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
   bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
 
@@ -113,8 +117,6 @@ package_libgl() {
 
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
-  fi
-
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
 }
@@ -275,10 +277,3 @@ package_svga-dri() {
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
 }
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'cc5ee15e306b8c15da6a478923797171'
-         '598c24dccfcdcc99c07d883f7c09f36a')
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'cc5ee15e306b8c15da6a478923797171'
-         '598c24dccfcdcc99c07d883f7c09f36a')
diff --git a/extra/mesa/mesa-7.5-mips-wmb.patch b/extra/mesa/mesa-7.5-mips-wmb.patch
deleted file mode 100644
index 06c3d1835..000000000
--- a/extra/mesa/mesa-7.5-mips-wmb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mesa-20090921/src/mesa/drivers/dri/sis/sis_context.h.orig	2010-03-31 23:31:37.252554011 +0800
-+++ mesa-20090921/src/mesa/drivers/dri/sis/sis_context.h	2010-03-31 23:32:06.616553941 +0800
-@@ -404,6 +404,8 @@
- #define MMIO_WMB()	__asm __volatile("" : : : "memory")
- #elif defined(__ia64__)
- #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
-+#elif defined(__mips__)
-+#define MMIO_WMB()	__asm __volatile("" : : : "memory")
- #else
- #error platform needs WMB
- #endif