Bump the required ddx to 1.4.0 as drmAddress has been removed so that 32/64bit

combinations work.

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 71a8aeba1e86af588247a1f91b35b7845930708e..7c1bb67f91d9069b8c66f6ef8770fcce90b420cb 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -424,9 +424,17 @@ intelFillInModes( unsigned pixel_bits, unsigned depth_bits,
        fprintf( stderr, "[%s:%u] Error creating FBConfig!\n",
                 __func__, __LINE__ );
        return NULL;
-    }
-
-   /* There's no direct color modes on intel? */
+   }
+#if 0
+   if ( ! driFillInModes( & m, fb_format, fb_type,
+                         depth_bits_array, stencil_bits_array, depth_buffer_factor,
+                         back_buffer_modes, back_buffer_factor,
+                         GLX_DIRECT_COLOR ) ) {
+       fprintf( stderr, "[%s:%u] Error creating FBConfig!\n",
+                __func__, __LINE__ );
+       return NULL;
+   }
+#endif
 
    /* Mark the visual as slow if there are "fake" stencil bits.
     */
@@ -464,7 +472,7 @@ void * __driCreateNewScreen_20050725( __DRInativeDisplay *dpy, int scrn, __DRIsc
                             
 {
    __DRIscreenPrivate *psp;
-   static const __DRIversion ddx_expected = { 1, 0, 0 };
+   static const __DRIversion ddx_expected = { 1, 4, 0 };
    static const __DRIversion dri_expected = { 4, 0, 0 };
    static const __DRIversion drm_expected = { 1, 1, 0 };