xf86-video-intel: configure.ac NEWS

Chris Wilson ickle at kemper.freedesktop.org
Fri Feb 15 04:07:34 PST 2013


 NEWS         |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5a5943e2374a674067e0c48b0fe8a1f2eeff2177
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Feb 15 12:05:14 2013 +0000

    NEWS: Xserver 1.6 was not packaged in Xorg 7.7
    
    I misinterpreted Sedat Dilek's advice on how to fix my confusing
    changelog, so drop the Xorg 7.7 confusion and just refer to the version
    of Xserver the driver is first compatible with.

diff --git a/NEWS b/NEWS
index 665cede..f1951a7 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@ like Debian 6.0 (Squeeze).
  * Fix alignment of subsurface proxies for old chipsets.
    https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1120108
 
- * Repair build against Xserver-1.6 (Xorg-7.7) and contemporary packages.
+ * Repair build against Xserver-1.6 and contemporary packages.
 
 
 Release 2.21.0 (2013-02-01)
diff --git a/configure.ac b/configure.ac
index 988cf51..6aa0e6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,7 @@ AC_ARG_ENABLE(ums-only, AS_HELP_STRING([--enable-ums-only],
               [UMS_ONLY="$enableval"],
               [UMS_ONLY=no])
 
-required_xorg_xserver_version=1.6
+required_xorg_server_version=1.6
 required_pixman_version=0.16
 
 if pkg-config --exists 'pixman-1 >= 0.27.1'; then
@@ -249,7 +249,7 @@ if test "x$GLAMOR" != "xno"; then
 fi
 
 
-PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_xserver_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
 
 AC_ARG_ENABLE(xaa,
 	      AS_HELP_STRING([--enable-xaa],


More information about the xorg-commit mailing list