From b3fb052ef05dc1f25302999ae739b188cf0f70a0 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 29 Jan 2016 16:53:28 +0100 Subject: net-misc/tigervnc: Support xorg-server-1.18.0 Support xorg-1.18.0 thanks to LFS patch. Found by Jan Psota. --- net-misc/tigervnc/Manifest | 2 +- .../tigervnc/files/tigervnc-1.6.0-xorg118-1.patch | 38 +++++ net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild | 178 +++++++++++++++++++++ net-misc/tigervnc/tigervnc-1.6.0.ebuild | 177 -------------------- 4 files changed, 217 insertions(+), 178 deletions(-) create mode 100644 net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch create mode 100644 net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild delete mode 100644 net-misc/tigervnc/tigervnc-1.6.0.ebuild (limited to 'net-misc/tigervnc') diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 7f4e2f92fff8..c0c900e22a0c 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -9,4 +9,4 @@ DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d3 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 -DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab +DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9 diff --git a/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch new file mode 100644 index 000000000000..ac92e54d0c2b --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch @@ -0,0 +1,38 @@ +Submitted By: Fernando de Oliveira +Date: 2015-12-25 +Initial Package Version: xorg-server-1.18.0 (for tigervnc-1.6.0) +Upstream Status: Not Submitted +Origin: ArchLinux +Description: Allow using Xorg-server-1.18.0 +================================================================================ + + +================================================================================ + +diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c +--- tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.000000000 +0300 ++++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c 2015-11-25 19:04:24.278747038 +0300 +@@ -300,6 +300,8 @@ + #if XORG < 111 + n = GetKeyboardEvents(eventq, dev, action, kc); + enqueueEvents(dev, n); ++#elif XORG > 117 ++ QueueKeyboardEvents(dev, action, kc); + #else + QueueKeyboardEvents(dev, action, kc, NULL); + #endif +diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h 2015-07-11 16:00:36.000000000 +0300 ++++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h 2015-11-25 19:02:47.688751421 +0300 +@@ -48,8 +48,10 @@ + #define XORG 116 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) + #define XORG 117 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) ++#define XORG 118 + #else +-#error "X.Org newer than 1.17 is not supported" ++#error "X.Org newer than 1.18 is not supported" + #endif + + #endif diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild new file mode 100644 index 000000000000..fae96b21d663 --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild @@ -0,0 +1,178 @@ +# 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.0" + +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() { + 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 +} diff --git a/net-misc/tigervnc/tigervnc-1.6.0.ebuild b/net-misc/tigervnc/tigervnc-1.6.0.ebuild deleted file mode 100644 index 6d9e1a655581..000000000000 --- a/net-misc/tigervnc/tigervnc-1.6.0.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2015 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.17.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 - - default - - if use server ; then - cd unix/xserver || die - eapply ../xserver117.patch - eautoreconf - fi -} - -src_configure() { - 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 -} -- cgit v1.2.3-65-gdbad