From 51cf8a453c2bc2e8604bfc41a649e971c1ba5026 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Mon, 30 Mar 2009 11:27:56 -0700 Subject: Require libdrm 2.4.6 for GTT unmap support Need the new functions available. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 88059bfa..ae134afa 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,7 @@ if test "x$GCC" = "xyes"; then -Wnested-externs -fno-strict-aliasing" fi -PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.5]) +PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.6]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) -- cgit v1.2.3 From 2e3b95ed0197971e81ab7509245c899e96859d5b Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 15 Apr 2009 18:54:19 -0700 Subject: Increment version to 2.7.99.1 This is the number we want for any development snapshots along what will eventually become 2.8.0. (Once we get to 'release candidates' we'll bump this up to 2.7.99.901.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ae134afa..ad1cfcfd 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.6.99.1, + 2.7.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) -- cgit v1.2.3 From 84f69081abaeef8b05cafb64d3102eb2abdf9a8e Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 16 Apr 2009 14:27:15 +0200 Subject: Require xserver 1.3 I don't think anyone tests this against an old server anymore. Signed-off-by: Eric Anholt --- configure.ac | 51 +-------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ad1cfcfd..ae5278c3 100644 --- a/configure.ac +++ b/configure.ac @@ -70,11 +70,6 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], [VIDEO_DEBUG="$enableval"], [VIDEO_DEBUG=no]) -AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE], - [Path to X server source tree]), - [ XSERVER_SOURCE="$withval" ], - [ XSERVER_SOURCE="" ]) - AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc], [Disable XvMC support [[default=auto]]]), [XVMC="$enableval"], @@ -88,7 +83,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(SERVER_1_5, [xorg-server >= 1.5], [SERVER_1_5=yes], [SERVER_1_5=no]) @@ -129,7 +124,6 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) -AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) @@ -145,49 +139,6 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) AM_CONDITIONAL(LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes) -AM_CONDITIONAL(XMODES, test "x$XMODES" = xno) - -if test "x$XSERVER_SOURCE" = x; then - if test -d ../../xserver; then - XSERVER_SOURCE="`cd ../../xserver && pwd`" - fi -fi - -if test -d "$XSERVER_SOURCE"; then - case "$XSERVER_SOURCE" in - /*) - ;; - *) - XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`" - ;; - esac - if test -f $srcdir/src/modes/xf86Modes.h; then - : - else - ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes - fi - - if test -f $srcdir/src/parser/xf86Parser.h; then - : - else - ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser - fi -fi - -if test "x$XMODES" = xyes; then - AC_MSG_NOTICE([X server has new mode code]) - AC_DEFINE(XMODES, 1,[X server has built-in mode code]) - XMODES_CFLAGS= -else - if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then - AC_MSG_NOTICE([X server is missing new mode code, using local copy]) - else - AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source]) - fi - XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser' -fi - -AC_SUBST([XMODES_CFLAGS]) SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -- cgit v1.2.3 From 47591334a183881704a121ae06ebc2fadebe6f73 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 17 Apr 2009 13:54:47 -0700 Subject: Remove pre-server-1.5 support. --- configure.ac | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ae5278c3..8dd04d52 100644 --- a/configure.ac +++ b/configure.ac @@ -83,14 +83,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES]) - -PKG_CHECK_MODULES(SERVER_1_5, [xorg-server >= 1.5], - [SERVER_1_5=yes], [SERVER_1_5=no]) - -if test "$SERVER_1_5" = yes; then - AC_DEFINE(SERVER_1_5, 1, [Building against server 1.5]) -fi +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) drm_cflags=$(pkg-config --cflags libdrm) -- cgit v1.2.3 From 30c226eeb35f034c3ddb881e77454051dc210298 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 22 Jan 2009 17:54:49 -0800 Subject: Remove DRI1 support. This was blocked on wide distribution of X Server 1.6 (now in the current or next version of major distributions) and solutions for a couple of significant architectural problems (vblank sync and frontbuffer rendering, which we now have code or good plans for). This includes disabling XVMC which is DRI1-only currently. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8dd04d52..18fe9830 100644 --- a/configure.ac +++ b/configure.ac @@ -70,10 +70,10 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], [VIDEO_DEBUG="$enableval"], [VIDEO_DEBUG=no]) -AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc], - [Disable XvMC support [[default=auto]]]), - [XVMC="$enableval"], - [XVMC=auto]) +dnl AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc], +dnl [Disable XvMC support [[default=auto]]]), +dnl [XVMC="$enableval"], +dnl [XVMC=auto]) # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) -- cgit v1.2.3 From 1784efc1f0c74edda8c78fb1b0cdd989f0a088ad Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 20 Apr 2009 18:25:59 -0700 Subject: Remove XF86DRM_MODE. We now depend on server 1.6 and current libdrm, so no need to ifdef it. --- configure.ac | 7 ------- 1 file changed, 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 18fe9830..14a1c6b3 100644 --- a/configure.ac +++ b/configure.ac @@ -163,13 +163,6 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi -dnl Server 1.5's set_mode_major required for DRM_MODE. -PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], - [DRM_MODE=yes], [DRM_MODE=no]) -if test "x$DRM_MODE" = xyes; then - AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) -fi - AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) if test "$VIDEO_DEBUG" = yes; then AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) -- cgit v1.2.3 From e5133a94dc78411eaef324131ea8056aeb81779e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 21 Apr 2009 15:49:01 -0700 Subject: unifdef LIBPCIACCESS and XSERVER_LIBPCIACCESS. Depending on new server means these are always present. --- configure.ac | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 14a1c6b3..768f39dd 100644 --- a/configure.ac +++ b/configure.ac @@ -117,21 +117,7 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) -AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], - [#include "xorg-server.h"]) -CFLAGS="$save_CFLAGS" - -if test x$XSERVER_LIBPCIACCESS = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -else - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10], - have_libpciaccess=yes, - have_libpciaccess=no) -fi -AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -AM_CONDITIONAL(LIBPCIACCESS, - test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes) +PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -- cgit v1.2.3 From c231b41f3f3eb3ba9c8436d5fd93a30704ed437c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 21 Apr 2009 15:55:01 -0700 Subject: Remove checks for xf86RotateFreeShadow, introduced in server 1.4. --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 768f39dd..12fec794 100644 --- a/configure.ac +++ b/configure.ac @@ -119,18 +119,6 @@ AC_MSG_RESULT([$DRI]) PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" - -AC_CHECK_DECL(xf86RotateFreeShadow, - [AC_DEFINE(HAVE_FREE_SHADOW, 1, [have new FreeShadow API])], - [], - [#include - #include - #include ]) - -CPPFLAGS="$SAVE_CPPFLAGS" - dnl Use lots of warning flags with GCC WARN_CFLAGS="" -- cgit v1.2.3 From a8a771a853478e5f45f71d0eff3c4d55bf24d0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 29 Apr 2009 00:21:18 +0200 Subject: Restore CFLAGS after tests. Reverts single line of broken commit e5133a94dc78411eaef324131ea8056aeb81779e. Signed-off-by: Eric Anholt --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 12fec794..8aef4cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,7 @@ if test x$DRI = xauto; then fi fi AC_MSG_RESULT([$DRI]) +CFLAGS="$save_CFLAGS" PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -- cgit v1.2.3 From 04772b6c09a88f0483c2a7efc48029967c77b9bc Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 14 May 2009 16:57:11 -0700 Subject: If DRM can't figure out which pipe to sync on, then don't sync at all. Syncing to the wrong pipe can wedge the hardware if the exclusion area is larger than the vtotal Signed-off-by: Keith Packard --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8aef4cfe..028d17d3 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,7 @@ if test "x$GCC" = "xyes"; then -Wnested-externs -fno-strict-aliasing" fi -PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.6]) +PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) -- cgit v1.2.3 From ebe05200df381c0e6ee636f0f83440bfedea9bcb Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 15 May 2009 08:50:17 -0700 Subject: Add --enable-debug flag to configure Defaults to enabled. --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 028d17d3..bb05d1e0 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,14 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], [VIDEO_DEBUG="$enableval"], [VIDEO_DEBUG=no]) +AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], + [Compile with debug support [[default=yes]]])) +if test "x$enableval" == "xyes" ; then + DEBUGFLAGS="-g" +else + DEBUGFLAGS="" +fi + dnl AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc], dnl [Disable XvMC support [[default=auto]]]), dnl [XVMC="$enableval"], @@ -116,7 +124,7 @@ if test x$DRI = xauto; then fi fi AC_MSG_RESULT([$DRI]) -CFLAGS="$save_CFLAGS" +CFLAGS="$save_CFLAGS $DEBUGFLAGS" PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -- cgit v1.2.3