Revision: 4399
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4399&view=rev
Author: dcommander
Date: 2011-04-30 05:07:31 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
Update cross-compatible builds to xorg-xserver 1.6.5 to fix several issues
Modified Paths:
--------------
trunk/unix/build-xorg
trunk/unix/download-xorg-7.4
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1_1:4340,4342-4359,4361,4377,4397
/branches/unified_buildsys:3892-3898
+ /branches/1_1:4340,4342-4359,4361,4377,4396-4397
/branches/unified_buildsys:3892-3898
Modified: trunk/unix/build-xorg
===================================================================
--- trunk/unix/build-xorg 2011-04-29 22:57:27 UTC (rev 4398)
+++ trunk/unix/build-xorg 2011-04-30 05:07:31 UTC (rev 4399)
@@ -71,7 +71,7 @@
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 @@
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
Modified: trunk/unix/download-xorg-7.4
===================================================================
--- trunk/unix/download-xorg-7.4 2011-04-29 22:57:27 UTC (rev 4398)
+++ trunk/unix/download-xorg-7.4 2011-04-30 05:07:31 UTC (rev 4399)
@@ -21,10 +21,10 @@
"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 @@
"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";,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
