| 1 |
commit: 4739609a4554cc4ce24dad88370594f0a225c278 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 27 20:43:49 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 27 20:48:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4739609a |
| 7 |
|
| 8 |
net-misc/tigervnc: Bump to 1.6.0 |
| 9 |
|
| 10 |
Update TigerVNC to 1.6.0. Clean up the ebuild. Bump xserver to 1.17.4. |
| 11 |
|
| 12 |
net-misc/tigervnc/Manifest | 2 + |
| 13 |
net-misc/tigervnc/tigervnc-1.6.0.ebuild | 168 ++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 170 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
| 17 |
index d2aa94f..7f4e2f9 100644 |
| 18 |
--- a/net-misc/tigervnc/Manifest |
| 19 |
+++ b/net-misc/tigervnc/Manifest |
| 20 |
@@ -3,8 +3,10 @@ DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 5bcaabd8993274a5ce1718efc15 |
| 21 |
DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d WHIRLPOOL 35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99 |
| 22 |
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481 |
| 23 |
DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f WHIRLPOOL 420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5 |
| 24 |
+DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135 WHIRLPOOL a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec |
| 25 |
DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c |
| 26 |
DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8 SHA512 7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d WHIRLPOOL 905d3b47938e5e5604b04953f11ec7acee9298d6f32570612d6301ac71b0c5a49e774267b627957b7a6a94f6b9bf211c9ed6b7102f389a2120a40bd45502a6d7 |
| 27 |
DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56 |
| 28 |
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 |
| 29 |
DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 |
| 30 |
+DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab |
| 31 |
|
| 32 |
diff --git a/net-misc/tigervnc/tigervnc-1.6.0.ebuild b/net-misc/tigervnc/tigervnc-1.6.0.ebuild |
| 33 |
new file mode 100644 |
| 34 |
index 0000000..0336830 |
| 35 |
--- /dev/null |
| 36 |
+++ b/net-misc/tigervnc/tigervnc-1.6.0.ebuild |
| 37 |
@@ -0,0 +1,168 @@ |
| 38 |
+# Copyright 1999-2015 Gentoo Foundation |
| 39 |
+# Distributed under the terms of the GNU General Public License v2 |
| 40 |
+# $Id$ |
| 41 |
+ |
| 42 |
+EAPI=6 |
| 43 |
+ |
| 44 |
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 |
| 45 |
+ |
| 46 |
+XSERVER_VERSION="1.17.4" |
| 47 |
+ |
| 48 |
+DESCRIPTION="Remote desktop viewer display system" |
| 49 |
+HOMEPAGE="http://www.tigervnc.org" |
| 50 |
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 51 |
+ mirror://gentoo/${PN}.png |
| 52 |
+ https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 |
| 53 |
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
| 54 |
+ |
| 55 |
+LICENSE="GPL-2" |
| 56 |
+SLOT="0" |
| 57 |
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86" |
| 58 |
+IUSE="gnutls java +opengl pam server +xorgmodule" |
| 59 |
+ |
| 60 |
+RDEPEND="virtual/jpeg:0 |
| 61 |
+ sys-libs/zlib |
| 62 |
+ >=x11-libs/libXtst-1.0.99.2 |
| 63 |
+ >=x11-libs/fltk-1.3.1 |
| 64 |
+ gnutls? ( net-libs/gnutls ) |
| 65 |
+ java? ( >=virtual/jre-1.5 ) |
| 66 |
+ pam? ( virtual/pam ) |
| 67 |
+ server? ( |
| 68 |
+ dev-lang/perl |
| 69 |
+ >=x11-libs/libXi-1.2.99.1 |
| 70 |
+ >=x11-libs/libXfont-1.4.2 |
| 71 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 72 |
+ x11-libs/libXrender |
| 73 |
+ >=x11-libs/pixman-0.27.2 |
| 74 |
+ >=x11-apps/xauth-1.0.3 |
| 75 |
+ x11-apps/xsetroot |
| 76 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 77 |
+ opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) |
| 78 |
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
| 79 |
+ ) |
| 80 |
+ !net-misc/vnc |
| 81 |
+ !net-misc/tightvnc |
| 82 |
+ !net-misc/xf4vnc" |
| 83 |
+DEPEND="${RDEPEND} |
| 84 |
+ amd64? ( dev-lang/nasm ) |
| 85 |
+ x86? ( dev-lang/nasm ) |
| 86 |
+ >=x11-proto/inputproto-2.2.99.1 |
| 87 |
+ >=x11-proto/xextproto-7.2.99.901 |
| 88 |
+ >=x11-proto/xproto-7.0.26 |
| 89 |
+ java? ( >=virtual/jdk-1.5 ) |
| 90 |
+ server? ( |
| 91 |
+ virtual/pkgconfig |
| 92 |
+ media-fonts/font-util |
| 93 |
+ x11-misc/util-macros |
| 94 |
+ >=x11-proto/bigreqsproto-1.1.0 |
| 95 |
+ >=x11-proto/compositeproto-0.4 |
| 96 |
+ >=x11-proto/damageproto-1.1 |
| 97 |
+ >=x11-proto/fixesproto-5.0 |
| 98 |
+ >=x11-proto/fontsproto-2.1.3 |
| 99 |
+ >=x11-proto/glproto-1.4.17 |
| 100 |
+ >=x11-proto/randrproto-1.4.0 |
| 101 |
+ >=x11-proto/renderproto-0.11 |
| 102 |
+ >=x11-proto/resourceproto-1.2.0 |
| 103 |
+ >=x11-proto/scrnsaverproto-1.1 |
| 104 |
+ >=x11-proto/videoproto-2.2.2 |
| 105 |
+ >=x11-proto/xcmiscproto-1.2.0 |
| 106 |
+ >=x11-proto/xineramaproto-1.1.3 |
| 107 |
+ >=x11-libs/xtrans-1.3.3 |
| 108 |
+ >=x11-proto/dri2proto-2.8 |
| 109 |
+ opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
| 110 |
+ )" |
| 111 |
+ |
| 112 |
+CMAKE_IN_SOURCE_BUILD=1 |
| 113 |
+ |
| 114 |
+src_prepare() { |
| 115 |
+ if use server ; then |
| 116 |
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver |
| 117 |
+ fi |
| 118 |
+ |
| 119 |
+ eapply "${WORKDIR}"/patches/010_libvnc-os.patch |
| 120 |
+ eapply "${WORKDIR}"/patches/030_manpages.patch |
| 121 |
+ eapply "${WORKDIR}"/patches/055_xstartup.patch |
| 122 |
+ |
| 123 |
+ default |
| 124 |
+ |
| 125 |
+ if use server ; then |
| 126 |
+ cd unix/xserver || die |
| 127 |
+ eapply ../xserver117.patch |
| 128 |
+ eautoreconf |
| 129 |
+ fi |
| 130 |
+} |
| 131 |
+ |
| 132 |
+src_configure() { |
| 133 |
+ local mycmakeargs=( |
| 134 |
+ -DENABLE_GNUTLS=$(usex gnutls) |
| 135 |
+ -DENABLE_PAM=$(usex pam) |
| 136 |
+ -DBUILD_JAVA=$(usex java) |
| 137 |
+ ) |
| 138 |
+ |
| 139 |
+ cmake-utils_src_configure |
| 140 |
+ |
| 141 |
+ if use server; then |
| 142 |
+ cd unix/xserver || die |
| 143 |
+ econf \ |
| 144 |
+ $(use_enable opengl glx) \ |
| 145 |
+ --disable-config-hal \ |
| 146 |
+ --disable-config-udev \ |
| 147 |
+ --disable-devel-docs \ |
| 148 |
+ --disable-dmx \ |
| 149 |
+ --disable-dri \ |
| 150 |
+ --disable-dri3 \ |
| 151 |
+ --disable-glamor \ |
| 152 |
+ --disable-kdrive \ |
| 153 |
+ --disable-libunwind \ |
| 154 |
+ --disable-linux-acpi \ |
| 155 |
+ --disable-record \ |
| 156 |
+ --disable-selective-werror \ |
| 157 |
+ --disable-silent-rules \ |
| 158 |
+ --disable-static \ |
| 159 |
+ --disable-tslib \ |
| 160 |
+ --disable-unit-tests \ |
| 161 |
+ --disable-xephyr \ |
| 162 |
+ --disable-xinerama \ |
| 163 |
+ --disable-xnest \ |
| 164 |
+ --disable-xorg \ |
| 165 |
+ --disable-xvfb \ |
| 166 |
+ --disable-xwin \ |
| 167 |
+ --disable-xwayland \ |
| 168 |
+ --enable-dri2 \ |
| 169 |
+ --with-pic \ |
| 170 |
+ --without-dtrace \ |
| 171 |
+ --disable-present \ |
| 172 |
+ --disable-unit-tests |
| 173 |
+ fi |
| 174 |
+} |
| 175 |
+ |
| 176 |
+src_compile() { |
| 177 |
+ cmake-utils_src_compile |
| 178 |
+ |
| 179 |
+ use server && emake -C unix/xserver |
| 180 |
+} |
| 181 |
+ |
| 182 |
+src_install() { |
| 183 |
+ cmake-utils_src_install |
| 184 |
+ |
| 185 |
+ newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
| 186 |
+ make_desktop_entry vncviewer vncviewer vncviewer Network |
| 187 |
+ |
| 188 |
+ if use server ; then |
| 189 |
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
| 190 |
+ if ! use xorgmodule; then |
| 191 |
+ rm -r "${D}"/usr/$(get_libdir)/xorg || die |
| 192 |
+ else |
| 193 |
+ rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
| 194 |
+ fi |
| 195 |
+ |
| 196 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 197 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 198 |
+ else |
| 199 |
+ cd "${D}" || die |
| 200 |
+ for f in vncserver vncpasswd x0vncserver vncconfig; do |
| 201 |
+ rm usr/bin/$f || die |
| 202 |
+ rm usr/share/man/man1/$f.1 || die |
| 203 |
+ done |
| 204 |
+ fi |
| 205 |
+} |
Archives