xorg-x11-server/xorg-server-xf4vnc-disable-dmxvnc.diff

48 lines
1.8 KiB
Diff
Raw Normal View History

diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am ./hw/dmx/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/Makefile.am 2008-07-10 07:21:28.000000000 +0000
@@ -1,6 +1,6 @@
DIST_SUBDIRS = input vnc config glxProxy examples doc
-SUBDIRS = input vnc config examples
+SUBDIRS = input config examples
bin_PROGRAMS = Xdmx
if XINERAMA
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h ./hw/dmx/dmx-config.h
--- ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/dmx-config.h 2008-07-10 07:19:44.000000000 +0000
@@ -72,8 +72,8 @@
/* Enable the DMX extension */
#define DMXEXT
-/* Enable VNC ability */
-#define DMXVNC 1
+/* Disable VNC ability */
+#undef DMXVNC
/* Disable the extensions that are not currently supported */
#undef BEZIER
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am ./hw/dmx/input/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/input/Makefile.am 2008-07-10 07:20:43.000000000 +0000
@@ -65,7 +65,6 @@
-I$(top_srcdir)/hw/xfree86/common \
$(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \
- -DDMXVNC=1 \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am ./hw/dmx/vnc/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am 2008-07-10 07:15:50.000000000 +0000
+++ ./hw/dmx/vnc/Makefile.am 2008-07-10 07:18:02.000000000 +0000
@@ -37,7 +37,6 @@
-I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DMX_CONFIG_H \
$(DIX_CFLAGS) \
- -DDMXVNC=1 \
@DMXMODULES_CFLAGS@
###EXTRA_DIST = dmxdetach.c