summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-05-26 18:46:37 +0000
committerPacho Ramos <pacho@gentoo.org>2013-05-26 18:46:37 +0000
commite83622154d55acceefd02c9e6c48ec061f296a5a (patch)
tree77f836d813488f151dcf131f31383e3ea7619879 /x11-misc/virtualgl
parentreturn --bind_ip to starting mongod, disable 1 test conditionally confirmed f... (diff)
downloadhistorical-e83622154d55acceefd02c9e6c48ec061f296a5a.tar.gz
historical-e83622154d55acceefd02c9e6c48ec061f296a5a.tar.bz2
historical-e83622154d55acceefd02c9e6c48ec061f296a5a.zip
Fix running with gdm-3 (#469928, thanks a lot to Vadim A. Misbakh-Soloviov (mva) for his help), drop old.
Package-Manager: portage-2.1.12.1/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-misc/virtualgl')
-rw-r--r--x11-misc/virtualgl/ChangeLog9
-rw-r--r--x11-misc/virtualgl/Manifest11
-rw-r--r--x11-misc/virtualgl/files/vgl.initd-r230
-rw-r--r--x11-misc/virtualgl/virtualgl-2.3.2-r2.ebuild (renamed from x11-misc/virtualgl/virtualgl-2.3.2.ebuild)85
4 files changed, 63 insertions, 72 deletions
diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 3c177021f8db..3f1b0ffffe1b 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-misc/virtualgl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.13 2013/05/09 22:07:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.14 2013/05/26 18:46:27 pacho Exp $
+
+*virtualgl-2.3.2-r2 (26 May 2013)
+
+ 26 May 2013; Pacho Ramos <pacho@gentoo.org> +files/vgl.initd-r2,
+ +virtualgl-2.3.2-r2.ebuild, -virtualgl-2.3.2.ebuild:
+ Fix running with gdm-3 (#469928, thanks a lot to Vadim A. Misbakh-Soloviov
+ (mva) for his help), drop old.
*virtualgl-2.3.2-r1 (09 May 2013)
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 6086db84b317..e69f732220c0 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,15 +3,16 @@ Hash: SHA256
AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb940904c2f4764c SHA512 e7965844cbc8f58158bb6176eed354b7a0a6da09489aee7b508a59f0fc7529ab7071bd4fa4ee2180cc4b019504f6b8735d7476cbfbc057c9b583ce59394d349e WHIRLPOOL 3a404bd35932c92ffca82b778261876f9e16cd73eb8116d21addf0c7c057faee4d1c8ce09c8e174cee7eea1373f70fb014f5f0412eac049ac7f4bb798cb95334
+AUX vgl.initd-r2 886 SHA256 d9337f0f337f291809e8ce7b34b495439c453e9e71e1b8c5623f51be60543707 SHA512 6b12439e504db83d46da2f4521f8d5ec25a5a54fb18469fe9afa96b31c3c02dd4dca95ff8d85becd2db4d86adf4f5c45bd20bd1677aebe9929dc156bce259065 WHIRLPOOL ce8365f468d42549233b910865c560f2a8ecb22e443ae5e0df49b526dc1ce1608b03d6102fb8bfccee84edfabd53a523c54edc055486b685199612831614bda3
DIST VirtualGL-2.3.2.tar.gz 2741077 SHA256 bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418 SHA512 69cf5082a33d86a3778c147de6296366efd056a8be9d38c3dc41030e832c58025fc2ee535076ae2a66a3ed8ee817109068c9255f9c1e0b9c5ff983450223b53d WHIRLPOOL c0f1fe6629b0020322e7a165025d704091cd6dd88e5ca11037cddf14cdcccf5b50bc7a8b081d5f1d7508369a7d4f55d88aad3b783760ca32daeef1b244c3793e
EBUILD virtualgl-2.3.2-r1.ebuild 2023 SHA256 e045d1d1a349cfdeadc619eaf15ed9d5e5861d3dfec04e437f3459f9d2792192 SHA512 305580c958eb89880769132583988bc1272cb4d9c408bb16d88f15acdb314a83a734cdf32c1fbc3b3126eba748f45db28cf5c818083ab779123a52acfb831b17 WHIRLPOOL 891e24be0d96cc3e3e171063bd8b11418ad1d1c4a4a96267ed2fe708626e4d0aacb64a4442b4e0fdf31441c59b0963a110295d5b7be913fe3ad46f01aedbe3c9
-EBUILD virtualgl-2.3.2.ebuild 3133 SHA256 66fee9b82c548727e444cbae5e848aa6bfd6fec3222f3c87f48bd94519272d92 SHA512 5c2d59a4919bdd86469b4389a82ed74af8fd7f147cc9bf7739eadd411e524295cb31340bb08649b4b6e84cd1eb7929f4eb5e3b0c914edf917bfe14e785ec2305 WHIRLPOOL 765a53a6b9f827b9008a213ba0246b3695ce50659526d3622de610fb76a475e5bd6275edecb0681beedc7bda32dd0306f61c257ad76292c45ba4836748be60c0
-MISC ChangeLog 2555 SHA256 cf0776bff08cb3f99b40e1ee01eec082bb43dc8393e9eb7c80e6a07bf7b82d76 SHA512 58456eb3e14ee54532e070bbcfeca4240b154142ecf9e6a80b35005813755868bf8e94d4b84aed71afa2ae3992b2f35cbf298492bcbb6ace1dd1656fced1ad55 WHIRLPOOL 45108792ac0d4836d17538efb6db3367825fb22082d6729ebc49552f6329d361de04cd3ad11d9c177669fe74203c5a9e122860a88b7e0815d1bfc73062ed2947
+EBUILD virtualgl-2.3.2-r2.ebuild 2023 SHA256 3b085b41e6ae50300ce9ac0e36a8892aa3ea87f861b169e9029da39b755c241b SHA512 7247c0332109c93e99f196c43aadaee180aab0e51be0b299ebddc296821f376d46078c87eee3950a23ed17f3091d75f7710aecfaa7192068633515610732bf1e WHIRLPOOL 0ea4608d9a7340ef7a64d2d4d54ecf2be74001e905580e337f8d2be19f60948382f80a8655952ea795a07771db49176c96d6b997d6a039dd4211969e66a32a38
+MISC ChangeLog 2823 SHA256 68089ae078b18c76156adaed2e69926eda99d7faf58b4d3da2aab235acb3d9a2 SHA512 544c10c21ebec4b240fd9fa5e30332584ea141fb8770a9697073086022d8099ffa972263b7b94e5390827aeac99f173d55bb06194c98da39f042bb64b3d1a0c9 WHIRLPOOL 3a7d30df96e4201b206253209a974081b858878b39c8f072372ecce9016424a75a20076e92c1f8bdb537d7354e4079c9d62c001324f4b6586ac6d6b9e6a62bc4
MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlGMHiUACgkQCaWpQKGI+9QXZACaAljU/tI9n059zJMe717hDEJi
-k9UAn1XwwQg/kUnaIproU7INlLnSfaUW
-=tE0M
+iEYEAREIAAYFAlGiWIQACgkQCaWpQKGI+9S8kgCfTyvgLeCMMfVW6UPEDEcBFDyL
+MQMAn1ikgJQqExYXhE2xAVWKWEi+tq/2
+=Ur+t
-----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/files/vgl.initd-r2 b/x11-misc/virtualgl/files/vgl.initd-r2
new file mode 100644
index 000000000000..3ed5188cb76d
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/files/vgl.initd-r2,v 1.1 2013/05/26 18:46:27 pacho Exp $
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+ need xdm
+ after sshd
+}
+
+start() {
+ ebegin "Starting VirtualGL"
+ truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+ # Check if XAUTHORITY was set successfully, if not wait a bit and let X to start
+ [ -z "$XAUTHORITY" ] && sleep 3 && set_xauth
+ [ -e "$XAUTHORITY" ] || sleep 3
+ xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f $XAUTHORITY list | awk '{print $3;exit}'` && \
+ chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping VirtualGL"
+ [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+ rm /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2-r2.ebuild
index 570d5675ea32..fedf33c9cfe6 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.2-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 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.4 2013/04/21 18:47:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2-r2.ebuild,v 1.1 2013/05/26 18:46:27 pacho Exp $
-EAPI="4"
-inherit cmake-utils multilib
+EAPI=5
+inherit cmake-multilib multilib
DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
HOMEPAGE="http://www.virtualgl.org/"
@@ -16,14 +16,15 @@ 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"
+IUSE="ssl"
-RDEPEND="ssl? ( dev-libs/openssl )
+RDEPEND="
+ ssl? ( dev-libs/openssl )
media-libs/libjpeg-turbo
x11-libs/libX11
x11-libs/libXext
x11-libs/libXv
- multilib? (
+ amd64? ( abi_x86_32? (
|| (
(
x11-libs/libX11[abi_x86_32]
@@ -34,14 +35,12 @@ RDEPEND="ssl? ( dev-libs/openssl )
)
app-emulation/emul-linux-x86-baselibs
app-emulation/emul-linux-x86-opengl
- )
+ ) )
virtual/glu
- virtual/opengl"
+ 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 \
@@ -51,75 +50,29 @@ src_prepare() {
}
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 BUILD_DIR="${build32_dir}"
-
- mycmakeargs=(
+ abi_configure() {
+ local mycmakeargs=(
$(cmake-utils_use ssl VGL_USESSL)
-DVGL_DOCDIR=/usr/share/doc/"${P}"
- -DVGL_LIBDIR=/usr/$(get_libdir)
-DTJPEG_INCLUDE_DIR=/usr/include
+ -DVGL_LIBDIR=/usr/$(get_libdir)
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/lib32
- -DVGL_FAKELIBDIR=/usr/fakelib/32
+ -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+ -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
)
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 BUILD_DIR="${build32_dir}"
- cmake-utils_src_compile
-
- einfo "Building 64bit libs..."
- )
-
- # Make native version
- cmake-utils_src_compile
+ }
+ multilib_parallel_foreach_abi abi_configure
}
src_install() {
- # Install 32bit version on multilib
- use amd64 && use multilib && (
- einfo "Installing 32bit libs..."
- local BUILD_DIR="${build32_dir}"
- cmake-utils_src_install
-
- einfo "Installing 64bit libs..."
- )
-
- # Install native version
- cmake-utils_src_install
+ cmake-multilib_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
+ newinitd "${FILESDIR}/vgl.initd-r2" vgl
newconfd "${FILESDIR}/vgl.confd-r1" vgl
# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs