Date: Sat, 30 May 2020 17:53:43 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537096 - in head/x11/virtualgl: . files Message-ID: <202005301753.04UHrhRu045179@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Sat May 30 17:53:43 2020 New Revision: 537096 URL: https://svnweb.freebsd.org/changeset/ports/537096 Log: x11/virtualgl: Update to 2.6.3 PR: 241660 Submitted by: theron, Dan Nelson <dnelson_1901@yahoo.com> Approved by: davidjx8p@gmail.com (maintainer timeout) Added: head/x11/virtualgl/files/patch-server__fakerconfig.cpp (contents, props changed) Deleted: head/x11/virtualgl/files/patch-common__CMakeLists.txt head/x11/virtualgl/files/patch-include_Socket.h head/x11/virtualgl/files/patch-server__CMakeLists.txt head/x11/virtualgl/files/patch-util_Socket.cpp head/x11/virtualgl/files/patch-util__CMakeLists.txt Modified: head/x11/virtualgl/Makefile head/x11/virtualgl/distinfo head/x11/virtualgl/pkg-plist Modified: head/x11/virtualgl/Makefile ============================================================================== --- head/x11/virtualgl/Makefile Sat May 30 17:31:09 2020 (r537095) +++ head/x11/virtualgl/Makefile Sat May 30 17:53:43 2020 (r537096) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= virtualgl -PORTVERSION= 2.4.1 -PORTREVISION= 7 +PORTVERSION= 2.6.3 CATEGORIES= x11 graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= VirtualGL-${PORTVERSION} @@ -20,23 +19,29 @@ ONLY_FOR_ARCHS= amd64 i386 CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL DOCSDIR= ${LOCALBASE}/VirtualGL/doc -USES= cmake:noninja compiler:c++11-lang gl xorg +USES= cmake compiler:c++11-lang gl xorg USE_GL= gl glu -USE_XORG= x11 xcb xext -CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\ - -DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so\ - -DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on -DVGL_SYSTEMGLX=on -USE_LDCONFIG= ${PREFIX}/VirtualGL/fakelib ${PREFIX}/VirtualGL/lib +USE_XORG= x11 xcb xext xtst +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 LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= OPENSSL XVIDEO +OPTIONS_DEFINE= OPENCL OPENSSL XVIDEO +OPTIONS_DEFAULT= OPENCL +OPTIONS_SUB= yes -OPENSSL_CMAKE_ON= -DVGL_USESSL:BOOL=ON -OPENSSL_CMAKE_OFF= -DVGL_USESSL:BOOL=OFF +OPENCL_CMAKE_BOOL= VGL_FAKEOPENCL +OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl +OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd +OPENCL_DESC= Build OpenCL interposer library + +OPENSSL_CMAKE_BOOL= VGL_USESSL OPENSSL_USES= ssl -XVIDEO_CMAKE_ON= -DVGL_USEXV:BOOL=ON -XVIDEO_CMAKE_OFF= -DVGL_USEXV:BOOL=OFF +XVIDEO_CMAKE_BOOL= VGL_USEXV XVIDEO_USE= XORG=xv .include <bsd.port.pre.mk> Modified: head/x11/virtualgl/distinfo ============================================================================== --- head/x11/virtualgl/distinfo Sat May 30 17:31:09 2020 (r537095) +++ head/x11/virtualgl/distinfo Sat May 30 17:53:43 2020 (r537096) @@ -1,2 +1,3 @@ -SHA256 (VirtualGL-2.4.1.tar.gz) = 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e -SIZE (VirtualGL-2.4.1.tar.gz) = 1116018 +TIMESTAMP = 1586837136 +SHA256 (VirtualGL-2.6.3.tar.gz) = 9be36c540c512068c8fc26a28722e604e0d2c305f7295229f1e1c8283193cb5e +SIZE (VirtualGL-2.6.3.tar.gz) = 1197037 Added: head/x11/virtualgl/files/patch-server__fakerconfig.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/virtualgl/files/patch-server__fakerconfig.cpp Sat May 30 17:53:43 2020 (r537096) @@ -0,0 +1,11 @@ +--- server/fakerconfig.cpp 2019-10-20 16:29:00.000000000 -0500 ++++ server/fakerconfig.cpp 2020-04-14 10:37:51.384994000 -0500 +@@ -97,7 +97,7 @@ + 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; Modified: head/x11/virtualgl/pkg-plist ============================================================================== --- head/x11/virtualgl/pkg-plist Sat May 30 17:31:09 2020 (r537095) +++ head/x11/virtualgl/pkg-plist Sat May 30 17:53:43 2020 (r537096) @@ -13,10 +13,7 @@ VirtualGL/bin/vglgenkey VirtualGL/bin/vgllogin VirtualGL/bin/vglrun VirtualGL/bin/vglserver_config -%%DOCSDIR%%/411.gif -%%DOCSDIR%%/422.gif -%%DOCSDIR%%/444.gif -%%DOCSDIR%%/ChangeLog.txt +%%DOCSDIR%%/ChangeLog.md %%DOCSDIR%%/LGPL.txt %%DOCSDIR%%/LICENSE-FLTK.txt %%DOCSDIR%%/LICENSE.txt @@ -24,13 +21,15 @@ VirtualGL/bin/vglserver_config %%DOCSDIR%%/index.html %%DOCSDIR%%/somerights20.png %%DOCSDIR%%/sshtunnel.png +%%DOCSDIR%%/subsampling.gif %%DOCSDIR%%/vgltransport.png %%DOCSDIR%%/vgltransportservernetwork.png %%DOCSDIR%%/virtualgl.css %%DOCSDIR%%/x11transport.png -VirtualGL/fakelib/libGL.so VirtualGL/include/rr.h VirtualGL/include/rrtransport.h VirtualGL/lib/libdlfaker.so VirtualGL/lib/libgefaker.so -VirtualGL/lib/librrfaker.so +VirtualGL/lib/libvglfaker-nodl.so +%%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so +VirtualGL/lib/libvglfaker.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005301753.04UHrhRu045179>