[arch-commits] Commit in nx/repos (8 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Oct 8 18:52:28 UTC 2012


    Date: Monday, October 8, 2012 @ 14:52:28
  Author: andyrtr
Revision: 168322

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nx/repos/testing-i686/
  nx/repos/testing-i686/PKGBUILD
    (from rev 168321, nx/trunk/PKGBUILD)
  nx/repos/testing-i686/nx-cflags.patch
    (from rev 168321, nx/trunk/nx-cflags.patch)
  nx/repos/testing-i686/nx-x11.ld.so.conf.d
    (from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)
  nx/repos/testing-x86_64/
  nx/repos/testing-x86_64/PKGBUILD
    (from rev 168321, nx/trunk/PKGBUILD)
  nx/repos/testing-x86_64/nx-cflags.patch
    (from rev 168321, nx/trunk/nx-cflags.patch)
  nx/repos/testing-x86_64/nx-x11.ld.so.conf.d
    (from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)

------------------------------------+
 testing-i686/PKGBUILD              |  145 +++++++++++++++++++++++++++++++++++
 testing-i686/nx-cflags.patch       |   54 +++++++++++++
 testing-i686/nx-x11.ld.so.conf.d   |    1 
 testing-x86_64/PKGBUILD            |  145 +++++++++++++++++++++++++++++++++++
 testing-x86_64/nx-cflags.patch     |   54 +++++++++++++
 testing-x86_64/nx-x11.ld.so.conf.d |    1 
 6 files changed, 400 insertions(+)

Copied: nx/repos/testing-i686/PKGBUILD (from rev 168321, nx/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1,145 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.15
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+             )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
+        nx-x11.ld.so.conf.d
+        nx-cflags.patch)
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
+         'f2ec60c7e2d81bef2f7292d2b33681a6'
+         'd0c5b88aac0473e19699cf62d84b9d5f')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+  # Gentoo hacks to honor cflags
+  patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+  # Run autoreconf in all neeed folders
+  for i in nxcomp nxcompext nxcompshad nxproxy; do
+     cd ${i}
+     autoreconf -vfi #${i}
+     cd ..
+  done
+  
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+    
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxproxy .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+	
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxauth .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxauth
+  
+  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxagent .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxagent
+  # required nxcompshad libs
+  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+}
+
+package_nx-headers() {
+
+  pkgdesc="NX headers"
+  
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}  

Copied: nx/repos/testing-i686/nx-cflags.patch (from rev 168321, nx/trunk/nx-cflags.patch)
===================================================================
--- testing-i686/nx-cflags.patch	                        (rev 0)
+++ testing-i686/nx-cflags.patch	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+--- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then

Copied: nx/repos/testing-i686/nx-x11.ld.so.conf.d (from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)
===================================================================
--- testing-i686/nx-x11.ld.so.conf.d	                        (rev 0)
+++ testing-i686/nx-x11.ld.so.conf.d	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1 @@
+/usr/lib/nx/

Copied: nx/repos/testing-x86_64/PKGBUILD (from rev 168321, nx/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1,145 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.15
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+             )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
+        nx-x11.ld.so.conf.d
+        nx-cflags.patch)
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
+         'f2ec60c7e2d81bef2f7292d2b33681a6'
+         'd0c5b88aac0473e19699cf62d84b9d5f')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+  # Gentoo hacks to honor cflags
+  patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+  # Run autoreconf in all neeed folders
+  for i in nxcomp nxcompext nxcompshad nxproxy; do
+     cd ${i}
+     autoreconf -vfi #${i}
+     cd ..
+  done
+  
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+    
+  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxproxy .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+	
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxauth .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxauth
+  
+  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv /usr/lib/nx/bin/nxagent .
+  
+  # the wrapper
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxagent
+  # required nxcompshad libs
+  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+}
+
+package_nx-headers() {
+
+  pkgdesc="NX headers"
+  
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}  

Copied: nx/repos/testing-x86_64/nx-cflags.patch (from rev 168321, nx/trunk/nx-cflags.patch)
===================================================================
--- testing-x86_64/nx-cflags.patch	                        (rev 0)
+++ testing-x86_64/nx-cflags.patch	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+--- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then

Copied: nx/repos/testing-x86_64/nx-x11.ld.so.conf.d (from rev 168321, nx/trunk/nx-x11.ld.so.conf.d)
===================================================================
--- testing-x86_64/nx-x11.ld.so.conf.d	                        (rev 0)
+++ testing-x86_64/nx-x11.ld.so.conf.d	2012-10-08 18:52:28 UTC (rev 168322)
@@ -0,0 +1 @@
+/usr/lib/nx/




More information about the arch-commits mailing list