[arch-commits] CVS update of extra/network/nxserver (5 files)
Tobias Powalowski
tpowa at archlinux.org
Tue Oct 9 16:04:29 UTC 2007
Date: Tuesday, October 9, 2007 @ 12:04:29
Author: tpowa
Path: /home/cvs-extra/extra/network/nxserver
Modified: PKGBUILD (1.11 -> 1.12)
Removed: Millis.c.64bit.diff (1.1) Millis.h.64bit.diff (1.1)
XlcDL.c.64bit.diff (1.1) nx-x11-windows-linux-resume.patch (1.1)
'upgpkg: update to new version'
-----------------------------------+
Millis.c.64bit.diff | 12 ----
Millis.h.64bit.diff | 11 ----
PKGBUILD | 87 ++++++++++++++++--------------------
XlcDL.c.64bit.diff | 12 ----
nx-x11-windows-linux-resume.patch | 37 ---------------
5 files changed, 40 insertions(+), 119 deletions(-)
Index: extra/network/nxserver/Millis.c.64bit.diff
diff -u extra/network/nxserver/Millis.c.64bit.diff:1.1 extra/network/nxserver/Millis.c.64bit.diff:removed
--- extra/network/nxserver/Millis.c.64bit.diff:1.1 Sun Mar 25 10:23:54 2007
+++ extra/network/nxserver/Millis.c.64bit.diff Tue Oct 9 12:04:29 2007
@@ -1,12 +0,0 @@
-diff -ur nx-X11/programs/Xserver/hw/nxagent.old/Millis.c nx-X11/programs/Xserver/hw/nxagent/Millis.c
---- nx-X11/programs/Xserver/hw/nxagent.old/Millis.c 2006-05-25 11:37:31.000000000 +0200
-+++ nx-X11/programs/Xserver/hw/nxagent/Millis.c 2007-02-12 19:10:10.000000000 +0100
-@@ -22,7 +22,7 @@
- #include "Millis.h"
-
- #ifdef DDXTIME
--unsigned long GetTimeInMillis()
-+CARD32 GetTimeInMillis()
- {
- struct timeval ts;
-
Index: extra/network/nxserver/Millis.h.64bit.diff
diff -u extra/network/nxserver/Millis.h.64bit.diff:1.1 extra/network/nxserver/Millis.h.64bit.diff:removed
--- extra/network/nxserver/Millis.h.64bit.diff:1.1 Sun Mar 25 10:23:54 2007
+++ extra/network/nxserver/Millis.h.64bit.diff Tue Oct 9 12:04:29 2007
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/nxagent/Millis.h 2006-05-22 13:02:16.000000000 +0000
-+++ programs/Xserver/hw/nxagent/Millis.h.new 2007-03-25 13:09:00.000000000 +0000
-@@ -18,7 +18,7 @@
- #ifndef __Millis_H__
- #define __Millis_H__
-
--unsigned long GetTimeInMillis(void);
-+#include "os.h"
-
- const char *GetTimeInMillisAsString(void);
-
Index: extra/network/nxserver/PKGBUILD
diff -u extra/network/nxserver/PKGBUILD:1.11 extra/network/nxserver/PKGBUILD:1.12
--- extra/network/nxserver/PKGBUILD:1.11 Sun Mar 25 10:23:55 2007
+++ extra/network/nxserver/PKGBUILD Tue Oct 9 12:04:29 2007
@@ -1,41 +1,32 @@
-# $Id: PKGBUILD,v 1.11 2007/03/25 14:23:55 andyrtr Exp $
+# $Id: PKGBUILD,v 1.12 2007/10/09 16:04:29 tpowa Exp $
# Maintainer Tobias Powalowski <tpowa at archlinux.org>
# Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
pkgname=nxserver
-pkgver=2.1.0
-pkgrel=3
+pkgver=3.0.0
+pkgrel=1
pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
arch=(i686 x86_64)
url="http://nomachine.com/"
-depends=('nx-common' 'libxaw' 'libxrender' 'libxp')
+license=('GPL')
+depends=('nx-common>=3.0.0' 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg' \
+ 'libxpm' 'libpng' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2')
makedepends=('imake')
source=(\
#X11 support programs and libraries
-http://64.34.161.181/download/2.1.0/sources/nx-X11-2.1.0-3.tar.gz nx-x11-windows-linux-resume.patch \
-http://64.34.161.181/download/2.1.0/sources/nxwin-2.1.0-3.tar.gz \
-http://64.34.161.181/download/2.1.0/sources/nxauth-2.1.0-2.tar.gz \
-http://64.34.161.181/download/2.1.0/sources/nxcomp-2.1.0-8.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nx-X11-3.0.0-37.tar.gz nx-x11-windows-linux-resume.patch \
+http://64.34.161.181/download/3.0.0/sources/nxwin-3.0.0-10.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxauth-3.0.0-6.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxcomp-3.0.0-48.tar.gz \
#X11 Agent sources
-http://64.34.161.181/download/2.1.0/sources/nxagent-2.1.0-20.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxagent-3.0.0-85.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxcompsh-3.0.0-7.tar.gz \
#Compression libs and proxy sources
-http://64.34.161.181/download/2.1.0/sources/nxproxy-2.1.0-3.tar.gz \
-http://64.34.161.181/download/2.1.0/sources/nxcompext-2.1.0-5.tar.gz \
-#RFB Agent Sources
-http://64.34.161.181/download/2.1.0/sources/nxviewer-2.1.0-12.tar.gz \
-#RDP Agent Sources
-http://64.34.161.181/download/2.1.0/sources/nxdesktop-2.1.0-10.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxproxy-3.0.0-4.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxcompext-3.0.0-18.tar.gz \
+http://64.34.161.181/download/3.0.0/sources/nxcompshad-3.0.0-19.tar.gz \
#64bit fixes
-NXproto.h.64bit.diff
-Millis.c.64bit.diff
-Millis.h.64bit.diff
-XlcDL.c.64bit.diff)
-md5sums=('9c6e9e4c35c4ec3a7664fcdd397eb7f0' '24e6e57f80b89abab29d9e19128d8353'\
- '64e01be5b4e47aa8796fd44b7add6df8' '74811bc9ef86f2d97b3b2ba2ba53f9d3'\
- '7e35e48adb66786ad720ff9fbfa950a3' '868d972aaba6577aa5e8873644d7c3fb'\
- '29b0e8be069a8258f5b8774362fc7464' 'd3347382860670cfd4471d228fb1b730'\
- 'e9f5b692278025856b09bd71d0966100' 'f96395297324ffe249fdec3065d754be'\
- '58341ba70dfab92ff38570071fbbf88a' '44819a00de87dd153d92d0dc74fd0eb2'\
- '10814eb1ce3dcf44cb7110386b012e6b' 'e64dd30168eee9009600b7def9b0dd33')
+NXproto.h.64bit.diff)
+options=(!libtool)
build() {
cd $startdir/src
@@ -49,23 +40,26 @@
./configure --prefix=/opt/NX
make || return 1
+ cd $startdir/src/nxcompshad
+ ./configure --prefix=/opt/NX
+ make || return 1
+ cp -a libXcompshad.so* $startdir/pkg/opt/NX/lib
+
+ cd $startdir/src/nxcompsh
+ ./configure --prefix=/opt/NX
+ make || return 1
+ cp -a libXcompsh.so* $startdir/pkg/opt/NX/lib
+
cd $startdir/src/nxproxy
./configure --prefix=/opt/NX
make || return 1
make prefix=$startdir/pkg/opt/NX install || return 1
cd $startdir/src/nx-X11
- if [ "$CARCH" = "x86_64" ]; then
- patch -Np1 -i ../XlcDL.c.64bit.diff || return 1
- patch -Np1 -i ../Millis.c.64bit.diff || return 1
- patch -Np0 -i ../Millis.h.64bit.diff || return 1
- fi
- # resume patch
- #patch -Np1 -i ../nx-x11-windows-linux-resume.patch || return 1
make World || return 1
cp -a lib/X11/libX11.so* $startdir/pkg/opt/NX/lib
cp -a lib/Xext/libXext.so* $startdir/pkg/opt/NX/lib
- cp -a lib/Xrender/libXrender.so.* $startdir/pkg/opt/NX/lib
+ cp -a lib/Xrender/libXrender.so* $startdir/pkg/opt/NX/lib
install -D -m755 programs/Xserver/nxagent $startdir/pkg/opt/NX/bin/nxagent
install -D -m755 programs/nxauth/nxauth $startdir/pkg/opt/NX/bin/nxauth
@@ -74,19 +68,18 @@
make || return 1
cp -a libXcompext.so* $startdir/pkg/opt/NX/lib
- cd $startdir/src/nxviewer
- xmkmf -a
- cp -a /usr/X11R6/lib/libXp.so* ../nx-X11/exports/lib
- make || return 1
- install -D -m755 nxviewer/nxviewer $startdir/pkg/opt/NX/bin/nxviewer
- install -D -m755 nxpasswd/nxpasswd $startdir/pkg/opt/NX/bin/nxpasswd
-
- cd $startdir/src/nxdesktop
- ./configure --prefix=/opt/NX
- make || return 1
- sed -i 's#install: installbin installkeymaps installman#install: installbin installkeymaps#' Makefile
- make DESTDIR=$startdir/pkg install || return 1
# fix libXcompext linking
cd $startdir/pkg/opt/NX/lib
- ln -s libXcompext.so.2 libXcompext.so.1
+ ln -s libXcompext.so.3 libXcompext.so.1
}
+md5sums=('8b3deb7de091119a159aba15baf7f0b1'
+ '24e6e57f80b89abab29d9e19128d8353'
+ '683b58afdfc9a429320f81da984dbd63'
+ '872c9972ea9614479372c065dbcd9fab'
+ '8b761b9c7544cb79e0da8de0de9d8850'
+ '04cc2ea789b969d278d78e9f65f0cef1'
+ '267246b2bf93adb38ed83b131d9f449d'
+ '739c3a4d54e6e3254a13084b117ca60f'
+ 'bafe1d93b863f4ae8e93b141f299be9c'
+ 'fb5e6c5dbbb1e453282ea6176547e987'
+ '58341ba70dfab92ff38570071fbbf88a')
Index: extra/network/nxserver/XlcDL.c.64bit.diff
diff -u extra/network/nxserver/XlcDL.c.64bit.diff:1.1 extra/network/nxserver/XlcDL.c.64bit.diff:removed
--- extra/network/nxserver/XlcDL.c.64bit.diff:1.1 Sun Mar 25 10:23:55 2007
+++ extra/network/nxserver/XlcDL.c.64bit.diff Tue Oct 9 12:04:29 2007
@@ -1,12 +0,0 @@
-diff -ur lib.old/X11/XlcDL.c lib/X11/XlcDL.c
---- nx-X11.old/lib/X11/XlcDL.c 2006-06-19 16:20:46.000000000 +0200
-+++ nx-X11/lib/X11/XlcDL.c 2007-02-12 06:32:53.000000000 +0100
-@@ -61,7 +61,7 @@
- # elif defined(__ia64__)
- # undef MACH64_NAME
- # else
--# error "Unknown architecture"
-+# warning "Unknown architecture"
- # endif /* defined(__sparcv9) */
- # ifdef _MACH64_NAME
- # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
Index: extra/network/nxserver/nx-x11-windows-linux-resume.patch
diff -u extra/network/nxserver/nx-x11-windows-linux-resume.patch:1.1 extra/network/nxserver/nx-x11-windows-linux-resume.patch:removed
--- extra/network/nxserver/nx-x11-windows-linux-resume.patch:1.1 Fri Aug 19 04:27:14 2005
+++ extra/network/nxserver/nx-x11-windows-linux-resume.patch Tue Oct 9 12:04:29 2007
@@ -1,37 +0,0 @@
---- nx-X11/programs/Xserver/hw/nxagent/Display.c.orig 2005-07-29 09:01:11.000000000 -0700
-+++ nx-X11/programs/Xserver/hw/nxagent/Display.c 2005-07-30 07:16:06.000000000 -0700
-@@ -1531,11 +1531,12 @@
- reconnectDisplayState = NOTHING;
- }
-
-+#define WARNING
- static Bool reloadVisuals(int flexibility)
- {
- int i, nitems;
- XVisualInfo *newVisuals, *vi;
-- unsigned long mask = VisualAllMask & ~VisualIDMask;
-+ unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask;
-
- newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);
-
-@@ -1577,6 +1578,10 @@
- }
- }
-
-+ #ifdef WARNING
-+ fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i);
-+ #endif
-+
- if (i == nxagentNumVisuals)
- {
- nxagentVisuals = newVisuals;
---- nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig 2005-07-30 07:17:40.000000000 -0700
-+++ nx-X11/programs/Xserver/hw/nxagent/Visual.c 2005-07-30 07:17:44.000000000 -0700
-@@ -48,7 +48,6 @@
- for (i = 0; i < nxagentNumVisuals; i++)
- {
- if (pVisual->class == nxagentVisuals[i].class &&
-- pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb &&
- pVisual->ColormapEntries == nxagentVisuals[i].colormap_size &&
- pVisual->nplanes == nxagentVisuals[i].depth &&
- pVisual->redMask == nxagentVisuals[i].red_mask &&
More information about the arch-commits
mailing list