X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpkg%2FMesaLib;h=38b5af0b4beea8aae88f7059a939f958d27ed456;hb=47f2031ebd11633c79f3fb0fd173658b2d2ef3d4;hp=0fc244c2820868d86a24b7cf5e8ef78894e45fd2;hpb=0364372bf9bf57502160adc0402e38b8ea235c24;p=hvlinux.git

diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index 0fc244c..38b5af0 100644
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -2,40 +2,35 @@
 
 hvconfig_pre()
 {
-    local DRI_OPTS="--with-dri-drivers=swrast"
     local GAL_OPTS="--with-gallium-drivers=svga,swrast"
 
     if [ -n "${XORG_VIDEO_DRIVER}" ]; then
         case "${XORG_VIDEO_DRIVER}" in
     	    nouveau)
-	        DRI_OPTS="${DRI_OPTS},nouveau"
-	        GAL_OPTS="${GAL_OPTS},nouveau"
+	        GAL_OPTS+=",nouveau"
 	        ;;
 	    intel)
-   	        DRI_OPTS="${DRI_OPTS},i915,i965"
-	        GAL_OPTS="${GAL_OPTS},i915,i965"
+                GAL_OPTS+=",i915"
 	        ;;
 	esac
     fi
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --enable-texture-float \
         --enable-gles1 \
         --enable-gles2 \
+        --enable-openvg \
+        --enable-osmesa \
         --enable-xa \
-        --enable-shared-glapi \
-        --enable-shared-dricore \
+        --enable-gbm \
+        --enable-gallium-egl \
+        --enable-gallium-gbm \
         --enable-glx-tls \
-        ${DRI_OPTS} \
+        --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
+    sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${SRC_DIR}/configure
 }