diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-11-07 21:18:56 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-11-07 21:18:56 +0000 |
| commit | 3aefcbea3306388f914ede67ad15247ddcc5570c (patch) | |
| tree | 720e3e4862164ddca1850d51212b9700fa171ff5 | |
| parent | a3ac01ef9ce92ca2ddd31a8a647937235e294f6d (diff) | |
| download | tigervnc-3aefcbea3306388f914ede67ad15247ddcc5570c.tar.gz tigervnc-3aefcbea3306388f914ede67ad15247ddcc5570c.zip | |
Fix legacy-friendly build (I hope). r4745 (enabling DPMS) removed -DNO_HW_ONLY_EXTS from Xvnc_CPPFLAGS in unix/xserver/hw/vnc/Makefile.am, which caused xorg-xserver 1.6.5 to attempt to build the XFree86-DRI extension, but the stub for
XFree86DRIExtensionInit() was missing, so Xvnc failed to link. Adding --disable-dri (r4765) caused the GLX build to fail, because GLX needs either DRI or DRI2, and DRI2 was not being properly detected because the dri2proto module we were using was too old for our X server version.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4772 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rwxr-xr-x | unix/build-xorg | 2 | ||||
| -rwxr-xr-x | unix/download-xorg-7.4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/build-xorg b/unix/build-xorg index bf8e312a..6aee9b71 100755 --- a/unix/build-xorg +++ b/unix/build-xorg @@ -189,7 +189,7 @@ build () echo "*** Building xserver ***" pushd xorg/xserver autoreconf -fiv - XORGCFGFLAGS="--disable-dri --disable-composite --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 SHA1_LIB=-lcrypto --disable-shared --enable-static ${XORGCFGFLAGS}" + XORGCFGFLAGS="--disable-dri --enable-dri2 --disable-composite --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 SHA1_LIB=-lcrypto --disable-shared --enable-static ${XORGCFGFLAGS}" ./configure ${CFGHOST} --prefix=${PREFIX} ${XORGCFGFLAGS} if [ $? -ne 0 ]; then echo "Failed to configure X server." diff --git a/unix/download-xorg-7.4 b/unix/download-xorg-7.4 index 3f18023e..be615077 100755 --- a/unix/download-xorg-7.4 +++ b/unix/download-xorg-7.4 @@ -31,7 +31,7 @@ packages = { "xcmiscproto": PROTO + "xcmiscproto-1.1.2.tar.bz2", "xextproto": PROTO + "xextproto-7.0.3.tar.bz2", "xf86driproto": PROTO + "xf86driproto-2.0.4.tar.bz2", - "dri2proto": PROTO + "dri2proto-1.1.tar.bz2", + "dri2proto": PROTO + "dri2proto-2.1.tar.bz2", "compositeproto": PROTO + "compositeproto-0.4.tar.bz2", "xf86vidmodeproto": PROTO + "xf86vidmodeproto-2.2.2.tar.bz2", "videoproto": PROTO + "videoproto-2.2.2.tar.bz2", |