From 1607d107ea8254e32d059ce4b9c4375f9608e6f7 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Sat, 13 Feb 2021 02:04:17 +0000 Subject: x11-misc/virtualgl: revbump for d-m-i Signed-off-by: Aisha Tammy Signed-off-by: Matt Turner --- x11-misc/virtualgl/files/vgl.initd-r4 | 45 ++++++++++++ x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild | 104 +++++++++++++++++++++++++++ x11-misc/virtualgl/virtualgl-2.6.5.ebuild | 104 --------------------------- x11-misc/virtualgl/virtualgl-9999.ebuild | 4 +- 4 files changed, 151 insertions(+), 106 deletions(-) create mode 100644 x11-misc/virtualgl/files/vgl.initd-r4 create mode 100644 x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild delete mode 100644 x11-misc/virtualgl/virtualgl-2.6.5.ebuild diff --git a/x11-misc/virtualgl/files/vgl.initd-r4 b/x11-misc/virtualgl/files/vgl.initd-r4 new file mode 100644 index 000000000000..d40686266e0c --- /dev/null +++ b/x11-misc/virtualgl/files/vgl.initd-r4 @@ -0,0 +1,45 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# TODO: description="*" and other OpenRC 0.9+ candies + +depend() { + need display-manager + after sshd +} + +start() { + ebegin "Starting VirtualGL" + truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key + + set_xauth + + if [ -z "$XAUTHORITY" ]; then + + einfo "Waiting for xauthority..." + + # wait for xauth file + while true; do + set_xauth + + if [ -e "$XAUTHORITY" ]; then + break; + fi + + sleep 1 + done + fi + + + 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.6.5-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild new file mode 100644 index 000000000000..a7857fad0339 --- /dev/null +++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" + inherit git-r3 +else + MY_PN="VirtualGL" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 x86" +fi + +DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" +HOMEPAGE="https://www.virtualgl.org/" + +SLOT="0" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" +IUSE="libressl ssl" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + virtual/opencl[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + amd64? ( abi_x86_32? ( + >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] + >=x11-libs/libX11-1.6.2[abi_x86_32] + >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXtst-1.2.3[abi_x86_32] + >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32] + virtual/opencl[abi_x86_32] + >=virtual/opengl-7.0-r1[abi_x86_32] + ) ) +" +DEPEND="${RDEPEND}" + +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.in server/vglgenkey server/vglserver_config || die + + cmake_src_prepare +} + +src_configure() { + # Completely breaks steam/wine for discrete graphics otherwise + # see https://github.com/VirtualGL/virtualgl/issues/16 + append-ldflags "-Wl,--no-as-needed" + + abi_configure() { + local mycmakeargs=( + -DVGL_USESSL="$(usex ssl)" + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" + -DTJPEG_INCLUDE_DIR=/usr/include + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL + -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so + -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) + ) + cmake_src_configure + } + multilib_parallel_foreach_abi abi_configure +} + +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-r4" vgl + newconfd "${FILESDIR}/vgl.confd-r2" vgl + + exeinto /usr/libexec + doexe "${FILESDIR}/vgl-helper.sh" + systemd_dounit "${FILESDIR}/vgl.service" + + # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + mv "${D}"/usr/bin/{,v}glxinfo || die + + # Remove license files, bug 536284 + rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die + + # Directory is created if needed at runtime + rm -r "${D}"/var/lib || die +} diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild deleted file mode 100644 index f537ef884323..000000000000 --- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic systemd - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" - inherit git-r3 -else - MY_PN="VirtualGL" - MY_P="${MY_PN}-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" -HOMEPAGE="https://www.virtualgl.org/" - -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="libressl ssl" - -RDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - ) - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libXv[${MULTILIB_USEDEP}] - x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - virtual/opencl[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - amd64? ( abi_x86_32? ( - >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXtst-1.2.3[abi_x86_32] - >=x11-libs/libXv-1.0.10[abi_x86_32] - x11-libs/xcb-util-keysyms[abi_x86_32] - >=virtual/glu-9.0-r1[abi_x86_32] - virtual/opencl[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] - ) ) -" -DEPEND="${RDEPEND}" - -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.in server/vglgenkey server/vglserver_config || die - - cmake_src_prepare -} - -src_configure() { - # Completely breaks steam/wine for discrete graphics otherwise - # see https://github.com/VirtualGL/virtualgl/issues/16 - append-ldflags "-Wl,--no-as-needed" - - abi_configure() { - local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" - -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so - -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) - ) - cmake_src_configure - } - multilib_parallel_foreach_abi abi_configure -} - -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-r3" vgl - newconfd "${FILESDIR}/vgl.confd-r2" vgl - - exeinto /usr/libexec - doexe "${FILESDIR}/vgl-helper.sh" - systemd_dounit "${FILESDIR}/vgl.service" - - # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs - mv "${D}"/usr/bin/{,v}glxinfo || die - - # Remove license files, bug 536284 - rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die - - # Directory is created if needed at runtime - rm -r "${D}"/var/lib || die -} diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild index b1f2ed56343a..c464597e5bcc 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -82,7 +82,7 @@ src_install() { dodir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r3" vgl + newinitd "${FILESDIR}/vgl.initd-r4" vgl newconfd "${FILESDIR}/vgl.confd-r2" vgl exeinto /usr/libexec -- cgit v1.2.3-65-gdbad