commit:     5a83249c9617174eb0140bf517fff9e6cf592d84
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 11:18:06 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 11:18:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a83249c

net-misc/tigervnc: Use newer xorg-server to fix compilation (#586552)

Package-Manager: portage-2.3.0

 net-misc/tigervnc/Manifest                 |   1 +
 net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild | 180 +++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 44671fc..23da392 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,3 +7,4 @@ DIST tigervnc.png 4958 SHA256 
e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb75
 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 
38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 
eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662
 WHIRLPOOL 
bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 
2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 
195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f
 WHIRLPOOL 
a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
 DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 
195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 
c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
 WHIRLPOOL 
439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
+DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f

diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
new file mode 100644
index 00000000..b65f696
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2
+
+XSERVER_VERSION="1.18.4"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org";
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+       mirror://gentoo/${PN}.png
+       https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+       server? ( 
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
  )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="gnutls java +opengl pam server +xorgmodule"
+
+RDEPEND="virtual/jpeg:0
+       sys-libs/zlib
+       >=x11-libs/libXtst-1.0.99.2
+       >=x11-libs/fltk-1.3.1
+       gnutls? ( net-libs/gnutls )
+       java? ( >=virtual/jre-1.5 )
+       pam? ( virtual/pam )
+       server? (
+               dev-lang/perl
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXfont-1.4.2
+               >=x11-libs/libxkbfile-1.0.4
+               x11-libs/libXrender
+               >=x11-libs/pixman-0.27.2
+               >=x11-apps/xauth-1.0.3
+               x11-apps/xsetroot
+               >=x11-misc/xkeyboard-config-2.4.1-r3
+               opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+               xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+       )
+       !net-misc/vnc
+       !net-misc/tightvnc
+       !net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+       amd64? ( dev-lang/nasm )
+       x86? ( dev-lang/nasm )
+       >=x11-proto/inputproto-2.2.99.1
+       >=x11-proto/xextproto-7.2.99.901
+       >=x11-proto/xproto-7.0.26
+       java? ( >=virtual/jdk-1.5 )
+       server? (
+               virtual/pkgconfig
+               media-fonts/font-util
+               x11-misc/util-macros
+               >=x11-proto/bigreqsproto-1.1.0
+               >=x11-proto/compositeproto-0.4
+               >=x11-proto/damageproto-1.1
+               >=x11-proto/fixesproto-5.0
+               >=x11-proto/fontsproto-2.1.3
+               >=x11-proto/glproto-1.4.17
+               >=x11-proto/randrproto-1.4.0
+               >=x11-proto/renderproto-0.11
+               >=x11-proto/resourceproto-1.2.0
+               >=x11-proto/scrnsaverproto-1.1
+               >=x11-proto/videoproto-2.2.2
+               >=x11-proto/xcmiscproto-1.2.0
+               >=x11-proto/xineramaproto-1.1.3
+               >=x11-libs/xtrans-1.3.3
+               >=x11-proto/dri2proto-2.8
+               opengl? ( >=media-libs/mesa-10.3.4-r1 )
+       )"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_prepare() {
+       if use server ; then
+               cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver
+       fi
+
+       eapply "${WORKDIR}"/patches/010_libvnc-os.patch
+       eapply "${WORKDIR}"/patches/030_manpages.patch
+       eapply "${WORKDIR}"/patches/055_xstartup.patch
+       eapply "${FILESDIR}"/${P}-xorg118-1.patch
+
+       default
+
+       if use server ; then
+               cd unix/xserver || die
+               eapply ../xserver117.patch
+               eautoreconf
+       fi
+}
+
+src_configure() {
+       use arm || use hppa && append-flags "-fPIC"
+
+       local mycmakeargs=(
+               -DENABLE_GNUTLS=$(usex gnutls)
+               -DENABLE_PAM=$(usex pam)
+               -DBUILD_JAVA=$(usex java)
+       )
+
+       cmake-utils_src_configure
+
+       if use server; then
+               cd unix/xserver || die
+               econf \
+                       $(use_enable opengl glx) \
+                       --disable-config-hal \
+                       --disable-config-udev \
+                       --disable-devel-docs \
+                       --disable-dmx \
+                       --disable-dri \
+                       --disable-dri3 \
+                       --disable-glamor \
+                       --disable-kdrive \
+                       --disable-libunwind \
+                       --disable-linux-acpi \
+                       --disable-record \
+                       --disable-selective-werror \
+                       --disable-silent-rules \
+                       --disable-static \
+                       --disable-tslib \
+                       --disable-unit-tests \
+                       --disable-xephyr \
+                       --disable-xinerama \
+                       --disable-xnest \
+                       --disable-xorg \
+                       --disable-xvfb \
+                       --disable-xwin \
+                       --disable-xwayland \
+                       --enable-dri2 \
+                       --with-pic \
+                       --without-dtrace \
+                       --disable-present \
+                       --disable-unit-tests
+       fi
+}
+
+src_compile() {
+       cmake-utils_src_compile
+
+       if use server; then
+               # deps of the vnc module and the module itself
+               local d subdirs=(
+                       fb xfixes Xext dbe glx randr render damageext miext Xi 
xkb
+                       composite dix mi os hw/vnc
+               )
+               for d in "${subdirs[@]}"; do
+                       emake -C unix/xserver/"${d}"
+               done
+       fi
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+       make_desktop_entry vncviewer vncviewer vncviewer Network
+
+       if use server ; then
+               emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+               if ! use xorgmodule; then
+                       rm -r "${D}"/usr/$(get_libdir)/xorg || die
+               else
+                       rm 
"${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+               fi
+
+               newconfd "${FILESDIR}"/${PN}.confd ${PN}
+               newinitd "${FILESDIR}"/${PN}.initd ${PN}
+       else
+               cd "${D}" || die
+               for f in vncserver vncpasswd x0vncserver vncconfig; do
+                       rm usr/bin/$f || die
+                       rm usr/share/man/man1/$f.1 || die
+               done
+       fi
+}

Reply via email to