xf86-video-intel: 3 commits - src/ch7017/Makefile.am src/ch7xxx/Makefile.am src/i830_dri.c src/i830_driver.c src/i830_memory.c src/i830_xaa.c src/i965_render.c src/ivch/Makefile.am src/sil164/Makefile.am

[Dave Airlie]

 src/ch7017/Makefile.am |    2 +-
 src/ch7xxx/Makefile.am |    2 +-
 src/i830_dri.c         |    2 +-
 src/i830_driver.c      |    1 +
 src/i830_memory.c      |    1 +
 src/i830_xaa.c         |    1 +
 src/i965_render.c      |    1 +
 src/ivch/Makefile.am   |    2 +-
 src/sil164/Makefile.am |    2 +-
 9 files changed, 9 insertions(+), 5 deletions(-)

New commits:
diff-tree 797aa6fcb1231587bde1efb47bc8430c4c8d8110 (from 43a80ef9094efcb49027c83f0e726f907fecfbb2)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 11 12:58:50 2007 +1100

    fixup missing assert includes

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 599edc3..1be9fdd 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -165,6 +165,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PRINT_MODE_INFO 0
 #endif
 
+#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/i830_memory.c b/src/i830_memory.c
index d6338ec..e5168e1 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -99,6 +99,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "config.h"
 #endif
 
+#include <assert.h>
 #include <string.h>
 
 #include "xf86.h"
diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index 46ea7ec..3440341 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -48,6 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "config.h"
 #endif
 
+#include <assert.h>
 #include "xf86.h"
 #include "xaarop.h"
 #include "i830.h"
diff --git a/src/i965_render.c b/src/i965_render.c
index 78f1146..8d06c22 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #endif
 
+#include <assert.h>
 #include "xf86.h"
 #include "i830.h"
 #include "i915_reg.h"
diff-tree 43a80ef9094efcb49027c83f0e726f907fecfbb2 (from 0d33fd3d03cef3a7e63d88ae441354390b37a937)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 11 12:58:26 2007 +1100

    fixup brace alignment for older X.org

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 5293574..38e11e7 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -549,8 +549,8 @@ I830DRIScreenInit(ScreenPtr pScreen)
    pDRIInfo->MoveBuffers = I830DRIMoveBuffers;
    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
 
-#if DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1
    {
+#if DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1
       int major, minor, patch;
 
       DRIQueryVersion(&major, &minor, &patch);
diff-tree 0d33fd3d03cef3a7e63d88ae441354390b37a937 (from 3c2d6e07bdf8daef6486b594aef0d22460eb2585)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 11 12:58:02 2007 +1100

    add XMODES flags to the i2c drivers

diff --git a/src/ch7017/Makefile.am b/src/ch7017/Makefile.am
index 7fbb440..45bf699 100644
--- a/src/ch7017/Makefile.am
+++ b/src/ch7017/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
 
 ch7017_la_LTLIBRARIES = ch7017.la
 ch7017_la_LDFLAGS = -module -avoid-version
diff --git a/src/ch7xxx/Makefile.am b/src/ch7xxx/Makefile.am
index b827bf8..68f766c 100644
--- a/src/ch7xxx/Makefile.am
+++ b/src/ch7xxx/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
 
 ch7xxx_la_LTLIBRARIES = ch7xxx.la
 ch7xxx_la_LDFLAGS = -module -avoid-version
diff --git a/src/ivch/Makefile.am b/src/ivch/Makefile.am
index 40e2627..ace076c 100644
--- a/src/ivch/Makefile.am
+++ b/src/ivch/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
 
 ivch_la_LTLIBRARIES = ivch.la
 ivch_la_LDFLAGS = -module -avoid-version
diff --git a/src/sil164/Makefile.am b/src/sil164/Makefile.am
index 4cf717c..ac1b33c 100644
--- a/src/sil164/Makefile.am
+++ b/src/sil164/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
 
 sil164_la_LTLIBRARIES = sil164.la
 sil164_la_LDFLAGS = -module -avoid-version