gentoo auto-resync : 08:06:2023 - 15:45:39

3 files changed, 156 insertions, 0 deletions

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index b324b0009594..9a1e53ea8f99 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,8 +2,10 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
+AUX virtualgl-3.1-drop-register.patch 1678 BLAKE2B dfb756d013ae7ea40ce6ce2de20c0aabf2bab53975510a4ccd593ae11c3e47f467209f64c9d009d6b1e20cc46eba52ee2569172a64176f43df8273119658eda5 SHA512 c9a231682239f3ae6603a4aec723aaca39321f838971ae08f67a0484ac8dcf22ea7f5e4d5bd4bbe9ed83f8a5946e903c7b54e4290cb632101a0f10f6ba5e42fe
 DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
 DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b
 EBUILD virtualgl-3.0.2.ebuild 2862 BLAKE2B 6f72164ed90b1092c1571477f09ccbecf7bbcbe389ec8ed246fd285d7f8796bd0bf1486a834044c14d0d014f02dc53ddf099acf50a0db2d84068ec92f2070837 SHA512 d2cbe9ba3fe6107966cbe855d5536a0ad70ffbbb646d4bf9b5ca86a14c81b3ff296cf9bd72d8ce5de3704edceef68b31593b0987fbb81aa3e51c5c3650c34c9d
+EBUILD virtualgl-3.1-r1.ebuild 2836 BLAKE2B 2c5fa1e23aecc0e004f8d9a9165d74477a78720dc55cb3563372b9170d590d76d2943b9cb5020268ba6d18dc159574ca6a29907fba479a3e61183be4b65e3048 SHA512 cae359973f92ece74f1c1a99f62309d1f316719e91cdceb22a0b4f5d2eb22d7e296cd58aca7c1e2393cdc5545f77dc16d0aba2227e91a7e39ab1b0c871fb63ed
 EBUILD virtualgl-3.1.ebuild 2778 BLAKE2B 0163195fbe298c11284a62c29c7613567f09e00282416fcb70fe55e8c90422d650548fec3a8b180e3f431db1226992ec4b0c25dd5edeb499bbc2fd107efc7d3d SHA512 c079aa21f87a84e29bfcb9c8e064897df5a58c5918d978b2df88c786c078b97510b359f5ac1be76be62b059897c960caba8376ff1cb1077b5518fa546b166d88
 MISC metadata.xml 822 BLAKE2B 8fd6340ff5f167066f17763ef771da259b47fcb140d9bfdf887260e58a02bbdf95ce49bd36fc970024cc3c6dc5daac19e8975bb787dcd45219c729e0a8e0570f SHA512 b3b7fb03192d77f07cffce45364e3387055d641ddb676f9523e91d280bdc674b0c96d042b9ab39e56498a716152e3533b4633dabbed1e7fbe9c805acaa0f9a5d
diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
new file mode 100644
index 000000000000..5e7153c3c383
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch
@@ -0,0 +1,53 @@
+https://github.com/VirtualGL/virtualgl/pull/233
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Thu, 1 Jun 2023 14:45:17 +0530
+Subject: [PATCH] Dropping use of register keyword
+
+The usage of register keyword was deprecated in c++14 and it's
+completely removed in c++17. Found will building virtualgl on gentoo
+with clang-16.
+
+Bug: https://bugs.gentoo.org/898876
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/server/fltk/src/Fl_Text_Buffer.cxx
++++ b/server/fltk/src/Fl_Text_Buffer.cxx
+@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char *string, int len ) {
+ ** routine if no substitution has been done.
+ */
+ void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) {
+-  register char * c, subsChar = mNullSubsChar;
++  char * c, subsChar = mNullSubsChar;
+ 
+   if ( subsChar == '\0' )
+     return;
+--- a/server/fltk/src/Fl_arg.cxx
++++ b/server/fltk/src/Fl_arg.cxx
+@@ -314,7 +314,7 @@ without express or implied warranty.
+ 
+ static int ReadInteger(char* string, char** NextString)
+ {
+-  register int Result = 0;
++  int Result = 0;
+   int Sign = 1;
+     
+   if (*string == '+')
+@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y,
+ 		   unsigned int* width, unsigned int* height)
+ {
+   int mask = NoValue;
+-  register char *strind;
++  char *strind;
+   unsigned int tempWidth = 0, tempHeight = 0;
+   int tempX = 0, tempY = 0;
+   char *nextCharacter;
+--- a/util/md5.c
++++ b/util/md5.c
+@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
+  */
+ void MD5Transform(uint32 buf[4], uint32 in[16])
+ {
+-  register uint32 a, b, c, d;
++  uint32 a, b, c, d;
+ 
+   a = buf[0];
+   b = buf[1];
diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
new file mode 100644
index 000000000000..479f441ae5f9
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=""
+
+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}]
+	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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-drop-register.patch
+)
+
+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=(
+			-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
+}