gentoo resync : 22.12.2021

2 files changed, 104 insertions, 0 deletions

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 7e303feb4e97..6822522b17b6 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,5 +3,7 @@ AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
+DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c SHA512 9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98
 EBUILD virtualgl-2.6.5-r4.ebuild 2775 BLAKE2B cf683d976c8aec5e293a10d2484ccc213d19a587673b79c6b431bc4313d32c6ee883890b6be5fa94227d9768595f3fd55c5984ce6fd892b66e84898f97a10aff SHA512 dc246bc99ac9e489749631feb76a4ed1e9317c147e2c9ef4c389d278753cbc0fc40dc82a59937849272cdd9377e2b46fa101942de42d3d6bb740d9c324e1cf1d
+EBUILD virtualgl-3.0-r1.ebuild 2883 BLAKE2B 13e24039c41ed0751ef6403cf24863f22dd86408ab2c28f62f676eae3bcd80ef949b280fffeed2c2b9f028dfbed591a2b83b07c5412f2d8d237da3f1869dc925 SHA512 6ad2377b4a097fb7c227e59ae331a1068c762a4d56936647366952443b2b3eae3c08e23e2adee0e7c2b272b9e7d7f273fb6f89c5671eaa19d1c59a7095669e75
 MISC metadata.xml 873 BLAKE2B 8c64dca85cfcbfc919216df48b3da7c87d886fa6d04f37ead9fd80a2df831e0b4a65093330259a3fc401ab671f00c3fe96e93e3e2eb992d63bbc2c45166ee970 SHA512 1ee403bfbdf56a977461695d3a787c5c7e12e6c0fa5b09c6aa6e65834190cf22349f9484f1469e8e177b10bba8ca2313012de95039ac3891a36e3cb04d37fe84
diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
new file mode 100644
index 000000000000..9eaf3b90069a
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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="ssl"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl: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
+	keepdir /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
+	# and eglinfo to veglinto because of conflict with mesa-progs[egl]
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+	mv "${D}"/usr/bin/{,v}eglinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}