From nobody Mon Dec 6 00:28:42 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1107018BFAC9; Mon, 6 Dec 2021 00:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J6kn710qJz4YGd; Mon, 6 Dec 2021 00:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E005E21D18; Mon, 6 Dec 2021 00:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B60SgWx085223; Mon, 6 Dec 2021 00:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B60Sg8T085222; Mon, 6 Dec 2021 00:28:42 GMT (envelope-from git) Date: Mon, 6 Dec 2021 00:28:42 GMT Message-Id: <202112060028.1B60Sg8T085222@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ka Ho Ng Subject: git: efef6dc621a5 - main - x11/virtualgl: Update to 3.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efef6dc621a53adfd34b72ec3040ee741cc12a10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638750523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGQfZi4HjNEZVWItSKaMSgGfRSo3ANAPIsWBC+7QIz0=; b=FDAazS91GTNreZ9viuCe+ugiY0yqB2ejZXLi2GzOhh5CJXeCDDAZ92J2fMR8bjXo7nQfbn moEV8qxICDNivQOPb0xEg/4jm7/Yrbqpi7ORmRZjAHDmwkRr/l0/Hh9cpjdE8RXWVQ4Z60 jx7iRfmRgHevokEWa+bm41bC1tQNH4raLxxlRNJcQjk1DVmMoFSXfWpz6QEwcC54pLF/uM N75n9NHYm/hi9iOCqIX7PqEFo3HjudzZzP80IpY6gSVGg08tBc83gWOvJkNg9eamiVdr+f CRNcl7gaepEZzLTvc6xVlQi+4ivhOSA9X1d7fHEwd9wuJyivPlr6pRkbyZu41Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638750523; a=rsa-sha256; cv=none; b=WWCTkZ3uSaNlPGE/3e/8FKq5JwQagc73VJGFafVktC4KltkDgdZaOqvA5INqsNilnNEIyl DdrHQGVct5D1+6tauogQUZJnq0dcWQEPja/M9LEPbBVrJe11X+eBM3/EKvwFVnxOVXwxuw D9aG9IduPTz8oI4PC2CfrN+XVrfldVTTR0fryTKwBEK8vExLzeQ8uPDCzRM68SQjlrLbIj d88jBI/mcXEkrfzi2V+i3jE2PdsQe0hAFLWJPyrP1wf9whdFt9zBZp50sgfBw3Cij2n4Nx ebUbRMHpn4xoWKIgoYHK350OvWHvbg1ecNRPYcwnpIU/UOacyHVH8NYJLwwjDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by khng (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=efef6dc621a53adfd34b72ec3040ee741cc12a10 commit efef6dc621a53adfd34b72ec3040ee741cc12a10 Author: Ka Ho Ng AuthorDate: 2021-12-06 00:24:40 +0000 Commit: Ka Ho Ng CommitDate: 2021-12-06 00:28:01 +0000 x11/virtualgl: Update to 3.0 The most significant update is the addition of EGL backend. To use the backend with the default GPU, specify VGL_DISPLAY=EGL in the environment variables. PR: 260244 Sponsored by: The FreeBSD Foundation Approved by: ygy Differential Revision: https://reviews.freebsd.org/D33281 --- x11/virtualgl/Makefile | 31 +++++++++++------------ x11/virtualgl/distinfo | 6 ++--- x11/virtualgl/files/patch-server__fakerconfig.cpp | 11 -------- x11/virtualgl/files/patch-server_faker-glx.cpp | 24 ------------------ x11/virtualgl/files/patch-server_faker-sym.h | 11 -------- x11/virtualgl/pkg-plist | 28 ++++++++++---------- 6 files changed, 33 insertions(+), 78 deletions(-) diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile index 17fa5eb28d28..ca10cdb2c827 100644 --- a/x11/virtualgl/Makefile +++ b/x11/virtualgl/Makefile @@ -1,35 +1,38 @@ # Created by: David Mackay PORTNAME= virtualgl -PORTVERSION= 2.6.3 -PORTREVISION= 2 +DISTVERSION= 3.0 CATEGORIES= x11 graphics -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} -DISTNAME= VirtualGL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Redirects commands from an OpenGL app to another X server +ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le + LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libturbojpeg.so:graphics/libjpeg-turbo \ libxcb-keysyms.so:x11/xcb-util-keysyms -ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le - -CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL -DOCSDIR= ${LOCALBASE}/VirtualGL/doc - USES= cmake compiler:c++11-lang gl xorg -USE_GL= gl glu +USE_GL= egl gl glu USE_XORG= x11 xcb xext xtst +USE_LDCONFIG= ${PREFIX}/VirtualGL/lib + +USE_GITHUB= yes +GH_ACCOUNT= VirtualGL + CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \ -DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \ -DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \ -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} -USE_LDCONFIG= ${PREFIX}/VirtualGL/lib +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL -OPTIONS_DEFINE= OPENCL OPENSSL XVIDEO +DOCSDIR= ${LOCALBASE}/VirtualGL/doc + +OPTIONS_DEFINE= OPENCL OPENSSL XVIDEO DOCS OPTIONS_DEFAULT= OPENCL OPTIONS_SUB= yes @@ -54,8 +57,4 @@ PLIST_SUB+= I386="@comment " PLIST_SUB+= AMD64="" .endif -post-patch: - @${REINPLACE_CMD} -e '/^#define CHECKGL/s,m);, &,' \ - ${WRKSRC}/server/VirtualDrawable.cpp - .include diff --git a/x11/virtualgl/distinfo b/x11/virtualgl/distinfo index 53401c2cefa3..b47124a5e2db 100644 --- a/x11/virtualgl/distinfo +++ b/x11/virtualgl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586837136 -SHA256 (VirtualGL-2.6.3.tar.gz) = 9be36c540c512068c8fc26a28722e604e0d2c305f7295229f1e1c8283193cb5e -SIZE (VirtualGL-2.6.3.tar.gz) = 1197037 +TIMESTAMP = 1638599825 +SHA256 (VirtualGL-virtualgl-3.0_GH0.tar.gz) = d6e00a8d0596cafa67955d6211e0dab6c8aa8239bd718f7eca6eb0b032711f9b +SIZE (VirtualGL-virtualgl-3.0_GH0.tar.gz) = 1244021 diff --git a/x11/virtualgl/files/patch-server__fakerconfig.cpp b/x11/virtualgl/files/patch-server__fakerconfig.cpp deleted file mode 100644 index e5dd516d404f..000000000000 --- a/x11/virtualgl/files/patch-server__fakerconfig.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- server/fakerconfig.cpp.orig 2019-10-20 21:29:00 UTC -+++ server/fakerconfig.cpp -@@ -97,7 +97,7 @@ FakerConfig *fconfig_getinstance(void) - if((addr = shmat(fconfig_shmid, 0, 0)) == (void *)-1) THROW_UNIX(); - if(!addr) - THROW("Could not attach to config structure in shared memory"); -- #ifdef linux -+ #if defined(linux) || defined(__FreeBSD__) - shmctl(fconfig_shmid, IPC_RMID, 0); - #endif - char *env = NULL; diff --git a/x11/virtualgl/files/patch-server_faker-glx.cpp b/x11/virtualgl/files/patch-server_faker-glx.cpp deleted file mode 100644 index 6fb9d381ce39..000000000000 --- a/x11/virtualgl/files/patch-server_faker-glx.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- server/faker-glx.cpp.orig 2019-10-20 21:29:00 UTC -+++ server/faker-glx.cpp -@@ -2192,11 +2192,10 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, - CATCH(); - } - --int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, -+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, - unsigned int *value) - { - glXQueryDrawable(dpy, pbuf, attribute, value); -- return 0; - } - - -@@ -2359,7 +2358,7 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable - // Returns the transparent index from the overlay visual on the 2D X server - - int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, -- long *transparentIndex) -+ unsigned long *transparentIndex) - { - int retval = False; - XWindowAttributes xwa; diff --git a/x11/virtualgl/files/patch-server_faker-sym.h b/x11/virtualgl/files/patch-server_faker-sym.h deleted file mode 100644 index 985d6bdea41e..000000000000 --- a/x11/virtualgl/files/patch-server_faker-sym.h +++ /dev/null @@ -1,11 +0,0 @@ ---- server/faker-sym.h.orig 2019-10-20 21:29:00 UTC -+++ server/faker-sym.h -@@ -536,7 +536,7 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX - // GLX_SUN_get_transparent_index - - FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, -- Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN); -+ Window, underlay, unsigned long *, transparentIndex, glXGetTransparentIndexSUN); - - - // GL functions diff --git a/x11/virtualgl/pkg-plist b/x11/virtualgl/pkg-plist index e8ad86b52d28..efdedc2c15f4 100644 --- a/x11/virtualgl/pkg-plist +++ b/x11/virtualgl/pkg-plist @@ -1,5 +1,6 @@ %%AMD64%%VirtualGL/bin/.vglrun.vars64 %%I386%%VirtualGL/bin/.vglrun.vars32 +VirtualGL/bin/eglinfo VirtualGL/bin/glreadtest VirtualGL/bin/glxinfo %%AMD64%%VirtualGL/bin/glxspheres64 @@ -13,19 +14,19 @@ VirtualGL/bin/vglgenkey VirtualGL/bin/vgllogin VirtualGL/bin/vglrun VirtualGL/bin/vglserver_config -%%DOCSDIR%%/ChangeLog.md -%%DOCSDIR%%/LGPL.txt -%%DOCSDIR%%/LICENSE-FLTK.txt -%%DOCSDIR%%/LICENSE.txt -%%DOCSDIR%%/configdialog.gif -%%DOCSDIR%%/index.html -%%DOCSDIR%%/somerights20.png -%%DOCSDIR%%/sshtunnel.png -%%DOCSDIR%%/subsampling.gif -%%DOCSDIR%%/vgltransport.png -%%DOCSDIR%%/vgltransportservernetwork.png -%%DOCSDIR%%/virtualgl.css -%%DOCSDIR%%/x11transport.png +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md +%%PORTDOCS%%%%DOCSDIR%%/LGPL.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-FLTK.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt +%%PORTDOCS%%%%DOCSDIR%%/configdialog.gif +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/somerights20.png +%%PORTDOCS%%%%DOCSDIR%%/sshtunnel.png +%%PORTDOCS%%%%DOCSDIR%%/subsampling.gif +%%PORTDOCS%%%%DOCSDIR%%/vgltransport.png +%%PORTDOCS%%%%DOCSDIR%%/vgltransportservernetwork.png +%%PORTDOCS%%%%DOCSDIR%%/virtualgl.css +%%PORTDOCS%%%%DOCSDIR%%/x11transport.png VirtualGL/include/rr.h VirtualGL/include/rrtransport.h VirtualGL/lib/libdlfaker.so @@ -33,3 +34,4 @@ VirtualGL/lib/libgefaker.so VirtualGL/lib/libvglfaker-nodl.so %%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so VirtualGL/lib/libvglfaker.so +libdata/ldconfig/virtualgl