X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpkg%2FMesaLib;h=de43784a1f3f0c759aff9e513aa0ffc7d5856365;hb=70abb7e53164cf84ffc6b794c37c4f74ff21b4f8;hp=45e210ba7b544ed576fd21cdee73f4e850949a6a;hpb=ce815aec9d5bd5a16a5fd769419e449976669aaa;p=hvlinux.git

diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index 45e210b..de43784 100644
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -2,31 +2,35 @@
 
 hvconfig_pre()
 {
-    local DRVPTS=""
+    local GAL_OPTS="--with-gallium-drivers=svga,swrast"
 
     if [ -n "${XORG_VIDEO_DRIVER}" ]; then
         case "${XORG_VIDEO_DRIVER}" in
     	    nouveau)
-	        DRVPTS="--with-dri-drivers=nouveau --enable-gallium-nouveau"
+	        GAL_OPTS+=",nouveau"
 	        ;;
 	    intel)
-	        DRVPTS="--with-dri-drivers=i915,i965 --enable-gallium-i915 --enable-gallium-i965"
+                GAL_OPTS+=",i915"
 	        ;;
 	esac
     fi
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --enable-motif \
-        --enable-xcb \
-        ${DRVPTS} \
+    CONFIGURE_OPTS+=" \
+        --enable-texture-float \
+        --enable-gles1 \
+        --enable-gles2 \
+        --enable-openvg \
+        --enable-osmesa \
+        --enable-xa \
+        --enable-gbm \
+        --enable-gallium-egl \
+        --enable-gallium-gbm \
+        --enable-glx-tls \
+        --with-egl-platforms="drm,x11" \
+        ${GAL_OPTS} \
         ${XORG_CONFIG}"
 
     # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS
     # and CXXFLAGS with this command:
     sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${LFS_TMP}/${PACKAGE}/configure
-
-    # Revert effect of automatically applying blfs patch for xdemos (this patch
-    # causes a compilation bug with a missing GL/gl.h include)
-    sed 's@^\(SUBDIRS = src\) xdemos@\1@' -i ${LFS_TMP}/${PACKAGE}/Makefile
 }