Remove support for building Xvnc against Xorg 7.5. We have fixed the issues that...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_1@4500 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/BUILDING.txt b/BUILDING.txt
index 3fdcc0958c394abeb2a5be9480f47c25538f4b95..d25109460fe90458ea1d0f50b91811be855a6a6b 100644 (file)
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -105,8 +105,8 @@ The following procedure will build both the TigerVNC Viewer and a
 "legacy-friendly" version of the TigerVNC Server:
 
   cd {build_directory}
-  sh {source_directory}/unix/build-xorg init -version 7.4
-  sh {source_directory}/unix/build-xorg build -version 7.4 [additional configure flags]
+  sh {source_directory}/unix/build-xorg init
+  sh {source_directory}/unix/build-xorg build [additional configure flags]
 
 build-xorg generates a version of Xvnc that has no external dependencies on the
 X11 shared libraries or any other distribution-specific shared libraries.  This

diff --git a/unix/build-xorg b/unix/build-xorg
index 2cd5759964822db2c33bb53521d24e479f56c058..a2fa2f49c20fc87e7110f57424ff6566a2e6dedb 100755 (executable)
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -1,14 +1,13 @@
 #!/bin/bash
 # -*- mode: shell-script; coding: UTF-8 -*-
 # 
-# Build Xvnc with Xorg 7.4 or 7.5
+# Build Xvnc with Xorg 7.4
 #
 
 set -e
 
 PREFIX=
 MAKE="make"
-XORG_VERSION=
 SRCDIR=`dirname $0`/..
 
 modules="dri2proto \
@@ -50,17 +49,17 @@ modules="dri2proto \
     libfontenc \
     libXfont \
     libpciaccess \
-    pixman"
-
-modules74="fontcacheproto \
+    pixman \
+    fontcacheproto \
     evieext"
 
