diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-02-16 20:48:44 +0000 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-06-12 10:42:44 +0200 |
| commit | ea8d225fe100ecabb72e3cc0a92372f16afb10b3 (patch) | |
| tree | 602401176515786b3b41f19bd29c1c8d4c71e8ab | |
| parent | b5d1a9bd269c9d2758fee37492cdcccc976fcc3b (diff) | |
| download | xorg-driver-xf86-video-nouveau-ea8d225fe100ecabb72e3cc0a92372f16afb10b3.tar.gz | |
dri1: purge the final references
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/nv_type.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 15a6e13..fa4a2dc 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25]) AC_SUBST(LIBDRM_NOUVEAU_CFLAGS) AC_SUBST(LIBDRM_NOUVEAU_LIBS) -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm xf86driproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm $REQUIRED_MODULES) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") diff --git a/src/nv_type.h b/src/nv_type.h index 13b6672..e6945bc 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -4,16 +4,10 @@ #include "colormapst.h" #include "xf86Cursor.h" #include "exa.h" -#ifdef XF86DRI -#define _XF86DRI_SERVER_ #include "xf86drm.h" -#include "dri.h" #include <stdbool.h> #include <stdint.h> #include "xf86Crtc.h" -#else -#error "This driver requires a DRI-enabled X server" -#endif #if XF86_CRTC_VERSION >= 5 #define NOUVEAU_PIXMAP_SHARING 1 |