From d0177bce3091438151109e795760ad34a365bcce Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 14 Jun 2010 21:28:26 +0000 Subject: [PATCH] net-misc/nxcompext: Initial checkin git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2257 6952d904-891a-0410-993b-d76249ca496b --- net-misc/nxcompext/ChangeLog | 11 ++++ net-misc/nxcompext/Manifest | 7 +++ .../nxcompext-3.4.0-NXlib-xgetioerror.patch | 21 +++++++ .../files/nxcompext-3.4.0-cflags.patch | 21 +++++++ .../nxcompext-3.4.0-no-local-nxcomp.patch | 31 ++++++++++ net-misc/nxcompext/metadata.xml | 34 +++++++++++ net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild | 56 +++++++++++++++++++ 7 files changed, 181 insertions(+) create mode 100644 net-misc/nxcompext/ChangeLog create mode 100644 net-misc/nxcompext/Manifest create mode 100644 net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch create mode 100644 net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch create mode 100644 net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch create mode 100644 net-misc/nxcompext/metadata.xml create mode 100644 net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild diff --git a/net-misc/nxcompext/ChangeLog b/net-misc/nxcompext/ChangeLog new file mode 100644 index 00000000..91be4e00 --- /dev/null +++ b/net-misc/nxcompext/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for net-misc/nxcompext +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 14 Jun 2010; Mario Fetka + +nxcompext-3.4.0_p1.ebuild, + +files/nxcompext-3.4.0-NXlib-xgetioerror.patch, + +files/nxcompext-3.4.0-cflags.patch, + +files/nxcompext-3.4.0-no-local-nxcomp.patch, +metadata.xml: + Initial checkin + diff --git a/net-misc/nxcompext/Manifest b/net-misc/nxcompext/Manifest new file mode 100644 index 00000000..fba42c86 --- /dev/null +++ b/net-misc/nxcompext/Manifest @@ -0,0 +1,7 @@ +AUX nxcompext-3.4.0-NXlib-xgetioerror.patch 668 RMD160 7d1f353ad43c62470b7fda49f0e09f25418c35c7 SHA1 c683f3f3506cf74ec6ca31fb684b8efe3faaf862 SHA256 3e0ac8d9de1364905e31e848f2fe560e3aebd134aaa2687e2657e5f3b67e5241 +AUX nxcompext-3.4.0-cflags.patch 440 RMD160 37e26f38141eff0f1799ba7eaf4ada61bee2f93c SHA1 22e361704a854ffdbf59f2063c34738a40c74417 SHA256 33fea3a9f40a63a3a01684931b08bae87194c24ba92a58819fb2c6f58f9d51af +AUX nxcompext-3.4.0-no-local-nxcomp.patch 1268 RMD160 b917fca0f7e609df482479b06c181536a8b46ae9 SHA1 4276fd3023b69ed8513d379d46c09ab8b7fa6a35 SHA256 6ad635a96ed22bdb207fbf79fefd64ea21d5b56ee5aaeafd7d4a8de481e7517b +DIST nxcompext-3.4.0-1.tar.gz 90215 RMD160 99205a950af62641a04faf234431f7411b06320f SHA1 2a594c6cdb837a2de20079db0702daa2ba1c288f SHA256 75be77fe0cdc3aca21afd0b72590d600b131b849b8e65926c237c3d87dd1160e +EBUILD nxcompext-3.4.0_p1.ebuild 1198 RMD160 e019d295e640f3cbc744447254671c675329f762 SHA1 2c67dfdcb56d620f8e02f11d3f92541680ab4f0e SHA256 e44154ce959622e1cb1c0ace50301690a60296cf79936895c949b940d9aef87e +MISC ChangeLog 371 RMD160 88086e833ef2f74a2b11e10fff9a0e44c3a0d2d4 SHA1 f77f531cea40497cf0a2cf0f919826e48dc81930 SHA256 211abb505220cad73147f3db018a1fe3720a5ccb569a672b26fb3c39195aa27f +MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch new file mode 100644 index 00000000..cc6275b4 --- /dev/null +++ b/net-misc/nxcompext/files/nxcompext-3.4.0-NXlib-xgetioerror.patch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_NXlib-xgetioerror.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Copied and description at the site: +## DP: http://www.felipe-alfaro.org/blog/2007/11/24/installing-freenx-071-on-ubuntu/ + +@DPATCH@ +diff -urNad nxcompext-3.3.0-2~/NXlib.c nxcompext-3.3.0-2/NXlib.c +--- nxcompext-3.3.0-2~/NXlib.c 2007-11-12 13:01:30.000000000 -0200 ++++ nxcompext-3.3.0-2/NXlib.c 2008-11-20 23:13:43.000000000 -0200 +@@ -56,6 +56,9 @@ + + #include "MD5.h" + ++#define _XGetIOError(dpy) \ ++ (dpy -> flags & XlibDisplayIOError) ++ + #define PANIC + #define WARNING + #undef TEST diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch new file mode 100644 index 00000000..f0f01aba --- /dev/null +++ b/net-misc/nxcompext/files/nxcompext-3.4.0-cflags.patch @@ -0,0 +1,21 @@ +Title: Remove hardcoded O3 compiler flag +DEP: 3 +State: CANDIDATE +Date: 2009-12-19 +Abstract: + Remove hardcoded O3 compiler flag + +--- 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="" diff --git a/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch b/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch new file mode 100644 index 00000000..9eebd1d9 --- /dev/null +++ b/net-misc/nxcompext/files/nxcompext-3.4.0-no-local-nxcomp.patch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_no-local-nxcomp.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch make nxcompext build with system libs + +@DPATCH@ +diff -urNad nxcompext-3.3.0-2~/Makefile.in nxcompext-3.3.0-2/Makefile.in +--- nxcompext-3.3.0-2~/Makefile.in 2007-06-04 10:11:39.000000000 -0300 ++++ nxcompext-3.3.0-2/Makefile.in 2008-11-20 23:13:29.000000000 -0200 +@@ -31,17 +31,17 @@ + CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ + -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wnested-externs +-CXXINCLUDES = -I. -I../nxcomp ++CXXINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 + CXXDEFINES = + + CC = @CC@ + CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ + -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wnested-externs +-CCINCLUDES = -I. -I../nxcomp ++CCINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 + CCDEFINES = + +-LDFLAGS = @LDFLAGS@ -L../nxcomp ++LDFLAGS = @LDFLAGS@ -L/usr/lib/nx/ + LIBS = @LIBS@ -lz -lX11 -lXcomp + + # diff --git a/net-misc/nxcompext/metadata.xml b/net-misc/nxcompext/metadata.xml new file mode 100644 index 00000000..46a44e57 --- /dev/null +++ b/net-misc/nxcompext/metadata.xml @@ -0,0 +1,34 @@ + + + + +no-herd + + @gentoo.org + + + + + diff --git a/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild b/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild new file mode 100644 index 00000000..db141f8f --- /dev/null +++ b/net-misc/nxcompext/nxcompext-3.4.0_p1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +MY_P=${P/_p/-} +MY_PV=${PV/_p*/} + +inherit autotools eutils multilib + +DESCRIPTION="NX compression technology core libraries" +HOMEPAGE="http://www.nomachine.com/developers.php" +SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXtst + >=media-libs/jpeg-6b-r4 + >=media-libs/libpng-1.2.8 + >=sys-libs/zlib-1.2.3 + !<=net-misc/nx-${MY_PV} + >=net-misc/nxcomp-${MY_PV}" + +DEPEND="${RDEPEND}" + +S=${WORKDIR}/nxcompext + +src_prepare() { + # Respect CFLAGS/CXXFLAGS + epatch "${FILESDIR}"/nxcompext-3.4.0-cflags.patch + # Use System nxcomp + epatch "${FILESDIR}"/nxcompext-3.4.0-no-local-nxcomp.patch + # IOError + epatch "${FILESDIR}"/nxcompext-3.4.0-NXlib-xgetioerror.patch + # Run autoreconf in all neeed folders + eautoreconf +} + +src_install() { + # Install Libs + dolib libXcompext.a + dolib.so libXcompext.so* + # Install Header + insinto /usr/include/nx + doins NX*.h +}