From: Raúl Porcel Date: Wed, 18 Apr 2007 13:37:16 +0000 (+0000) Subject: Revision bump, now it supports xorg-server-1.2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77c7291b7c516c428f0472e95077bd9017fd9fd2;p=gentoo.git Revision bump, now it supports xorg-server-1.2 Package-Manager: portage-2.1.2.4 --- diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog index 755feed6111f..04b3eefd9f62 100644 --- a/net-misc/vnc/ChangeLog +++ b/net-misc/vnc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/vnc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.71 2007/04/12 17:43:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.72 2007/04/18 13:37:16 armin76 Exp $ + +*vnc-4.1.2-r2 (18 Apr 2007) + + 18 Apr 2007; Raúl Porcel +vnc-4.1.2-r2.ebuild: + Revision bump, now it supports xorg-server-1.2 12 Apr 2007; Raúl Porcel +files/vnc.confd, +files/vnc.initd, vnc-4.1.2.ebuild, vnc-4.1.2-r1.ebuild: diff --git a/net-misc/vnc/files/digest-vnc-4.1.2-r2 b/net-misc/vnc/files/digest-vnc-4.1.2-r2 new file mode 100644 index 000000000000..1b2b9eb0b7dc --- /dev/null +++ b/net-misc/vnc/files/digest-vnc-4.1.2-r2 @@ -0,0 +1,9 @@ +MD5 36557e5c43ca8068cf0199ab21641548 vnc-4.1.2-r2-patches-0.1.tar.bz2 16206 +RMD160 34c23d0eb270810efdb5bfafb9fd9ca3545c1ddb vnc-4.1.2-r2-patches-0.1.tar.bz2 16206 +SHA256 698428d6a5e829c3a68d03f639fc6315b27773d8c46819519b13b4cfc473a5dc vnc-4.1.2-r2-patches-0.1.tar.bz2 16206 +MD5 cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz 537713 +RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 vnc-4_1_2-unixsrc.tar.gz 537713 +SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542 vnc-4_1_2-unixsrc.tar.gz 537713 +MD5 ea291c89e68832d570d9d5e007218bd6 xorg-server-1.2.0.tar.bz2 6014596 +RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 xorg-server-1.2.0.tar.bz2 6014596 +SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 xorg-server-1.2.0.tar.bz2 6014596 diff --git a/net-misc/vnc/vnc-4.1.2-r2.ebuild b/net-misc/vnc/vnc-4.1.2-r2.ebuild new file mode 100644 index 000000000000..229fe1ca7c06 --- /dev/null +++ b/net-misc/vnc/vnc-4.1.2-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r2.ebuild,v 1.1 2007/04/18 13:37:16 armin76 Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +inherit eutils toolchain-funcs multilib autotools + +XSERVER_VERSION="1.2.0" +PATCH_VER=0.1 + +MY_P="vnc-4_1_2-unixsrc" +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="http://www.realvnc.com/" +SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz + http://ftp.plusline.de/FreeBSD/distfiles/xc/${MY_P}.tar.gz + http://dev.gentooexperimental.org/~armin76/dist/${PF}-patches-${PATCH_VER}.tar.bz2 + mirror://gentoo/${PF}-patches-${PATCH_VER}.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="server" + +RDEPEND="sys-libs/zlib + media-libs/freetype + x11-libs/libSM + x11-libs/libXtst + server? ( + x11-libs/libXi + x11-libs/libXfont + x11-libs/libXmu + x11-libs/libxkbfile + x11-libs/libXrender + x11-apps/xauth + x11-apps/xsetroot + media-fonts/font-adobe-100dpi + media-fonts/font-adobe-75dpi + media-fonts/font-alias + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + ~x11-base/xorg-server-${XSERVER_VERSION} + ) + !net-misc/tightvnc" +DEPEND="${RDEPEND} + x11-proto/xextproto + server? ( + x11-proto/compositeproto + x11-proto/damageproto + x11-proto/fixesproto + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/resourceproto + x11-proto/scrnsaverproto + x11-proto/trapproto + x11-proto/videoproto + x11-proto/xineramaproto + x11-proto/xf86bigfontproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if ! use server ; then + echo + einfo "The 'server' USE flag will build vnc'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" + ebeep + epause 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + if use server ; then + mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/xorg-x11-server-source + else + rm -f "${WORKDIR}"/patch/*vnc-server* + fi + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + + cd common + eautoreconf + cd ../unix + eautoreconf + + if use server ; then + cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ + xc/programs/Xserver/Xvnc.man \ + xc/programs/Xserver/vnc/*.{h,cc} \ + xorg-x11-server-source/hw/vnc + cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc} + cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc} + cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc} + sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \ + xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h + cd xorg-x11-server-source + eautoreconf + fi +} + +src_compile() { + cd common + econf || die "econf failed" + emake || die "emake failed" + cd ../unix + econf || die "econf failed" + emake || die "emake failed" + + if use server ; then + cd xorg-x11-server-source + econf \ + --enable-xorg \ + --disable-xnest --disable-xvfb --disable-dmx \ + --disable-xwin --disable-xephyr --disable-kdrive \ + --with-pic \ + --disable-xorgcfg \ + --disable-xprint \ + --disable-static \ + --enable-composite \ + --enable-xtrap \ + --enable-xcsecurity \ + --with-xkb-output=/usr/share/X11/xkb \ + --with-rgb-path=/usr/share/X11/rgb.txt \ + --disable-xevie \ + --disable-dri \ + --enable-glx \ + --with-int10=stub \ + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \ + || die "econf server failed" + emake || die "emake server failed" + fi +} + +src_install() { + cd common + emake DESTDIR="${D}" install || die "emake install failed" + cd ../unix + emake DESTDIR="${D}" install || die "emake install failed" + newman vncviewer/vncviewer.man vncviewer.1 + cd .. + dodoc README + + doicon ${FILESDIR}/vncviewer.png + make_desktop_entry vncviewer vncviewer vncviewer.png Network + + if use server ; then + cd unix + dobin vncserver || die "dobin failed" + for f in vncviewer/vncviewer vncpasswd/vncpasswd \ + vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do + mv $f.man $f.1 + doman $f.1 + done + + cd xorg-x11-server-source/hw/vnc + emake DESTDIR="${D}" install || die "emake install failed" + + newman Xvnc.man Xvnc.1 + newconfd "${FILESDIR}"/vnc.confd vnc + newinitd "${FILESDIR}"/vnc.initd vnc + + rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la + else + cd "${D}" + rm usr/bin/x0vncserver + rm usr/bin/vncpasswd + rm usr/bin/vncconfig + fi + + rm ${D}/usr/$(get_libdir)/librfb.{a,la,so} +}