From 04d288cd57ad041ffe1efb2d9963f69f4ff09fb3 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 27 Jan 2015 16:50:59 +0100 Subject: [PATCH] Move build-xorg to contrib as it is not a maintained component --- BUILDING.txt | 10 +++++----- {unix => contrib/xorg}/build-xorg | 4 ++-- {unix => contrib/xorg}/download-xorg-7.5 | 0 .../xorg}/xorg-7.5-patches/0001-Add-dridir-param.patch | 0 .../xorg-7.5-patches/0001-Add-xkbcompdir-param.patch | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename {unix => contrib/xorg}/build-xorg (98%) rename {unix => contrib/xorg}/download-xorg-7.5 (100%) rename {unix => contrib/xorg}/xorg-7.5-patches/0001-Add-dridir-param.patch (100%) rename {unix => contrib/xorg}/xorg-7.5-patches/0001-Add-xkbcompdir-param.patch (100%) diff --git a/BUILDING.txt b/BUILDING.txt index 25af191a..0cb830bf 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -150,14 +150,14 @@ version of the TigerVNC Server. This is accomplished by downloading and building the more recent Xorg modules in a local directory and then building Xvnc such that it links against the local build of these libraries, not the X11 libraries installed on the system. The "build-xorg" script in the TigerVNC -source distribution (located under unix/) automates this process. +source distribution (located under contrib/xorg/) automates this process. 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 - sh {source_directory}/unix/build-xorg build [additional CMake flags] + sh {source_directory}/contrib/xorg/build-xorg init + sh {source_directory}/contrib/xorg/build-xorg build [additional CMake 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 @@ -171,11 +171,11 @@ once the X11 modules and other dependencies have been built for the first time. This is convenient for testing changes that just apply to the TigerVNC source code. To accomplish this, run: - sh {source_directory}/unix/build-xorg rebuild [additional make flags] + sh {source_directory}/contrib/xorg/build-xorg rebuild [additional make flags] For instance, - sh {source_directory}/unix/build-xorg rebuild clean + sh {source_directory}/contrib/xorg/build-xorg rebuild clean will clean both the Xvnc and vncviewer builds without destroying any of the build configuration or module dependencies. diff --git a/unix/build-xorg b/contrib/xorg/build-xorg similarity index 98% rename from unix/build-xorg rename to contrib/xorg/build-xorg index 39017745..3a82b59f 100755 --- a/unix/build-xorg +++ b/contrib/xorg/build-xorg @@ -70,7 +70,7 @@ init() pushd xserver patch -p1 < $SRCDIR/unix/xserver18.patch - for all in `find $SRCDIR/unix/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do + for all in `find $SRCDIR/contrib/xorg/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do echo Applying $all patch -p1 < $all done @@ -86,7 +86,7 @@ update_modules() if [ -d xorg.build ]; then rm -rf xorg.build; fi mkdir xorg pushd xorg - $SRCDIR/unix/download-xorg-$XORG_VERSION + $SRCDIR/contrib/xorg/download-xorg-$XORG_VERSION for module in ${modules}; do tar jxf ~/.tigervnc-xorg-$XORG_VERSION/${module}.tar.bz2 done diff --git a/unix/download-xorg-7.5 b/contrib/xorg/download-xorg-7.5 similarity index 100% rename from unix/download-xorg-7.5 rename to contrib/xorg/download-xorg-7.5 diff --git a/unix/xorg-7.5-patches/0001-Add-dridir-param.patch b/contrib/xorg/xorg-7.5-patches/0001-Add-dridir-param.patch similarity index 100% rename from unix/xorg-7.5-patches/0001-Add-dridir-param.patch rename to contrib/xorg/xorg-7.5-patches/0001-Add-dridir-param.patch diff --git a/unix/xorg-7.5-patches/0001-Add-xkbcompdir-param.patch b/contrib/xorg/xorg-7.5-patches/0001-Add-xkbcompdir-param.patch similarity index 100% rename from unix/xorg-7.5-patches/0001-Add-xkbcompdir-param.patch rename to contrib/xorg/xorg-7.5-patches/0001-Add-xkbcompdir-param.patch -- 2.39.5