diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-02-25 10:53:36 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-02-25 10:53:36 +0000 |
| commit | 60909b5718327bec485fc65da4c2342743d7a6b1 (patch) | |
| tree | 6e8c9ca3c88a1e044b0595988de6681b6e53841f /unix/xserver16.patch | |
| parent | 47af8113336ddcb85503ea5ba8e078d28415e041 (diff) | |
| download | tigervnc-60909b5718327bec485fc65da4c2342743d7a6b1.tar.gz tigervnc-60909b5718327bec485fc65da4c2342743d7a6b1.zip | |
[Bugfix] Fixed building of libvnc module when xserver is configured with
--disable-xorg
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3616 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver16.patch')
| -rw-r--r-- | unix/xserver16.patch | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/unix/xserver16.patch b/unix/xserver16.patch index b3edaf62..cadf748c 100644 --- a/unix/xserver16.patch +++ b/unix/xserver16.patch @@ -1,13 +1,13 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac ---- xserver/configure.ac.vnc 2009-02-04 17:59:08.000000000 +0100 -+++ xserver/configure.ac 2009-02-04 17:59:38.000000000 +0100 +--- xserver/configure.ac.vnc 2009-02-25 11:45:20.000000000 +0100 ++++ xserver/configure.ac 2009-02-25 11:49:37.000000000 +0100 @@ -29,7 +29,6 @@ AC_PREREQ(2.57) - AC_INIT([xorg-server], 1.5.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) + AC_INIT([xorg-server], 1.5.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) -AM_MAINTAINER_MODE - RELEASE_DATE="2009-1-30" + RELEASE_DATE="2009-2-17" @@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD AC_CONFIG_HEADERS(include/kdrive-config.h) @@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1203,6 +1203,9 @@ if test "x$XVFB" = xyes; then +@@ -1195,6 +1195,9 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -27,7 +27,24 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac dnl Xnest DDX -@@ -1879,6 +1882,7 @@ hw/dmx/input/Makefile +@@ -1230,6 +1233,8 @@ xorg_bus_linuxpci=no + xorg_bus_bsdpci=no + xorg_bus_sparc=no + ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) ++ + if test "x$XORG" = xyes; then + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' +@@ -1417,7 +1422,6 @@ if test "x$XORG" = xyes; then + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) + AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) +@@ -1871,6 +1875,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile @@ -36,8 +53,8 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac hw/xwin/Makefile hw/xquartz/Makefile diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am ---- xserver/hw/Makefile.am.vnc 2009-02-04 17:59:08.000000000 +0100 -+++ xserver/hw/Makefile.am 2009-02-04 17:59:27.000000000 +0100 +--- xserver/hw/Makefile.am.vnc 2009-02-25 11:45:20.000000000 +0100 ++++ xserver/hw/Makefile.am 2009-02-25 11:45:37.000000000 +0100 @@ -33,7 +33,8 @@ SUBDIRS = \ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) \ @@ -49,8 +66,8 @@ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c ---- xserver/mi/miinitext.c.vnc 2009-02-04 17:59:08.000000000 +0100 -+++ xserver/mi/miinitext.c 2009-02-04 17:59:27.000000000 +0100 +--- xserver/mi/miinitext.c.vnc 2009-02-25 11:45:21.000000000 +0100 ++++ xserver/mi/miinitext.c 2009-02-25 11:45:37.000000000 +0100 @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS extern void CompositeExtensionInit(INITARGS); #endif |