- bit more fixing for xserver 1.16

[packages/tigervnc.git] / xserver.patch

diff --git a/xserver.patch b/xserver.patch
index a8484427ea04dbee87821845b06d264ee83e2e5e..f418680cb495a17be8a93916da7310d51f2d81e0 100644 (file)
--- a/xserver.patch
+++ b/xserver.patch
@@ -15,7 +15,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  
 +dnl Xvnc DDX
 +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $PRESENT_LIB"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $PRESENT_LIB $DRI3_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
  
  dnl Xnest DDX
@@ -49,14 +49,14 @@ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
 --- xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200
 +++ xserver/hw/Makefile.am     2012-08-28 15:35:42.272795917 +0200
 @@ -33,7 +33,8 @@ SUBDIRS =                    \
-       $(XNEST_SUBDIRS)        \
        $(DMX_SUBDIRS)          \
        $(KDRIVE_SUBDIRS)       \
--      $(XQUARTZ_SUBDIRS)
-+      $(XQUARTZ_SUBDIRS)      \
+       $(XQUARTZ_SUBDIRS)      \
+-      $(XWAYLAND_SUBDIRS)
++      $(XWAYLAND_SUBDIRS)     \
 +      vnc
  
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
 --- xserver/mi/miinitext.c.vnc 2012-08-28 15:35:23.000000000 +0200