+
 init()
 {
     update_modules
 
     pushd xorg
-    tar jxf ~/.tigervnc-xorg-$XORG_VERSION/util-macros.tar.bz2
+    tar jxf ~/.tigervnc-xorg-7.4/util-macros.tar.bz2
     pushd util-macros-*
     echo "Building macros"
     ./configure ${1+"$@"} --prefix=${PREFIX}
@@ -69,12 +68,8 @@ init()
 
     pushd xserver
 
-    if [ "$XORG_VERSION" = "7.4" ]; then
-       patch -p1 < $SRCDIR/unix/xserver16.patch
-    else
-       patch -p1 < $SRCDIR/unix/xserver18.patch
-    fi
-    for all in `find $SRCDIR/unix/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do
+    patch -p1 < $SRCDIR/unix/xserver16.patch
+    for all in `find $SRCDIR/unix/xorg-7.4-patches/ -type f |grep '.*\.patch$'`; do
        echo Applying $all
        patch -p1 < $all
     done
@@ -96,18 +91,18 @@ update_modules()
     if [ -d xorg.build ]; then rm -rf xorg.build; fi
     mkdir xorg
     pushd xorg
-    $SRCDIR/unix/download-xorg-$XORG_VERSION
+    $SRCDIR/unix/download-xorg-7.4
     for module in ${modules}; do
-        tar jxf ~/.tigervnc-xorg-$XORG_VERSION/${module}.tar.bz2
+        tar jxf ~/.tigervnc-xorg-7.4/${module}.tar.bz2
     done
 
-    [ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2 ] && \
-        tar jxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2
-    [ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz ] && \
-        tar zxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz
+    [ -r ~/.tigervnc-xorg-7.4/Mesa.tar.bz2 ] && \
+        tar jxf ~/.tigervnc-xorg-7.4/Mesa.tar.bz2
+    [ -r ~/.tigervnc-xorg-7.4/Mesa.tar.gz ] && \
+        tar zxf ~/.tigervnc-xorg-7.4/Mesa.tar.gz
 
-    tar jxf ~/.tigervnc-xorg-$XORG_VERSION/freetype.tar.bz2
-    tar jxf ~/.tigervnc-xorg-$XORG_VERSION/xorg-server.tar.bz2
+    tar jxf ~/.tigervnc-xorg-7.4/freetype.tar.bz2
+    tar jxf ~/.tigervnc-xorg-7.4/xorg-server.tar.bz2
     cp -r $SRCDIR/unix/xserver xserver
     cp -r xorg-server-1.*/* xserver
     popd
@@ -214,14 +209,13 @@ rebuild ()
 
 usage ()
 {
-    echo "Usage: $0  init -version <7.4 | 7.5>"
+    echo "Usage: $0  init"
     echo
-    echo "       $0  build -version <7.4 | 7.5>"
-    echo "       [additional configure flags]"
+    echo "       $0  build [additional configure flags]"
     echo
     echo "       $0  rebuild [additional make options]"
     echo
-    echo "       $0  update -version <7.4 | 7.5>"
+    echo "       $0  update"
     echo
     exit 1
 }
@@ -238,19 +232,12 @@ do
        build)      MODE=build               ;;
        rebuild)    MODE=rebuild             ;;
        update)     MODE=update              ;;
-       -version)   XORG_VERSION=$2;  shift  ;;
        -srcdir)    SRCDIR=$2;        shift  ;;
        *)          break                    ;;
     esac
     shift
 done
 
-case "$XORG_VERSION" in
-    7.4)  modules=$modules" "$modules74  ;;
-    7.5)  ;;
-    *)    if [ ! "$MODE" = "rebuild" ]; then usage; fi  ;;
-esac
-
 pushd $SRCDIR
 SRCDIR=`pwd`
 echo "*** Using TigerVNC source tree at $SRCDIR ***"

diff --git a/unix/download-xorg-7.5 b/unix/download-xorg-7.5
deleted file mode 100755 (executable)
index 1b802a2..0000000
--- a/unix/download-xorg-7.5
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-# -*-mode: python; coding: UTF-8 -*-
-
-import os
-import glob
-
-#INDI = "http://ftp.sunet.se/pub/X11/ftp.x.org/individual"
-INDI = "http://ftp.x.org/pub/individual/"
-PROTO = INDI + "proto/"
-LIB = INDI + "lib/"
-SERVER = INDI + "xserver/"
-UTIL = INDI + "util/"
-DATA = INDI + "data/"
-APP = INDI + "app/"
-
-packages = {
-    "damageproto": PROTO + "damageproto-1.2.0.tar.bz2",
-    "fixesproto":  PROTO + "fixesproto-4.1.1.tar.bz2",
-    "resourceproto": PROTO + "resourceproto-1.1.0.tar.bz2",
-    "fontsproto": PROTO + "fontsproto-2.1.0.tar.bz2",
-    "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.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",
-    "renderproto": PROTO + "renderproto-0.11.tar.bz2",
-    "xcmiscproto": PROTO + "xcmiscproto-1.2.0.tar.bz2",
-    "xextproto": PROTO + "xextproto-7.1.1.tar.bz2",
-    "xf86driproto": PROTO + "xf86driproto-2.1.0.tar.bz2",
-    "dri2proto": PROTO + "dri2proto-2.1.tar.bz2",
-    "compositeproto": PROTO + "compositeproto-0.4.1.tar.bz2",
-    "xf86vidmodeproto": PROTO + "xf86vidmodeproto-2.3.tar.bz2",
-    "videoproto": PROTO + "videoproto-2.3.0.tar.bz2",
-    "xproto": PROTO + "xproto-7.0.16.tar.bz2",
-
-    "libxkbfile": LIB + "libxkbfile-1.0.6.tar.bz2",
-    "libXxf86vm": LIB + "libXxf86vm-1.1.0.tar.bz2",
-    "libXext": LIB + "libXext-1.1.2.tar.bz2",
-    "libfontenc": LIB + "libfontenc-1.0.5.tar.bz2",
-    "libXau": LIB + "libXau-1.0.6.tar.bz2",
-    "libXfont": LIB + "libXfont-1.4.2.tar.bz2",
-    "libXfixes": LIB + "libXfixes-4.0.5.tar.bz2",
-    "libSM": LIB + "libSM-1.1.1.tar.bz2",
-    "libXi": LIB + "libXi-1.3.2.tar.bz2",
-    "libXmu": LIB + "libXmu-1.0.5.tar.bz2",
-    "libX11": LIB + "libX11-1.3.5.tar.bz2",
-    "libXdmcp": LIB + "libXdmcp-1.0.3.tar.bz2",
-    "xtrans": LIB + "xtrans-1.2.5.tar.bz2",
-    "libXt": LIB + "libXt-1.0.8.tar.bz2",
-    "libpciaccess": LIB + "libpciaccess-0.12.0.tar.bz2",
-    "libICE": LIB + "libICE-1.0.6.tar.bz2",
-    "pixman": LIB + "pixman-0.19.2.tar.bz2",
-    "libXdamage": LIB + "libXdamage-1.1.3.tar.bz2",
-
-    "util-macros": UTIL + "util-macros-1.10.0.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": "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",
-    }
-
-
-
-def main():
-    dir = os.path.expanduser("~")+"/.tigervnc-xorg-7.5"
-    cwd = os.getcwd()
-    if not os.path.exists(dir):
-        os.mkdir(dir)
-    os.chdir(dir)
-
-    for pkg in packages.keys():
-        loc = packages[pkg]
-        if ".tar.bz2" in loc:
-            fname = pkg + ".tar.bz2"
-        else :
-            fname = pkg + ".tar.gz"
-        if not os.path.exists(fname):
-            assert 0 == os.spawnvp(os.P_WAIT, "wget", ["-N", "-c", "-O", fname, loc])
-
-    os.chdir(cwd)
-main()