diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-04-30 05:07:31 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-04-30 05:07:31 +0000 |
| commit | 0aefdc87795e47f80bc71b438da55f5067a7d303 (patch) | |
| tree | 98b83660e2165938aaba71027be251269fb51653 /unix | |
| parent | 4666c50f324dc7e61407ec8d9866bef499d241b3 (diff) | |
| download | tigervnc-0aefdc87795e47f80bc71b438da55f5067a7d303.tar.gz tigervnc-0aefdc87795e47f80bc71b438da55f5067a7d303.zip | |
Update cross-compatible builds to xorg-xserver 1.6.5 to fix several issues
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4399 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/build-xorg | 4 | ||||
| -rwxr-xr-x | unix/download-xorg-7.4 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/build-xorg b/unix/build-xorg index 383d3d28..b7286f6b 100755 --- a/unix/build-xorg +++ b/unix/build-xorg @@ -71,7 +71,7 @@ init() pushd xserver if [ "$XORG_VERSION" = "7.4" ]; then - patch -p1 < $SRCDIR/unix/xserver15.patch + patch -p1 < $SRCDIR/unix/xserver16.patch else patch -p1 < $SRCDIR/unix/xserver18.patch fi @@ -201,7 +201,7 @@ build () 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 --with-sha1=libgcrypt ${XORGCFGFLAGS}" if [ $STATIC = 1 ]; then - XORGCFGFLAGS="${XORGCFGFLAGS} --disable-shared --enable-static" + XORGCFGFLAGS="${XORGCFGFLAGS} SHA1_LIB=-lcrypto --disable-shared --enable-static" fi ./configure ${1+"$@"} --prefix=${PREFIX} ${XORGCFGFLAGS} if [ $? -ne 0 ]; then diff --git a/unix/download-xorg-7.4 b/unix/download-xorg-7.4 index 55e34ea6..3f18023e 100755 --- a/unix/download-xorg-7.4 +++ b/unix/download-xorg-7.4 @@ -21,10 +21,10 @@ packages = { "fontcacheproto" : PROTO + "fontcacheproto-0.1.2.tar.bz2", "bigreqsproto": PROTO + "bigreqsproto-1.0.2.tar.bz2", "kbproto": PROTO + "kbproto-1.0.3.tar.bz2", - "inputproto": PROTO + "inputproto-1.4.4.tar.bz2", + "inputproto": PROTO + "inputproto-1.5.1.tar.bz2", "glproto": PROTO + "glproto-1.4.9.tar.bz2", "xineramaproto": PROTO + "xineramaproto-1.1.2.tar.bz2", - "randrproto": PROTO + "randrproto-1.2.2.tar.bz2", + "randrproto": PROTO + "randrproto-1.3.2.tar.bz2", "scrnsaverproto": PROTO + "scrnsaverproto-1.1.0.tar.bz2", "renderproto": PROTO + "renderproto-0.9.3.tar.bz2", "evieext": PROTO + "evieext-1.0.2.tar.bz2", @@ -53,11 +53,11 @@ packages = { "libXt": LIB + "libXt-1.0.5.tar.bz2", "libpciaccess": LIB + "libpciaccess-0.10.4.tar.bz2", "libICE": LIB + "libICE-1.0.4.tar.bz2", - "pixman": LIB + "pixman-0.12.0.tar.bz2", + "pixman": LIB + "pixman-0.16.0.tar.bz2", "libXdamage": LIB + "libXdamage-1.1.1.tar.bz2", "util-macros": UTIL + "util-macros-1.1.6.tar.bz2", - "xorg-server": SERVER + "xorg-server-1.5.3.tar.bz2", + "xorg-server": SERVER + "xorg-server-1.6.5.tar.bz2", "libdrm": "http://dri.freedesktop.org/libdrm/libdrm-2.4.0.tar.bz2", "Mesa": "http://downloads.sourceforge.net/mesa3d/MesaLib-7.2.tar.bz2", |