configure | 16 ++++++++--------
configure.ac | 2 +-
debian/changelog | 2 ++
3 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 8dbdbbb08db8481efab9ba1c543d801d907a7b85
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 3 16:48:05 2008 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index ac0836c..ca30b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-intel (2:2.3.2-2) UNRELEASED; urgency=low
* Update debian/copyright, thanks to Thomas Viehmann for reporting, and
Moritz Muehlenhoff for the thorough analysis (closes: #486340).
+ * Change the libdrm memory manager check in configure to look for 2.4.0
+ instead of 2.3.1, as libdrm 2.3.1 was released without it.
-- Julien Cristau <[EMAIL PROTECTED]> Mon, 23 Jun 2008 15:22:00 +0200
commit 66cd1d28a472cc2ace3c93dd4604f7d123cd9c62
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 3 16:47:16 2008 +0200
autoreconf
diff --git a/configure b/configure
index 59233cd..fdff559 100755
--- a/configure
+++ b/configure
@@ -22530,12 +22530,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 +22548,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 +22572,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
commit efa491b64f458963e030a4319517159b9855bbf5
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Tue Jul 1 18:51:18 2008 +1000
intel: fix drm check.
The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed
with GEM etc.
(cherry picked from commit 55678c64bc6e3ed613ea6db14c105c18a0cf28ce)
diff --git a/configure.ac b/configure.ac
index af589de..796b829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,7 @@ if test "$DRI" = yes; then
PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no])
+ PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
if test "x$DRI_MM" = xyes; then
AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
