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

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

3 files changed, 129 insertions, 5 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/Manifest b/x11-misc/virtualgl/Manifest
index cac33ba58db1..0f0dabcb2486 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
 AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb940904c2f4764c SHA512 e7965844cbc8f58158bb6176eed354b7a0a6da09489aee7b508a59f0fc7529ab7071bd4fa4ee2180cc4b019504f6b8735d7476cbfbc057c9b583ce59394d349e WHIRLPOOL 3a404bd35932c92ffca82b778261876f9e16cd73eb8116d21addf0c7c057faee4d1c8ce09c8e174cee7eea1373f70fb014f5f0412eac049ac7f4bb798cb95334
 DIST VirtualGL-2.3.1.tar.gz 2736264 SHA256 30e101111eb82a1c3326c7581ccc6ad7f3cdf827b22ef4510e62a700071155c9 SHA512 4e9e75e46e458358969f93edeee0f12f962ce1050255808d6ab4ad7aec6ab26c3e63a7f4d9b5abcfda35df1fb8757b4d6708fcc681d03af9f9041f97cccfd479 WHIRLPOOL cfae31c9334ededae01de2dc3e7a74e104c260431643f890c5b658b3fc05e5ccc6c42be9f228cca5ee4d8ff8ee3d96c0a50822d8a593043b15b5dd0302a6036c
+DIST VirtualGL-2.3.2.tar.gz 2741077 SHA256 bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418 SHA512 69cf5082a33d86a3778c147de6296366efd056a8be9d38c3dc41030e832c58025fc2ee535076ae2a66a3ed8ee817109068c9255f9c1e0b9c5ff983450223b53d WHIRLPOOL c0f1fe6629b0020322e7a165025d704091cd6dd88e5ca11037cddf14cdcccf5b50bc7a8b081d5f1d7508369a7d4f55d88aad3b783760ca32daeef1b244c3793e
 EBUILD virtualgl-2.3.1-r1.ebuild 2980 SHA256 8c3c0693ba178a34bf2951f62214e93c426aef026d5f80ead5627d7d96d04aeb SHA512 80d33a32c80a84b4c271bced76431b3757ca7393e3f206931959a47402eb5a499022815399aa3d222403292aadea0e2e9cd9e0fb95ccf719c6a8c809241d071a WHIRLPOOL 7c5faee575f8024876842fdcaaa85b51b4d65491e32e2e960a6d30666078bfb8390250a14d15df150f466ce540515cd512f4498e0a4f01fd043f9f7dca894b87
-MISC ChangeLog 1599 SHA256 f6f2f6efa1c67234c87d71577f172e44b5ee0f7de7afd12b5d4ede3324fbb437 SHA512 c2554038036614fcf35f285725a7de81296ec5da7d0285bea611e11f619b57f6ff43b15cbbfea2ce2a3a8482e1fc9e78bf538ab5d952ce73a4dd78d3b789eb83 WHIRLPOOL a060add695e107165a9a7574fac4a72e0f737e4a45416889cba673e29293e66275022d861f3eb434aa67c0b6873c6399dd66f089d25a514ae52ac67c2670e8a4
+EBUILD virtualgl-2.3.2.ebuild 2989 SHA256 637a17c3802d53dc6f46105eed0959b52f601eff12bf1d71978aea25718774b3 SHA512 0f83bb3955c2b827a2f548b13358a4f933cb1cf6f394b5905fba0458fb8288e4a505f47f70f05d3707e40fd394a6b27a8c78308db29e8695f3fdac56c8693290 WHIRLPOOL 6ef2ca4a108efdc820014da510b93a249e3b78c9b8e141b3c883f1bf8329bf64fd6de369c2c0e9fd708f07d773818002bf3834662fddb11da6102d8eccf995e9
+MISC ChangeLog 1788 SHA256 66272b2c5f376dbbca443bb1d61c9b7c979e1287fdf857b67e117f9427cb71ab SHA512 77871d35f5b9535f27c2ff2f918a7e5471f7d45d3bf5e335c225acb2a105dc1faa1271f80289ec65166e99fb6ebf6f2feb60348cf751c41abe00d01c34542f6d WHIRLPOOL 33411ee81bfc491b522173b9b6b0334b24d47044ea9d4782d95623558e19be37ef2fc1c73c238a8009846f2676bd72788f159a929ee598bdf3c97f1e71cd2095
 MISC metadata.xml 592 SHA256 d115cb675b59d6f8d0f0ced456d815f81ce7e56f19f0b82ba267323d2a69c163 SHA512 104d1a756f73ca0557231fc16cf7411c1105df73ff58ab37dfd8a460a9bb9c07b045865b63d38580f4490dbf8c1d555c1dd8cd9f77968a835815f0eef2dd9e4a WHIRLPOOL b8510aa2aecbea8f25cce5e4d5f4863f4acaa450f623e4b8f7dc538cd7555b9f6c8184aef753f71a6d2bf0022c0dd87ebf697de24192a3556647c2ba97b81cda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBmwYsACgkQCaWpQKGI+9TeZwCghal/JU0btOfJSiuGCbd7AT+5
-kjMAn0IzDaCJgDkeAo5H+Vb1hXbWO/GJ
-=wPZz
+iEYEAREIAAYFAlCCVLwACgkQCaWpQKGI+9R2hwCdEzhRIkc4RDo/4YCbnbazgykj
+x/YAn1bacKHMqtLs5fRuqUY7rrNspyUS
+=KM38
 -----END PGP SIGNATURE-----
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
+}