Use system jpeg and zlib, bug #273107

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

3 files changed, 190 insertions, 2 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 630a7eba1a4c..e34cbe5239af 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.37 2010/03/02 19:50:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.38 2010/03/02 20:33:02 armin76 Exp $
+
+*tigervnc-1.0.0-r4 (02 Mar 2010)
+
+  02 Mar 2010; Raúl Porcel <armin76@gentoo.org> +tigervnc-1.0.0-r4.ebuild:
+  Use system jpeg and zlib, bug #273107
 
   02 Mar 2010; Raúl Porcel <armin76@gentoo.org> -tigervnc-1.0.0-r3.ebuild:
   Revert
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 6aa52cf8f1f5..66ec5d9e7b99 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -4,5 +4,6 @@ AUX vncviewer.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12
 DIST tigervnc-1.0.0.tar.bz2 2720182 RMD160 759bff85653bf68a29c2a336553bbfadada12223 SHA1 9017f31fe75d0bc49cc9d9f9f6b9f336bf306bd6 SHA256 75c54bf1f976182dd64c2cab5051fcf392091d74636014c2b74ce5b712efbfda
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 EBUILD tigervnc-1.0.0-r2.ebuild 4603 RMD160 d678ec4e14039db7da27d1bfba361fd9f5bc6cd5 SHA1 c80e52260edb2668b45b58be2277c9cb26535c1f SHA256 8a71ebf7917af132e2c08172d98d6a05a2c89fc22f8aff6e89511f4ee7ecaa19
-MISC ChangeLog 4596 RMD160 1a6c7c9115293cb9c5f8b4091b353430db268068 SHA1 a4cad07b1b9d5c5b58dff6f91cf694670327a2f0 SHA256 9d20d44adcdc7a4c67f9b8ca6ae39e7fb484cc448e58999a525e1ede79df3c41
+EBUILD tigervnc-1.0.0-r4.ebuild 4640 RMD160 e55b75a55bef318192c651f8d6a20183bbd3fd01 SHA1 2c5dda1d3baf20998d8033dca4cc860f6b9a7bbb SHA256 331f812ab6e1dc2c0a597aa20a9d22279980e624f8b5950dcce55d57605545c7
+MISC ChangeLog 4747 RMD160 ea2211f90bb4db069ad2d3691aa96c3fef404b10 SHA1 80df861af3f5e6d3986223ffca9eab51cb33af8c SHA256 e272eb3ec04d79b68cb7455cf356847e4e399cb7f2c6ee9a3bb31de782ed850c
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
new file mode 100644
index 000000000000..a73fe142da4d
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild,v 1.1 2010/03/02 20:33:02 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.6.5"
+#kPATCH="${P/_p*/}-patches-0.3"
+PATCH="${PN}-0.0.90-patches-0.3"
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+#	mirror://gentoo/${PATCH}.tar.bz2
+#	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+opengl server +xorgmodule"
+
+RDEPEND="sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	app-admin/eselect-opengl
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/pixman
+		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
+		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+	)
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-1.5
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	server?	(
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		>=x11-proto/randrproto-1.2.99
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xcmiscproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86driproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		opengl? ( >=x11-proto/glproto-1.4.10 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+		>=x11-libs/xtrans-1.2.2
+	)"
+
+S="${WORKDIR}/${PN}"
+
+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"
+		ebeep
+		epause 5
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+#	else
+#		rm -f "${WORKDIR}"/patch/*tigervnc-server*
+	fi
+
+#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	cd unix
+	eautoreconf
+	if use server ; then
+		epatch xserver16.patch
+		cd xserver
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	cd unix
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd xserver
+		econf \
+			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+			--disable-static --disable-xinerama \
+			--disable-composite \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			--enable-install-libxf86config \
+			--enable-dri2 \
+			--enable-glx \
+			--disable-config-dbus \
+			--disable-config-hal \
+			$(use_enable opengl glx) \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	cd unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+	dodoc README
+
+	doicon "${FILESDIR}"/vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd xserver/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! 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
+}