From a471bf33f6c62b439c070eb427dcd4a90f613165 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 14 Nov 2014 12:41:04 +0000 Subject: [PATCH] Version bump, jpeg-9a patch integrated upstream Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xC74525F2 --- net-misc/nx/ChangeLog | 7 ++- net-misc/nx/Manifest | 10 ++-- net-misc/nx/nx-3.5.0.28.ebuild | 104 +++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 net-misc/nx/nx-3.5.0.28.ebuild diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index 6f795d101029..a0e34c6bb58c 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/nx # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.88 2014/08/22 08:20:03 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.89 2014/11/14 12:40:56 voyageur Exp $ + +*nx-3.5.0.28 (14 Nov 2014) + + 14 Nov 2014; Bernard Cafarelli +nx-3.5.0.28.ebuild: + Version bump, jpeg-9a patch integrated upstream 22 Aug 2014; Bernard Cafarelli nx-3.5.0.20.ebuild, nx-3.5.0.24.ebuild, nx-3.5.0.27.ebuild: diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 1977368bdd53..df6fcef7e312 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -10,15 +10,17 @@ AUX nx-3.5.0.27-jpeg-9a.patch 916 SHA256 e0a8772cc509c1e4cba98340241d1b84bdf2766 DIST nx-libs-3.5.0.20-full.tar.gz 21875905 SHA256 ce53b1c1cc5115d1303b652099c7b7e1a50a996ff0f136853a6fd54bb5668da8 SHA512 0cecdde638c454e6bf48cb73037a0b6651eda4cf93c5953f678a122219df6c06cea70509b044482ea1b630ae413b26a701341b20d55347b57170517aa9709eef WHIRLPOOL a2d8e64db333d02ca22d0d0a8e9e2ea97199fb3315af8cb60ffd617a8e8a0b2851ce87d912d40c3cd00e7455a67a096ac48360a5a1df2ffb4c627ecd0dbed513 DIST nx-libs-3.5.0.24-full.tar.gz 15569555 SHA256 95ed68d34ceec0ce43cb8175d6b555dfde46b5ae8c3fb943ed5a9ff138d5b94b SHA512 b73e657d29c58da46d05ec3b5fd988aa87a77cda288094f26a97ce067539e8517615eca4c7e66239c97a4414d2176179f1ca35a88c22d1b98eca1b1e25dda58b WHIRLPOOL 287d66536d2c09b5a5fd44bf9f8d181752ae5ba9d3036af059ccae768b2c08d221c90ac126cb582dbbbc64cd0e1dcb19f6c42ed9bce20240ac5a52b261a6fe94 DIST nx-libs-3.5.0.27-full.tar.gz 15583374 SHA256 4b328acc9ca680566baf1657a5d26d2d47594ea749cfb4a15e064889287f3efa SHA512 618d98f2a3ddae697ddc7a6f59c9b7c7cd7026aa9c719cc3f4acda10fba1904bef7a7b7f9f4ba2a4c492f04ea3d8baaa9fe5be26b5438a342e5092b7c8128192 WHIRLPOOL 505d3177f8bef3b7d2ece913ebdb14c0c1a1bfc1e97a303f644d9ffbb2a279990d2226e40a71adf0bfce0efbfffc010d5b8501ddd3aa09afa226dc680fab72a6 +DIST nx-libs-3.5.0.28-full.tar.gz 15589759 SHA256 c0448884f35280f92db639a91d3f3a35b3b57581949bd3a4b9da0ae685b57429 SHA512 1139e1f48f566fc9c5ef105ba5f674e6a3881f75b96fc0e1dbdc9e450b53bcf3a29d2422573b69e240840c2941cee67efc96f2024b24f69068c4abebee42660c WHIRLPOOL 4e062aea33fe2d2ac2ffa6baba29cab3a91c6d34cc3b35e95219de83f22ae1e77d55d4b77502a96ad3bd8dc0a3c500e839ec1dbae6b5c98f74baf70bd2ebfcce EBUILD nx-3.5.0.20.ebuild 2650 SHA256 bd3ec2628457e408d58e2add8d1063321b2749c98f24e52959d09c8681ff0599 SHA512 81d838b8c4b77ce2c372cf2c54f42a7b8237eca881302938a7eaec36ce2432328d1821db4d6ed4a4887ed258714b90d2ea07d2c1f6af9accdd2dce2c48496d22 WHIRLPOOL a1167f37505c2a82332f4b3a582f81294b644156aaa452f88da7d92a082a183d4c610af9800d09b9390d255ee04477782e904752303ddfe594fdcb55f6013a63 EBUILD nx-3.5.0.24.ebuild 2803 SHA256 2c16fbc41f0c8397bf3ea90002fe462ab07d71faa93eca07a3d08b1645614269 SHA512 776cf2b8156b420b275046aa752ebf38195c786150774a88d644fe645e145bf7c356772c2c5a01dfc12701e156cd26d0ae0ebe4f9ac4c9264f426893bf676670 WHIRLPOOL 5478bac9c578a570654d74dc3a895fa4cae35e4d8f35d83e2019b3b75356938882daef9e35c38d3c4a632039ac3ea744c3ef0a90ef2176bdf61a87342a8145f5 EBUILD nx-3.5.0.27.ebuild 2852 SHA256 320131763130c3262b8134999cd614e1aa40d8245a122083cf6660802f7eccc7 SHA512 7941b1dc2825522462ccb988d10055cd6d430f14b6e19b64efd6200ab9306a75722f480e055396887766b09eb0a6374475b962a58b7857a38311d45ca88a2a84 WHIRLPOOL 25a8809fdcf15cc81b8449448fd84dc79b0749389645e5849a973a67664ec551ca003769f4584423b392ae59ec33fd30bec720167aa2dadf026bcca365b48417 -MISC ChangeLog 14077 SHA256 cfe106360e0bef58800e867236690da1194563877ca9a3c28bbcb2d21b3ebbdf SHA512 545899fcb3be1086169a4bba7d05d6cb6aced5cb715d6d890d7bcf24acc58fd85282f1e6c71f2f78ad7a76a514ec064497f447b0285b695da6e4b6f8886957fa WHIRLPOOL 90648ee950fd04cf05a400e93f05e90826f7a64dab2f0c85645bd52c26cda477bc1a62581a3151cb9a0d4ecc2b0f95dcfab98ec944588b2cf4eeaaa86fd00db2 +EBUILD nx-3.5.0.28.ebuild 2803 SHA256 3f799808fac650b656cc9628e659188ee9e176e09ad372fa800073371dde87a0 SHA512 67a153473d8eee4e5f41fab5e074fea8c33f05c2f0cbbfae89663cbc1e85ee728bba0552c0631807c4e963aa1c6f7794de8264821a72dd18c3a53f60cee980fc WHIRLPOOL 22d6cc85bc4d5c33154f7df62ac7dcc6a68a3a0836d76256cb35a58fe09d2e097d2dfacc70a0accacad257d9c75a8905c1cf41a887c64f2167fb4ddd8e16669e +MISC ChangeLog 14232 SHA256 a296fcc9fb7e20a1d270542f399a03ed83326ad20c80323708ed65607aab82ae SHA512 67e4c3c9dc6314e609101c86ca2f4154111a78e29eaebce0692b504d0a3fb8d062b3b41cf1702c9f2282b579e229bc9fcf126b759295bd6857dc59943ef93fa7 WHIRLPOOL 3ba8fdbb6236b52b7931b68169a03269696da39791a37c7a18aad3e89febbf8cd3246e22dbba7d3c66c1cbfd4774f3ff700aeb0a68ed4e6d54a18284adf8772c MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlP2/T4ACgkQFYEBGcdFJfKoGAD9FolnLjsdLHHMPkEY7BnR7BX2 -CA0JjOx6auixYy4ckqoA/3tQYyIzxzf0HDyUYzQzKWWhTJMsspGt/7kfZXo2LhKl -=Gpm9 +iF4EAREIAAYFAlRl+F0ACgkQFYEBGcdFJfJFiQD/c/E/JuQOR3KSqJKtx6MmVpaG +dU37YGV3KEaldKDCgiABAK0Ml/CmN3P5aAdYiNs4TzlECdrL7P3X/5hUjS+SwY7v +=CVsg -----END PGP SIGNATURE----- diff --git a/net-misc/nx/nx-3.5.0.28.ebuild b/net-misc/nx/nx-3.5.0.28.ebuild new file mode 100644 index 000000000000..0f0ff0856e64 --- /dev/null +++ b/net-misc/nx/nx-3.5.0.28.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.28.ebuild,v 1.1 2014/11/14 12:40:56 voyageur Exp $ + +EAPI=5 +inherit autotools eutils multilib readme.gentoo + +DESCRIPTION="NX compression technology core libraries" +HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs" + +SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="elibc_glibc" + +RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 + >=sys-libs/zlib-1.2.3 + virtual/jpeg" + +DEPEND="${RDEPEND} + x11-misc/gccmakedep + x11-misc/imake + x11-proto/inputproto" + +S=${WORKDIR}/nx-libs-${PV} + +DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb +useflag on x11-libs/cairo." + +src_prepare() { + # For nxcl/qtnx + cd "${S}"/nxproxy + epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch + + cd "${S}" + # -fPIC + epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch + # Drop force -O3, set AR/RANLIB and + # run autoreconf in all neeed folders + epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch + for i in nxcomp nxcompext nxcompshad nxproxy; do + cd "${S}"/${i} + eautoreconf ${i} + cd "${S}" + done + + # From xorg-x11-6.9.0-r3.ebuild + cd "${S}/nx-X11" + HOSTCONF="config/cf/host.def" + echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} + 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} +} + +src_configure() { + cd "${S}"/nxproxy + econf +} + +src_compile() { + cd "${S}/nx-X11" + FAST=1 emake World WORLDOPTS="" MAKE="make" \ + AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" + + cd "${S}"/nxproxy + emake +} + +src_install() { + NX_ROOT=/usr/$(get_libdir)/NX + + for x in nxagent nxauth nxproxy; do + make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) || + die " $x wrapper creation failed" + done + + into ${NX_ROOT} + dobin "${S}"/nx-X11/programs/Xserver/nxagent + dobin "${S}"/nx-X11/programs/nxauth/nxauth + dobin "${S}"/nxproxy/nxproxy + + for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst; + do + dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so* + done + + dolib.so "${S}"/nxcomp/libXcomp.so* + dolib.so "${S}"/nxcompext/libXcompext.so* + dolib.so "${S}"/nxcompshad/libXcompshad.so* + + insinto /etc/nxagent + newins etc/keystrokes.cfg keystroke.cfg + doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm + + readme.gentoo_create_doc +} -- 2.26.2