search for: nouveau_drv_la_sourc

...+AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ @LIBDRM_CFLAGS@ nouveau_drv_la_LTLIBRARIES = nouveau_drv.la nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \ - @LIBUDEV_LIBS@ + @LIBUDEV_LIBS@ @LIBDRM_LIBS@ nouveau_drv_ladir = @moduledir@/drivers nouveau_drv_la_SOURCES = \ -- 1.8.3.1

...@XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ @LIBBACKLIGHT_CFLAGS@ nouveau_drv_la_LTLIBRARIES = nouveau_drv.la nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \ - @LIBUDEV_LIBS@ + @LIBUDEV_LIBS@ @LIBBACKLIGHT_LIBS@ nouveau_drv_ladir = @moduledir@/drivers nouveau_drv_la_SOURCES = \ diff --git a/src/drmmode_display.c b/src/drmmode_display.c index ad7bc1f..927dbcf 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -42,6 +42,10 @@ #include "libudev.h" #endif +#ifdef HAVE_LIBBACKLIGHT +#include "libbacklight.h" +#endif + static Bool d...

...<xorg-server.h>]) +AM_CONDITIONAL([XORG_WAYLAND], test "x$have_xwayland" = "xyes") + + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index bf9c967..50dc586 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,6 +54,10 @@ nouveau_drv_la_SOURCES = \ drmmode_display.c \ vl_hwmc.c +if !XORG_WAYLAND +nouveau_drv_la_SOURCES += xwayland_compat.c +endif + EXTRA_DIST = hwdefs/nv_3ddefs.xml.h \ hwdefs/nv_m2mf.xml.h \ hwdefs/nv_object.xml.h \ diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 0b3cc38..c7f769d 10...

From: Dave Airlie <airlied at redhat.com> This is preperation for the backlight support code. Signed-off-by: Dave Airlie <airlied at redhat.com> --- src/drmmode_display.c | 54 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 6033a6d..ad7bc1f 100644 ---