XLibre/xf86-video-nouveau
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nouveau.git synced 2026-03-24 01:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

nouveau: mandate dri2 build

Browse Source 
Building nouveau without dri2 is just silly

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov
2013-02-16 20:48:45 +00:00
committed by Maarten Lankhorst
parent ea8d225fe1
commit 45dbcaac30
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -84,6 +84,7 @@ AC_SUBST(LIBDRM_NOUVEAU_CFLAGS)
AC_SUBST(LIBDRM_NOUVEAU_LIBS)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm $REQUIRED_MODULES)
PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6])
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")

16
src/nouveau_dri2.c
View File

@@ -7,9 +7,10 @@
#include "nv_include.h"
#ifdef DRI2
#include "dri2.h"
#else
#error "This driver requires a DRI2-enabled X server"
#endif
#if defined(DRI2) && DRI2INFOREC_VERSION >= 3
struct nouveau_dri2_buffer {
DRI2BufferRec base;
PixmapPtr ppix;
@@ -817,16 +818,3 @@ nouveau_dri2_fini(ScreenPtr pScreen)
{
DRI2CloseScreen(pScreen);
}
#else
Bool
nouveau_dri2_init(ScreenPtr pScreen)
{
return TRUE;
}
void
nouveau_dri2_fini(ScreenPtr pScreen)
{
}
#endif