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

diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index 80b8017..38b5af0 100644
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -2,17 +2,35 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --enable-motif \
-        --enable-xcb \
+    local GAL_OPTS="--with-gallium-drivers=svga,swrast"
+
+    if [ -n "${XORG_VIDEO_DRIVER}" ]; then
+        case "${XORG_VIDEO_DRIVER}" in
+    	    nouveau)
+	        GAL_OPTS+=",nouveau"
+	        ;;
+	    intel)
+                GAL_OPTS+=",i915"
+	        ;;
+	esac
+    fi
+
+    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
+    sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${SRC_DIR}/configure
 }