From 73bad5a24f61cab724412ca4b9d910438f72d8a9 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 15 Sep 2010 12:55:04 +0000 Subject: [PATCH] [Development] When building X.Org 7.5, use xserver 1.8.X to reduce number of DLL dependencies (1.7.X cannot use SHA1 implementation from libgcrypt). git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4140 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/build-xorg | 2 +- unix/download-xorg-7.5 | 6 +- .../0001-Remove-CopyISOLatin1Lowered.patch | 58 ------------------- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 unix/xorg-7.5-patches/0001-Remove-CopyISOLatin1Lowered.patch diff --git a/unix/build-xorg b/unix/build-xorg index 9739b57f..97eac3c0 100755 --- a/unix/build-xorg +++ b/unix/build-xorg @@ -199,7 +199,7 @@ build () echo "*** Building xserver ***" pushd xorg/xserver autoreconf -fiv - XORGCFGFLAGS='--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive --disable-config-dbus --disable-config-hal --disable-config-udev' + XORGCFGFLAGS='--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive --disable-config-dbus --disable-config-hal --disable-config-udev --with-sha1=libgcrypt' if [ $STATIC = 1 ]; then XORGCFGFLAGS="${XORGCFGFLAGS} --disable-shared --enable-static" fi diff --git a/unix/download-xorg-7.5 b/unix/download-xorg-7.5 index 61923b82..1b802a2b 100755 --- a/unix/download-xorg-7.5 +++ b/unix/download-xorg-7.5 @@ -21,7 +21,7 @@ packages = { "bigreqsproto": PROTO + "bigreqsproto-1.1.0.tar.bz2", "kbproto": PROTO + "kbproto-1.0.4.tar.bz2", "inputproto": PROTO + "inputproto-2.0.tar.bz2", - "glproto": PROTO + "glproto-1.4.10.tar.bz2", + "glproto": PROTO + "glproto-1.4.12.tar.bz2", "xineramaproto": PROTO + "xineramaproto-1.2.tar.bz2", "randrproto": PROTO + "randrproto-1.3.1.tar.bz2", "scrnsaverproto": PROTO + "scrnsaverproto-1.2.0.tar.bz2", @@ -55,10 +55,10 @@ packages = { "libXdamage": LIB + "libXdamage-1.1.3.tar.bz2", "util-macros": UTIL + "util-macros-1.10.0.tar.bz2", - "xorg-server": SERVER + "xorg-server-1.7.7.tar.bz2", + "xorg-server": SERVER + "xorg-server-1.8.2.tar.bz2", "libdrm": "http://dri.freedesktop.org/libdrm/libdrm-2.4.21.tar.bz2", - "Mesa": "http://downloads.sourceforge.net/mesa3d/MesaLib-7.5.1.tar.gz", + "Mesa": "ftp://ftp.freedesktop.org/pub/mesa/beta/MesaLib-7.8.3-rc1.tar.bz2", "libpthread-stubs": "http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2", "freetype": "http://downloads.sourceforge.net/freetype/freetype-2.4.2.tar.bz2", } diff --git a/unix/xorg-7.5-patches/0001-Remove-CopyISOLatin1Lowered.patch b/unix/xorg-7.5-patches/0001-Remove-CopyISOLatin1Lowered.patch deleted file mode 100644 index 8c745bf5..00000000 --- a/unix/xorg-7.5-patches/0001-Remove-CopyISOLatin1Lowered.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7c31dd5db8b43c7796bf97a07e08213af5afd2ae Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 15 Oct 2009 04:24:25 -0500 -Subject: [PATCH] Remove CopyISOLatin1Lowered - -This function was moved verbatim into libXfont-1.4, and it is not used -by the server or any drivers. Exporting it in both places leads to -multiple definition linking errors on Cygwin, where we need to use a -static libXfont due to poor weak-symbol handling. - -Signed-off-by: Yaakov Selkowitz -Signed-off-by: Keith Packard -Signed-off-by: Adam Tkac ---- - dix/dixutils.c | 10 ---------- - include/dix.h | 5 ----- - 2 files changed, 0 insertions(+), 15 deletions(-) - -diff --git a/dix/dixutils.c b/dix/dixutils.c -index 5cede5f..8278d44 100644 ---- a/dix/dixutils.c -+++ b/dix/dixutils.c -@@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source) - } - - --void --CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) --{ -- int i; -- -- for (i = 0; i < length; i++, source++, dest++) -- *dest = ISOLatin1ToLower (*source); -- *dest = '\0'; --} -- - int - CompareISOLatin1Lowered(unsigned char *s1, int s1len, - unsigned char *s2, int s2len) -diff --git a/include/dix.h b/include/dix.h -index 9fd2ed8..ed3acb6 100644 ---- a/include/dix.h -+++ b/include/dix.h -@@ -173,11 +173,6 @@ extern _X_EXPORT void MarkClientException( - extern _X_HIDDEN Bool CreateConnectionBlock(void); - /* dixutils.c */ - --extern _X_EXPORT void CopyISOLatin1Lowered( -- unsigned char * /*dest*/, -- unsigned char * /*source*/, -- int /*length*/); -- - extern _X_EXPORT int CompareISOLatin1Lowered( - unsigned char * /*a*/, - int alen, --- -1.7.2.3 - -- 2.39.5