Module Name: xsrc
Committed By: mrg
Date: Tue Aug 16 07:43:03 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
nouveau_xv.c nv04_xv_blit.c nv04_xv_ovl.c nv10_xv_ovl.c
nv30_xv_tex.c nv40_xv_tex.c nv50_xv.c nv_include.h nvc0_xv.c
Log Message:
include xorg-server.h which is normally included by config.h.
(this change isn't a candidate for upstream.)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.3 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.4
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.3 Mon Aug 15 01:11:10 2016
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Tue Aug 16 07:43:03 2016
@@ -31,7 +31,9 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xorgVersion.h"
+#include "Xdefs.h"
#include "nv_include.h"
#include "xf86drmMode.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c:1.1.1.2 xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c:1.1.1.2 Mon Aug 15 01:10:31 2016
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c Tue Aug 16 07:43:03 2016
@@ -29,6 +29,7 @@
#include <immintrin.h>
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c:1.1.1.2 xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c:1.1.1.2 Mon Aug 15 01:10:31 2016
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c Tue Aug 16 07:43:03 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c Tue Aug 16 07:43:03 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c Tue Aug 16 07:43:03 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c Tue Aug 16 07:43:03 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c Tue Aug 16 07:43:03 2016
@@ -26,6 +26,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c Tue Aug 16 07:43:03 2016
@@ -26,6 +26,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h Tue Aug 16 07:43:03 2016
@@ -12,6 +12,7 @@
#include <stdlib.h>
/* All drivers should typically include these */
+#include "xorg-config.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#define PPC_MMIO_IS_BE
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c Tue Aug 16 07:43:03 2016
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include "xorg-config.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
#include "exa.h"