| 1 |
commit: 7b04083d729910375e9522302739dc9555c870e4 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 20:48:45 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 20:49:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b04083d |
| 7 |
|
| 8 |
net-misc/tigervnc: Bump to v1.7.1 (bug #606460) |
| 9 |
|
| 10 |
Ebuild changes: |
| 11 |
=============== |
| 12 |
- JAVA support fixed; Previously, when system's VM was set to a JRE, |
| 13 |
building of VncViewer.jar failed because ebuild didn't switch |
| 14 |
active JAVA VM to JDK because DEPEND also contained virtual/jre |
| 15 |
value from RDEPEND. |
| 16 |
|
| 17 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 18 |
|
| 19 |
net-misc/tigervnc/Manifest | 1 + |
| 20 |
net-misc/tigervnc/tigervnc-1.7.1.ebuild | 188 ++++++++++++++++++++++++++++++++ |
| 21 |
2 files changed, 189 insertions(+) |
| 22 |
|
| 23 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
| 24 |
index 5e456b5..5be3f6e 100644 |
| 25 |
--- a/net-misc/tigervnc/Manifest |
| 26 |
+++ b/net-misc/tigervnc/Manifest |
| 27 |
@@ -1,5 +1,6 @@ |
| 28 |
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481 |
| 29 |
DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135 WHIRLPOOL a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec |
| 30 |
DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004 WHIRLPOOL 63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668 |
| 31 |
+DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc |
| 32 |
DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c |
| 33 |
DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f |
| 34 |
|
| 35 |
diff --git a/net-misc/tigervnc/tigervnc-1.7.1.ebuild b/net-misc/tigervnc/tigervnc-1.7.1.ebuild |
| 36 |
new file mode 100644 |
| 37 |
index 00000000..9a04c43 |
| 38 |
--- /dev/null |
| 39 |
+++ b/net-misc/tigervnc/tigervnc-1.7.1.ebuild |
| 40 |
@@ -0,0 +1,188 @@ |
| 41 |
+# Copyright 1999-2017 Gentoo Foundation |
| 42 |
+# Distributed under the terms of the GNU General Public License v2 |
| 43 |
+# $Id$ |
| 44 |
+ |
| 45 |
+EAPI="6" |
| 46 |
+ |
| 47 |
+CMAKE_IN_SOURCE_BUILD=1 |
| 48 |
+ |
| 49 |
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd |
| 50 |
+ |
| 51 |
+XSERVER_VERSION="1.18.4" |
| 52 |
+ |
| 53 |
+DESCRIPTION="Remote desktop viewer display system" |
| 54 |
+HOMEPAGE="http://www.tigervnc.org" |
| 55 |
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 56 |
+ mirror://gentoo/${PN}.png |
| 57 |
+ https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 |
| 58 |
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
| 59 |
+ |
| 60 |
+LICENSE="GPL-2" |
| 61 |
+SLOT="0" |
| 62 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
| 63 |
+IUSE="+drm gnutls java +opengl pam server +xorgmodule" |
| 64 |
+ |
| 65 |
+CDEPEND="virtual/jpeg:0 |
| 66 |
+ sys-libs/zlib |
| 67 |
+ >=x11-libs/libXtst-1.0.99.2 |
| 68 |
+ >=x11-libs/fltk-1.3.1 |
| 69 |
+ gnutls? ( net-libs/gnutls:= ) |
| 70 |
+ pam? ( virtual/pam ) |
| 71 |
+ server? ( |
| 72 |
+ dev-lang/perl |
| 73 |
+ >=x11-libs/libXi-1.2.99.1 |
| 74 |
+ >=x11-libs/libXfont-1.4.2 |
| 75 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 76 |
+ x11-libs/libXrender |
| 77 |
+ >=x11-libs/pixman-0.27.2 |
| 78 |
+ >=x11-apps/xauth-1.0.3 |
| 79 |
+ x11-apps/xsetroot |
| 80 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 81 |
+ opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) |
| 82 |
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
| 83 |
+ drm? ( x11-libs/libdrm ) |
| 84 |
+ )" |
| 85 |
+ |
| 86 |
+RDEPEND="${CDEPEND} |
| 87 |
+ java? ( >=virtual/jre-1.5:* ) |
| 88 |
+ !net-misc/vnc |
| 89 |
+ !net-misc/tightvnc |
| 90 |
+ !net-misc/xf4vnc" |
| 91 |
+ |
| 92 |
+DEPEND="${CDEPEND} |
| 93 |
+ amd64? ( dev-lang/nasm ) |
| 94 |
+ x86? ( dev-lang/nasm ) |
| 95 |
+ >=x11-proto/inputproto-2.2.99.1 |
| 96 |
+ >=x11-proto/xextproto-7.2.99.901 |
| 97 |
+ >=x11-proto/xproto-7.0.26 |
| 98 |
+ java? ( >=virtual/jdk-1.5 ) |
| 99 |
+ server? ( |
| 100 |
+ virtual/pkgconfig |
| 101 |
+ media-fonts/font-util |
| 102 |
+ x11-misc/util-macros |
| 103 |
+ >=x11-proto/bigreqsproto-1.1.0 |
| 104 |
+ >=x11-proto/compositeproto-0.4 |
| 105 |
+ >=x11-proto/damageproto-1.1 |
| 106 |
+ >=x11-proto/fixesproto-5.0 |
| 107 |
+ >=x11-proto/fontsproto-2.1.3 |
| 108 |
+ >=x11-proto/glproto-1.4.17 |
| 109 |
+ >=x11-proto/randrproto-1.4.0 |
| 110 |
+ >=x11-proto/renderproto-0.11 |
| 111 |
+ >=x11-proto/resourceproto-1.2.0 |
| 112 |
+ >=x11-proto/scrnsaverproto-1.1 |
| 113 |
+ >=x11-proto/videoproto-2.2.2 |
| 114 |
+ >=x11-proto/xcmiscproto-1.2.0 |
| 115 |
+ >=x11-proto/xineramaproto-1.1.3 |
| 116 |
+ >=x11-libs/xtrans-1.3.3 |
| 117 |
+ >=x11-proto/dri2proto-2.8 |
| 118 |
+ opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
| 119 |
+ )" |
| 120 |
+ |
| 121 |
+PATCHES=( |
| 122 |
+ "${WORKDIR}"/patches/010_libvnc-os.patch |
| 123 |
+ "${WORKDIR}"/patches/030_manpages.patch |
| 124 |
+ "${WORKDIR}"/patches/055_xstartup.patch |
| 125 |
+) |
| 126 |
+ |
| 127 |
+src_prepare() { |
| 128 |
+ if use server ; then |
| 129 |
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die |
| 130 |
+ fi |
| 131 |
+ |
| 132 |
+ default |
| 133 |
+ |
| 134 |
+ if use server ; then |
| 135 |
+ cd unix/xserver || die |
| 136 |
+ eapply ../xserver118.patch |
| 137 |
+ eautoreconf |
| 138 |
+ fi |
| 139 |
+} |
| 140 |
+ |
| 141 |
+src_configure() { |
| 142 |
+ use arm || use hppa && append-flags "-fPIC" |
| 143 |
+ |
| 144 |
+ local mycmakeargs=( |
| 145 |
+ -DENABLE_GNUTLS=$(usex gnutls) |
| 146 |
+ -DENABLE_PAM=$(usex pam) |
| 147 |
+ -DBUILD_JAVA=$(usex java) |
| 148 |
+ ) |
| 149 |
+ |
| 150 |
+ cmake-utils_src_configure |
| 151 |
+ |
| 152 |
+ if use server; then |
| 153 |
+ cd unix/xserver || die |
| 154 |
+ econf \ |
| 155 |
+ $(use_enable opengl glx) \ |
| 156 |
+ $(use_enable drm libdrm) \ |
| 157 |
+ --disable-config-hal \ |
| 158 |
+ --disable-config-udev \ |
| 159 |
+ --disable-devel-docs \ |
| 160 |
+ --disable-dmx \ |
| 161 |
+ --disable-dri \ |
| 162 |
+ --disable-dri3 \ |
| 163 |
+ --disable-glamor \ |
| 164 |
+ --disable-kdrive \ |
| 165 |
+ --disable-libunwind \ |
| 166 |
+ --disable-linux-acpi \ |
| 167 |
+ --disable-record \ |
| 168 |
+ --disable-selective-werror \ |
| 169 |
+ --disable-silent-rules \ |
| 170 |
+ --disable-static \ |
| 171 |
+ --disable-tslib \ |
| 172 |
+ --disable-unit-tests \ |
| 173 |
+ --disable-xephyr \ |
| 174 |
+ --disable-xinerama \ |
| 175 |
+ --disable-xnest \ |
| 176 |
+ --disable-xorg \ |
| 177 |
+ --disable-xvfb \ |
| 178 |
+ --disable-xwin \ |
| 179 |
+ --disable-xwayland \ |
| 180 |
+ --enable-dri2 \ |
| 181 |
+ --with-pic \ |
| 182 |
+ --without-dtrace \ |
| 183 |
+ --disable-present \ |
| 184 |
+ --disable-unit-tests |
| 185 |
+ fi |
| 186 |
+} |
| 187 |
+ |
| 188 |
+src_compile() { |
| 189 |
+ cmake-utils_src_compile |
| 190 |
+ |
| 191 |
+ if use server; then |
| 192 |
+ # deps of the vnc module and the module itself |
| 193 |
+ local d subdirs=( |
| 194 |
+ fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb |
| 195 |
+ composite dix mi os hw/vnc |
| 196 |
+ ) |
| 197 |
+ for d in "${subdirs[@]}"; do |
| 198 |
+ emake -C unix/xserver/"${d}" |
| 199 |
+ done |
| 200 |
+ fi |
| 201 |
+} |
| 202 |
+ |
| 203 |
+src_install() { |
| 204 |
+ cmake-utils_src_install |
| 205 |
+ |
| 206 |
+ newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
| 207 |
+ make_desktop_entry vncviewer vncviewer vncviewer Network |
| 208 |
+ |
| 209 |
+ if use server ; then |
| 210 |
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
| 211 |
+ if ! use xorgmodule; then |
| 212 |
+ rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die |
| 213 |
+ else |
| 214 |
+ rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
| 215 |
+ fi |
| 216 |
+ |
| 217 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 218 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 219 |
+ systemd_douserunit contrib/systemd/user/vncserver@.service |
| 220 |
+ else |
| 221 |
+ local f |
| 222 |
+ cd "${ED}" || die |
| 223 |
+ for f in vncserver vncpasswd x0vncserver vncconfig; do |
| 224 |
+ rm usr/bin/$f || die |
| 225 |
+ rm usr/share/man/man1/$f.1 || die |
| 226 |
+ done |
| 227 |
+ fi |
| 228 |
+} |
Archives