From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- x11-misc/virtualgl/Manifest | 3 +- x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 95 ++++++++++++++++++++++++++++ x11-misc/virtualgl/virtualgl-9999.ebuild | 6 +- 3 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild (limited to 'x11-misc/virtualgl') diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index cd182577921b..8d90036f92b8 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -7,6 +7,7 @@ DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd50 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5 EBUILD virtualgl-2.5.2-r1.ebuild 2616 BLAKE2B 36f0a927e0663913194c94c42d8e0f88f6cbae7bafe46dd5f7aa304377904c5b289743f62acb52660a36cce054885c552e6625c696b8f09c99bcab0dbc942380 SHA512 1dab9b93693e26a3cf3823237a377a72b177ef0ab9c038570d7bfb5ae2e7352f23d5e0cb0972b751f2457607839498022586adcec2ef98fece098fd5336dacd2 EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81 +EBUILD virtualgl-2.6.1-r1.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55 EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0 -EBUILD virtualgl-9999.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0 +EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600 diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild new file mode 100644 index 000000000000..baca3aa94532 --- /dev/null +++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake-multilib flag-o-matic multilib 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 ~arm64 ~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}] + virtual/glu[${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] + >=virtual/glu-9.0-r1[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-utils_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-utils_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 +} diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild index 05ef6a703773..baca3aa94532 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-multilib flag-o-matic multilib systemd if [[ ${PV} == *9999 ]] ; then @@ -30,6 +30,7 @@ RDEPEND=" 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}] virtual/glu[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] @@ -37,6 +38,7 @@ RDEPEND=" >=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] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] @@ -62,7 +64,7 @@ src_configure() { -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir) + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) ) -- cgit v1.2.3