Version bump and add missing glu dependency, bug #437998 by Diego Elio Pettenò.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

2 files changed, 123 insertions, 1 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 9d18f6651ab7..ee1b328bb9f9 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/virtualgl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.7 2012/09/29 09:38:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.8 2012/10/20 07:37:31 pacho Exp $
+
+*virtualgl-2.3.2 (20 Oct 2012)
+
+  20 Oct 2012; Pacho Ramos <pacho@gentoo.org> +virtualgl-2.3.2.ebuild:
+  Version bump and add missing glu dependency, bug #437998 by Diego Elio
+  Pettenò.
 
   29 Sep 2012; Pacho Ramos <pacho@gentoo.org> -files/vgl.confd,
   -files/vgl.initd:
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
new file mode 100644
index 000000000000..e1c99cf6fb96
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.1 2012/10/20 07:37:31 pacho Exp $
+
+EAPI="4"
+inherit cmake-utils multilib
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	media-libs/libjpeg-turbo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs )
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+CMAKE_VERBOSE=1
+build32_dir="${WORKDIR}/${P}_build32"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun server/vglgenkey server/vglserver_config || die
+
+	default
+}
+
+src_configure() {
+	# Configure 32bit version on multilib
+	use amd64 && use multilib && (
+		einfo "Configuring 32bit libs..."
+
+		local ABI=x86
+		local CFLAGS="${CFLAGS--O2 -march=native -pipe} -m32"
+		local CXXFLAGS="${CFLAGS}"
+		local LDFLAGS="${LDFLAGS} -m32"
+		local CMAKE_BUILD_DIR="${build32_dir}"
+
+		mycmakeargs=(
+			$(cmake-utils_use ssl VGL_USESSL)
+			-DVGL_DOCDIR=/usr/share/doc/"${P}"
+			-DVGL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/lib32
+			-DVGL_FAKELIBDIR=/usr/fakelib/32
+		)
+		cmake-utils_src_configure
+
+		einfo "Configuring 64bit libs..."
+	)
+
+	# Configure native version
+	mycmakeargs=(
+		$(cmake-utils_use ssl VGL_USESSL)
+		-DVGL_DOCDIR=/usr/share/doc/"${P}"
+		-DVGL_LIBDIR=/usr/$(get_libdir)
+		-DTJPEG_INCLUDE_DIR=/usr/include
+		-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+		-DCMAKE_LIBRARY_PATH=/usr/lib64
+		-DVGL_FAKELIBDIR=/usr/fakelib/64
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Make 32bit version on multilib
+	use amd64 && use multilib && (
+		einfo "Building 32bit libs..."
+		local CMAKE_BUILD_DIR="${build32_dir}"
+		cmake-utils_src_compile
+
+		einfo "Building 64bit libs..."
+	)
+
+	# Make native version
+	cmake-utils_src_compile
+}
+
+src_install() {
+	# Install 32bit version on multilib
+	use amd64 && use multilib && (
+		einfo "Installing 32bit libs..."
+		local CMAKE_BUILD_DIR="${build32_dir}"
+		cmake-utils_src_install
+
+		einfo "Installing 64bit libs..."
+	)
+
+	# Install native version
+	cmake-utils_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r1" vgl
+	newconfd "${FILESDIR}/vgl.confd-r1" vgl
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+}