From 15e6cc2ed84ef98801e3bcfe02f724dc0fcd2a76 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Mon, 5 Apr 2004 20:35:22 +0000 Subject: [PATCH] Andreas V. Meier: add nx-X11, a X Server specially patched for use with the nx compression libraries add cksum for nxproxy use host zlib (stolen from x11/xfree86) [2004032515332213467] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2665 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/avm/nx-X11/installinopt.patch | 32 +++++++++++++++++++ package/avm/nx-X11/nx-X11.conf | 28 +++++++++++++++++ package/avm/nx-X11/nx-X11.desc | 45 +++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 package/avm/nx-X11/installinopt.patch create mode 100644 package/avm/nx-X11/nx-X11.conf create mode 100644 package/avm/nx-X11/nx-X11.desc diff --git a/package/avm/nx-X11/installinopt.patch b/package/avm/nx-X11/installinopt.patch new file mode 100644 index 000000000..2b4c82c0c --- /dev/null +++ b/package/avm/nx-X11/installinopt.patch @@ -0,0 +1,32 @@ +diff -ruN nx-X11/config/cf/site.def nx-X11-new/config/cf/site.def +--- nx-X11/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100 ++++ nx-X11-new/config/cf/site.def 2004-03-25 13:12:17.926673776 +0100 +@@ -72,23 +72,25 @@ + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/X11R6 ++#define ProjectRoot /opt/nx + #endif + + /* + * On some platforms, some things may be installed outside of ProjectRoot + * by default. To disable this, uncomment the following line. + * +-#define NothingOutsideProjectRoot YES + */ ++#define NothingOutsideProjectRoot YES ++#define FontconfigFontsConfDir ProjectRoot/etc/fonts ++#define LinkGLToUsrInclude NO + + /* + * Set EtcX11Directory if you want config file links installed under + * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, + * UseEtcX11 and UseSeparateConfDir. + * +-#define EtcX11Directory ProjectRoot/etc + */ ++#define EtcX11Directory ProjectRoot/etc + + + /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ diff --git a/package/avm/nx-X11/nx-X11.conf b/package/avm/nx-X11/nx-X11.conf new file mode 100644 index 000000000..4ad506446 --- /dev/null +++ b/package/avm/nx-X11/nx-X11.conf @@ -0,0 +1,28 @@ +nxothersources="nxagent-1.3.1-32.tar.bz2 nxauth-1.3.1-2.tar.bz2 nxcomp-1.3.1-5.tar.bz2 \ + nxcompext-1.3.1-2.tar.bz2 nxproxy-1.3.1-2.tar.bz2" +nx-X11_prem() { + cd .. + + for nxsource in $nxothersources; do + echo "Extracting $nxsource ($taropt) ..." + tar $taropt $archdir/$nxsource + done + + cd $OLDPWD + + echo "Configuring XFree ..." + cat >> config/cf/host.def << EOT +/* Disable the internal zlib to use the system installed one */ +#define HasZlib YES +/* Disable the internal expat library to use the system installed one */ +#define HasExpat YES +/* Less warnings with recent gccs ... */ +#define DefaultCCOptions -ansi GccWarningOptions + +EOT + +} + +hook_add premake 3 "nx-X11_prem" + +var_append makeopt " " "World" diff --git a/package/avm/nx-X11/nx-X11.desc b/package/avm/nx-X11/nx-X11.desc new file mode 100644 index 000000000..dab7648b1 --- /dev/null +++ b/package/avm/nx-X11/nx-X11.desc @@ -0,0 +1,45 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/avm/nx-X11/nx-X11.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] x-X11 is a modified XFree86 distribution, extended by nx compression stuff + +[T] visit the website for some more info + +[U] http://www.nomachine.com/developers.php + +[A] NoMachine {http://www.nomachine.com} +[M] Andreas V. 'netrunner' Meier + +[C] base/x11 + +[L] GPL +[S] Beta +[V] 1.3.1-12 +[P] X -----5---9 800.000 + +[D] 3764094882 nx-X11-1.3.1-12.tar.gz http://www.nomachine.com/download/nxsources/nx-X11/ +[D] 1104806541 nxagent-1.3.1-32.tar.gz http://www.nomachine.com/download/nxsources/nxagent/ +[D] 4114421190 nxauth-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxauth/ +[D] 79176263 nxcomp-1.3.1-5.tar.gz http://www.nomachine.com/download/nxsources/nxcomp/ +[D] 4160313356 nxcompext-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxcompext/ +[D] 3122192777 nxproxy-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxproxy/