Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Feb 2024 12:58:24 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7332ba6f30b9 - main - x11/virtualgl: Update to 3.1.1
Message-ID:  <202402291258.41TCwO9Q069575@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7332ba6f30b9c178826daf5fa235bb5136517493

commit 7332ba6f30b9c178826daf5fa235bb5136517493
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-02-29 12:54:00 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-02-29 12:57:59 +0000

    x11/virtualgl: Update to 3.1.1
    
    - Update MASTER_SITES to official GH url
    - Add licenses
    - Drop USES=compiler
    
    ChangeLog: https://github.com/VirtualGL/virtualgl/releases/tag/3.1.1
---
 x11/virtualgl/Makefile  | 40 ++++++++++++++++++++++++----------------
 x11/virtualgl/distinfo  |  6 +++---
 x11/virtualgl/pkg-plist | 13 -------------
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile
index 2f777cefb3b0..69f43da5a3ad 100644
--- a/x11/virtualgl/Makefile
+++ b/x11/virtualgl/Makefile
@@ -1,28 +1,35 @@
 PORTNAME=	virtualgl
-DISTVERSION=	3.1
+DISTVERSION=	3.1.1
 CATEGORIES=	x11 graphics
-MASTER_SITES=	SF/${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	https://github.com/VirtualGL/${PORTNAME}/releases/download/${DISTVERSION}/
 DISTNAME=	VirtualGL-${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Redirects commands from an OpenGL app to another X server
 WWW=		https://www.virtualgl.org
 
+LICENSE=	LGPL21 WXWINDOWS
+LICENSE_COMB=	multi
+LICENSE_NAME_WXWINDOWS=	wxWindows Library Licence, Version 3.1
+LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL.txt
+LICENSE_FILE_WXWINDOWS=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS_WXWINDOWS=	dist-mirror pkg-mirror auto-accept
+
 ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
+BUILD_DEPENDS=	xcb-util-keysyms>0:x11/xcb-util-keysyms
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
-		libturbojpeg.so:graphics/libjpeg-turbo \
-		libxcb-keysyms.so:x11/xcb-util-keysyms
+		libturbojpeg.so:graphics/libjpeg-turbo
 
-USES=		cmake compiler:c++11-lang gl localbase xorg
+USES=		cmake gl localbase xorg
 USE_GL=		egl gl glu
 USE_XORG=	x11 xcb xext xtst
 USE_LDCONFIG=	${PREFIX}/VirtualGL/lib
 
-CMAKE_ARGS=	-DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \
-		-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \
-		-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \
-		-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \
+		-DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \
+		-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so
+CMAKE_ON=	VGL_FAKEXCB VGL_SYSTEMFLTK
 CMAKE_INSTALL_PREFIX=	${LOCALBASE}/VirtualGL
 
 # Some versioned symbols in virtualgl are undefined when libvglfaker.so
@@ -31,10 +38,11 @@ CMAKE_INSTALL_PREFIX=	${LOCALBASE}/VirtualGL
 LDFLAGS+=	-Wl,--undefined-version
 
 DOCSDIR=	${LOCALBASE}/VirtualGL/doc
+PORTDOCS=	*
 
-OPTIONS_DEFINE=	OPENCL OPENSSL XVIDEO DOCS
+OPTIONS_DEFINE=		DOCS OPENCL OPENSSL XVIDEO
 OPTIONS_DEFAULT=	OPENCL
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 OPENCL_CMAKE_BOOL=	VGL_FAKEOPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
@@ -45,16 +53,16 @@ OPENSSL_CMAKE_BOOL=	VGL_USESSL
 OPENSSL_USES=		ssl
 
 XVIDEO_CMAKE_BOOL=	VGL_USEXV
-XVIDEO_USE=	XORG=xv
+XVIDEO_USE=		XORG=xv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv7" || ${ARCH} == "i386" || ${ARCH} == "powerpc"
-PLIST_SUB+=	I386="" \
-		AMD64="@comment "
+PLIST_SUB+=	AMD64="@comment " \
+		I386=""
 .else
-PLIST_SUB+=	I386="@comment " \
-		AMD64=""
+PLIST_SUB+=	AMD64="" \
+		I386="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/virtualgl/distinfo b/x11/virtualgl/distinfo
index 1f320f394767..acc4b5774a90 100644
--- a/x11/virtualgl/distinfo
+++ b/x11/virtualgl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680779381
-SHA256 (VirtualGL-3.1.tar.gz) = 57bd20a9b1127de344313b6178b19610838a6af6309c059702788e41b6a875d0
-SIZE (VirtualGL-3.1.tar.gz) = 1248818
+TIMESTAMP = 1709207093
+SHA256 (VirtualGL-3.1.1.tar.gz) = 1e4fd7a78f29d07a689f601a6f3db81e4f2ecf4e29baddf7e6dec0cfc90d7345
+SIZE (VirtualGL-3.1.1.tar.gz) = 1223341
diff --git a/x11/virtualgl/pkg-plist b/x11/virtualgl/pkg-plist
index 36ca0d9573a3..928680581262 100644
--- a/x11/virtualgl/pkg-plist
+++ b/x11/virtualgl/pkg-plist
@@ -17,19 +17,6 @@ VirtualGL/bin/vglgenkey
 VirtualGL/bin/vgllogin
 VirtualGL/bin/vglrun
 VirtualGL/bin/vglserver_config
-%%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402291258.41TCwO9Q069575>