fix breakage w/ libdrm-2.3.1.

From upstream commit 55678c64bc6e3ed613ea6db14c105c18a0cf28ce.

2 files changed, 49 insertions, 5 deletions

diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index ba03917505c..ad94d14f63d 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2008/06/22 16:33:23 taca Exp $
+$NetBSD: distinfo,v 1.9 2008/07/17 12:03:11 tnn Exp $
 
 SHA1 (xf86-video-intel-2.3.2.tar.bz2) = 86be1572c68a438bb92d40fff262b71d9e40c976
 RMD160 (xf86-video-intel-2.3.2.tar.bz2) = 5137493fb00b7a6fe3c03750f42599939a69c11b
 Size (xf86-video-intel-2.3.2.tar.bz2) = 665611 bytes
-SHA1 (patch-ab) = b0cb0975f3f0e5678ad967d560378ada9b3361b6
+SHA1 (patch-ab) = a58af227c05b41eaf2a1c7c2d3f61b719aed3726
 SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08
 SHA1 (patch-ba) = 9152649277b417278fb290e24dac8ad6fb911238
diff --git a/x11/xf86-video-intel/patches/patch-ab b/x11/xf86-video-intel/patches/patch-ab
index e77f5140a6f..7bd2537f3b6 100644
--- a/x11/xf86-video-intel/patches/patch-ab
+++ b/x11/xf86-video-intel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/04/23 19:00:46 tnn Exp $
+$NetBSD: patch-ab,v 1.3 2008/07/17 12:03:11 tnn Exp $
 
---- configure.orig	2008-04-23 07:44:07.000000000 +0200
+--- configure.orig	2008-06-18 04:26:05.000000000 +0200
 +++ configure
-@@ -21849,16 +21849,8 @@ echo $ECHO_N "checking for ${sdkdir}/sar
+@@ -21857,16 +21857,8 @@ echo $ECHO_N "checking for ${sdkdir}/sar
  if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -19,3 +19,47 @@ $NetBSD: patch-ab,v 1.2 2008/04/23 19:00:46 tnn Exp $
  ac_res=`eval echo '${'$as_ac_File'}'`
  	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
+@@ -22530,12 +22522,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_DRI_MM_CFLAGS="$DRI_MM_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.3.1" 2>/dev/null`
++  pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22548,12 +22540,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_DRI_MM_LIBS="$DRI_MM_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.3.1" 2>/dev/null`
++  pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22572,9 +22564,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
++	        DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.0"`
+         else
+-	        DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
++	        DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DRI_MM_PKG_ERRORS" >&5