From: Raúl Porcel Date: Mon, 23 Feb 2015 10:00:29 +0000 (+0000) Subject: Version bump wrt bug #539714 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc2256f26c99cc5c75ef37fe7d24a4030466361c;p=gentoo.git Version bump wrt bug #539714 Package-Manager: portage-2.2.14/cvs/Linux ia64 Manifest-Sign-Key: 0xF6AD3240 --- diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog index c25194533b12..abae7974de67 100644 --- a/net-misc/tigervnc/ChangeLog +++ b/net-misc/tigervnc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/tigervnc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.201 2015/02/19 10:41:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.202 2015/02/23 10:00:22 armin76 Exp $ + +*tigervnc-1.4.2-r2 (23 Feb 2015) +*tigervnc-1.4.2-r1 (23 Feb 2015) + + 23 Feb 2015; Raúl Porcel +tigervnc-1.4.2-r1.ebuild, + +tigervnc-1.4.2-r2.ebuild: + Version bump wrt bug #539714 19 Feb 2015; Agostino Sarubbo tigervnc-1.3.1-r4.ebuild: Stable for amd64, wrt bug #539772 diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index fd42192bc46c..2ad3e8f8470f 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -7,29 +7,25 @@ AUX tigervnc.initd 2083 SHA256 3971df255bc3f0aa52b6b66a3ba71290a3114244e8c219396 DIST tigervnc-1.3.0-patches-0.2.tar.bz2 8130 SHA256 9cf7ca0e3fe56f99c3ca1b88ddccca0952d86a722a3c3da4585aac4b7882245d SHA512 defb37a4f0aa5b7c2dd71aaf404b048c058adf3181235721607a3cac7e8a4fec7751b081ccb1704e51a68ada84147d408328cdf969c64359dd9460916671be90 WHIRLPOOL 67db5fc1c1b8bea6dc4394d360e5261f52f160627d9bcf5a4fee221c38600c0415a0f10170a960f91cf0cf94a401f9d625d790aba3af17fc3326aae6cb2b899c DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 5bcaabd8993274a5ce1718efc15fdaf22041003a49a94293eeea9b5b72d3b822 SHA512 f7afc3e7062976b704802e58bb654e46ded5f9dcf8e089d1633e82ce8f5383b60885158319142ac8a58d4d0cf0c8fb51134124bb2dd00dc38fb441bc079b31d4 WHIRLPOOL 33c149415633fe4b0c08cd96c9208c70728acc4b2935835bad1c39037af5aec70c54ad9b98503f6ca93441608e3eef82bc3b17dfcdda97f95ae5dbc41cfcd4a4 DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d WHIRLPOOL 35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99 +DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481 +DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f WHIRLPOOL 420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8 SHA512 7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d WHIRLPOOL 905d3b47938e5e5604b04953f11ec7acee9298d6f32570612d6301ac71b0c5a49e774267b627957b7a6a94f6b9bf211c9ed6b7102f389a2120a40bd45502a6d7 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56 +DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 +DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 EBUILD tigervnc-1.3.1-r1.ebuild 4910 SHA256 8f2cbdd86a94ab4773b59798beb307eed3849f90d8582055946f389011e263f2 SHA512 2b0871972c59fceafb0acc9d088d0a0dd56ea8555372eeedb4733614dc50d8ba754fd3ba494bc260567a7f1dc8b932fd85efd79be7266f89c548aef1a8e3ae75 WHIRLPOOL bdccbf04091ce1ce95339ab1f8e0de5641ea901ffe0ae21367e829db7c505ae40cb8115f287bea5080de7179aa1e4916b413a4f5660a6cdd60b76ac7a8abe773 EBUILD tigervnc-1.3.1-r2.ebuild 4959 SHA256 29d55cc8577ccbd63a22370c5ed2f3a195eecde546d9a6d5e0659557162b42dd SHA512 1f5c20a9dd2f2af19f776d17e0bac3fff5b04e9e889f13749242e8edca6d511f4294765dfd21afb1b025030f34a612431614ef523170d44988e0e46e3d20e9a3 WHIRLPOOL 860c891ff7358e0cd8a7e9196b5cc713566d0bc8c85ed8b365af04b77bacb64d72c29ec489cc09ae2a3f913206286523e85ab7d0e231c7674fe9a05379208280 EBUILD tigervnc-1.3.1-r3.ebuild 4972 SHA256 64c051f1084696cfccf4f56405c9643d73aa012f7694c13120104cc6e94d223c SHA512 771a92d670329e79e802d4c95bb5001ce0d6ca145cff20ceed11e3d4d5e289a021bfc1eac2827f393fecb8e868dc83db62a339b6d50b02f5f47ade8e6b09906b WHIRLPOOL 2cc9b53ba0f097fd740a91055136b930b9143353bd9de0c32e4edffbaa5949358e83bf810c2920645b6144b51f1b2b507dcb49a7cd218d95753a8a5d6202ba6e EBUILD tigervnc-1.3.1-r4.ebuild 5003 SHA256 682865625006d543553a414bf86874657be692fef3116e3a6c83eccef0ef7fbd SHA512 4d03e46f184ea4daa694005d8fe4d412a8c2fc35d13dd41d226216b0f619025edc180d57fb277ed0927fe2a5b56fcd2a9f21c9018481422c3e5be174059f9bab WHIRLPOOL 3e632abfecaf8e2eb0e193d27f09cb682bb9ab968ae58f5ef70fac8f457b38eb6ee20a3bc4149e92116ffef283f185f83a976701b46800b02f6d9749dcfc73c0 -MISC ChangeLog 27273 SHA256 17a86608ad7cd5c44c74318a5949ce78ee071312f1ce13785370eb17baba54c9 SHA512 e89241edb21050557811fafec47c6caff768010206d0095924c04e3bbec4686ba01fb8e2020b1ebc455160e7746fc20a55e66e407119dea754196a13e9afcb5a WHIRLPOOL c6a21392e0a01879e98a6107266d7d5086cc6b34877f764e529ec29d84fbda46c6327c614911a20130e51f6e085fd0d3def22479919412fad06dff0a014355ab +EBUILD tigervnc-1.4.2-r1.ebuild 4977 SHA256 5cc33cd362108ea3e79eede69943ef23d4312d7a948af30895a0915018a4fa3c SHA512 4de07250202d332fc141d1da9a4fea1669b4f90ad2a94bc869347804680f0b4fb4d2a44be99e49a6699941aae3fb3d12d3d0d337b5275a8b32ce7813306d9ce9 WHIRLPOOL f7f4b5b5826990bee7bc5376860caf18d59da1f32bd96829fb6a3ca790baa5d3dcfb31a26ffe703fa94d82fa70eef6f2e6fa077bc8d4684c76488c8cb88c68c1 +EBUILD tigervnc-1.4.2-r2.ebuild 5038 SHA256 57065077cb87f7c9d02494f62b3b7b9f65cc09521575fb55a005fdfa15c70028 SHA512 a9bf4ced31a8ce8aa7fc8d82f424603a91c40d90c8a2f2627657dedddbfcfd11d9c07baddda76b7fbbcaa286acb5d927afd69b45546850ff488d411eae39b9c4 WHIRLPOOL 518e4fef6585f97c2c8c6816d4c170d3a446d05da4ab413dbe854644ceeecdf690dbef311e963afd88e88e6a4ba3b6e2355d4d5d364db303f2123e612a11f0a6 +MISC ChangeLog 27481 SHA256 94141ecec04afdb497c07ae7b8a8dbf8f75953bc9c7c0eab5c258168c78a15b6 SHA512 4644dc33d9588bcf8e9346a7bc7427c8536f41201f867019ac8d3f9dbea167356042b22bf6b1744e168d1435a6fb65a09200122db0b3044b406905cc48b3f3ef WHIRLPOOL ab4ce385fe2e545646933a6e4f08494e2315172f3cdc383f548191dfc7f2f03704503fd30ab01c3372f91b54be5e1c9ec7e9938449a4a2f40b5e30b04d4a1c88 MISC metadata.xml 335 SHA256 821ea06553b929fa98b219ad2f17ca84dda361965182f46e030ddd3b2d950209 SHA512 206ccc0af085090fd0381f6e088a82a4084fe5e97a64ff6bea9f2ceb7b209e42acdff2c779621e3be77c56dad978afcf498b8bf1b16e9ff1bea447110ad39e83 WHIRLPOOL 8bc100612b6eadbf295f8cd008c67b587cea0e852f6f8d6dd61f9476fef560d9c2393b206239fb26c88cb20840e4c0e6222bffadecfd31ba8fd934d0437619e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU5b3KAAoJELp701BxlEWfbwQQAIDC8WDTueCIOm67j9mV1Kde -jhrvAtpq23a1QjQ6YB5g+/WtC3fH8OlX3OHltEXxPkqIp3hksMogRDgJFVJZ7J2q -FSlRXMz+bZoB5uLX2o5FKLtYnD8Cvqag+6aDm0m4l+eSW6QwL1zJybEF9sj302pG -1BEgn4hPbjJ6XlyqB2HEQYuhIERVZIRCsvaQomJepZuK3Xbn8avaGflzi04p65fp -kU5gSPbCv4Vdh8ymrtcmjcfjJcHkvGLj3RowuxXbz3Kwsnbbnyr0bLA4ZZlWh+OU -YsKfA0pQCTcqw/h0nt1OFinPpROIOZhQy3puIP7yF5qQbpClZKx4IOc3aPozZMgD -NKL0Kv4tu/JrYPO1kwnId9AkLwB8TBNv/8wLeyMtrAICCH9W4U6JfljLtNjXzGac -NksLMgAvu/kCdvAhl9dktKQe/ds8NGh7cHtrmLYIdn5h4ACGC3L3VFc5YG14LSBE -HZRB6Lv2HcnKj8PfqHUUY0Tx8s2xZqneiQCyY3BGiycDIp3fTlo/6+Aup6EYpR7c -5aWu9/F8j13uun5Gt/RvMM5qts+eR/+AU1x0t85TqcayNbqCodFBznuVfkhjPqY8 -BgnPOtUgDao89lohSLWn5nNo86PLHMkxIPje2oy4UWQkYU9Xcd5bXInx96U9goi7 -zQ1H6mHfxNArYBfpd984 -=Ohry +iEYEAREIAAYFAlTq+jgACgkQuQc30/atMkBQGgCgr3kFL4VTa4b/qIIQSGeO2OAA +lW8An0qwYhGN4v4AEEhORGuT97jpWviQ +=pRxq -----END PGP SIGNATURE----- diff --git a/net-misc/tigervnc/tigervnc-1.4.2-r1.ebuild b/net-misc/tigervnc/tigervnc-1.4.2-r1.ebuild new file mode 100644 index 000000000000..7ce2dec2812d --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.4.2-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.4.2-r1.ebuild,v 1.1 2015/02/23 10:00:22 armin76 Exp $ + +EAPI="4" + +inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic + +PATCHVER="0.1" +XSERVER_VERSION="1.16.4" +OPENGL_DIR="xorg-x11" +#MY_P="${PN}-1.2.80-20130314svn5065" +#S="${WORKDIR}/${MY_P}" + +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 + mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2 + http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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 nptl +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-admin/eselect-opengl-1.0.8 ) + 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-7.8_rc[nptl=] ) + )" + +CMAKE_IN_SOURCE_BUILD=1 + +pkg_setup() { + if ! use server ; then + echo + einfo "The 'server' USE flag will build tigervnc's server." + einfo "If '-server' is chosen only the client is built to save space." + einfo "Stop the build now if you need to add 'server' to USE flags.\n" + else + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set ${OPENGL_DIR} + fi +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set ${OLD_IMPLEM} +} + +src_prepare() { + if use server ; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver + else + rm "${WORKDIR}"/patches/*_server_* + fi + + EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="*100*" \ + EPATCH_FORCE="yes" epatch + + if use server ; then + cd unix/xserver + epatch "${WORKDIR}"/patches/1000_server_xserver-1.16-rebased.patch + eautoreconf + fi +} + +src_configure() { + + use arm || use hppa && append-flags "-fPIC" + + mycmakeargs=( + -G "Unix Makefiles" + $(cmake-utils_use_enable gnutls GNUTLS) + $(cmake-utils_use_enable pam PAM) + $(cmake-utils_use_build java JAVA) + ) + + cmake-utils_src_configure + + if use server; then + cd unix/xserver + econf \ + $(use_enable nptl glx-tls) \ + $(use_enable opengl glx) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dmx \ + --disable-dri \ + --disable-dri3 \ + --disable-kdrive \ + --disable-selective-werror \ + --disable-silent-rules \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + --disable-xinerama \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --disable-unit-tests + fi +} + +src_compile() { + cmake-utils_src_compile + + if use server ; then + cd unix/xserver + emake + fi +} + +src_install() { + cmake-utils_src_install + + newicon "${DISTDIR}"/tigervnc.png vncviewer.png + make_desktop_entry vncviewer vncviewer vncviewer Network + + if use server ; then + cd unix/xserver/hw/vnc + emake DESTDIR="${D}" install + ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la + else + cd "${D}" + for f in vncserver vncpasswd x0vncserver vncconfig; do + rm usr/bin/$f + rm usr/share/man/man1/$f.1 + done + fi +} + +pkg_postinst() { + use server && switch_opengl_implem +} diff --git a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild new file mode 100644 index 000000000000..7eea70f69b2c --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild,v 1.1 2015/02/23 10:00:22 armin76 Exp $ + +EAPI="4" + +inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic + +PATCHVER="0.1" +XSERVER_VERSION="1.17.1" +OPENGL_DIR="xorg-x11" +#MY_P="${PN}-1.2.80-20130314svn5065" +#S="${WORKDIR}/${MY_P}" + +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 + mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2 + http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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 nptl +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-admin/eselect-opengl-1.0.8 ) + 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-7.8_rc[nptl=] ) + )" + +CMAKE_IN_SOURCE_BUILD=1 + +pkg_setup() { + if ! use server ; then + echo + einfo "The 'server' USE flag will build tigervnc's server." + einfo "If '-server' is chosen only the client is built to save space." + einfo "Stop the build now if you need to add 'server' to USE flags.\n" + else + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set ${OPENGL_DIR} + fi +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set ${OLD_IMPLEM} +} + +src_prepare() { + if use server ; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver + else + rm "${WORKDIR}"/patches/*_server_* + fi + + EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="*100*" \ + EPATCH_FORCE="yes" epatch + + if use server ; then + cd unix/xserver + epatch "${WORKDIR}"/patches/1000_server_xserver-1.16-rebased.patch + epatch "${WORKDIR}"/patches/1005_server_xserver-1.17.patch + eautoreconf + fi +} + +src_configure() { + + use arm || use hppa && append-flags "-fPIC" + + mycmakeargs=( + -G "Unix Makefiles" + $(cmake-utils_use_enable gnutls GNUTLS) + $(cmake-utils_use_enable pam PAM) + $(cmake-utils_use_build java JAVA) + ) + + cmake-utils_src_configure + + if use server; then + cd unix/xserver + econf \ + $(use_enable nptl glx-tls) \ + $(use_enable opengl glx) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dmx \ + --disable-dri \ + --disable-dri3 \ + --disable-kdrive \ + --disable-selective-werror \ + --disable-silent-rules \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + --disable-xinerama \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --disable-unit-tests + fi +} + +src_compile() { + cmake-utils_src_compile + + if use server ; then + cd unix/xserver + emake + fi +} + +src_install() { + cmake-utils_src_install + + newicon "${DISTDIR}"/tigervnc.png vncviewer.png + make_desktop_entry vncviewer vncviewer vncviewer Network + + if use server ; then + cd unix/xserver/hw/vnc + emake DESTDIR="${D}" install + ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la + else + cd "${D}" + for f in vncserver vncpasswd x0vncserver vncconfig; do + rm usr/bin/$f + rm usr/share/man/man1/$f.1 + done + fi +} + +pkg_postinst() { + use server && switch_opengl_implem +}