Attachment #213437 for bug #241660




# $FreeBSD$

PORTNAME=	virtualgl
PORTVERSION=	2.6.3
PORTREVISION=	7
CATEGORIES=	x11 graphics
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
DISTNAME=	VirtualGL-${PORTVERSION}

CMAKE_INSTALL_PREFIX=	${LOCALBASE}/VirtualGL
DOCSDIR=	${LOCALBASE}/VirtualGL/doc

USES=		cmake compiler:c++11-lang gl xorg
USE_GL=		gl glu
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=	OPENCL OPENSSL XVIDEO
OPTIONS_DEFAULT=	OPENCL
OPTIONS_SUB=	yes

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_BOOL=	VGL_USEXV
XVIDEO_CMAKE_OFF=	-DVGL_USEXV:BOOL=OFF
XVIDEO_USE=	XORG=xv

.include <bsd.port.pre.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (VirtualGL-2.4.1.tar.gz) = 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e	1	TIMESTAMP = 1586837136
2	SIZE (VirtualGL-2.4.1.tar.gz) = 1116018	2	SHA256 (VirtualGL-2.6.3.tar.gz) = 9be36c540c512068c8fc26a28722e604e0d2c305f7295229f1e1c8283193cb5e
		3	SIZE (VirtualGL-2.6.3.tar.gz) = 1197037

Lines 1-11 Link Here

(-)files/patch-common__CMakeLists.txt (-11 lines)
1	--- common/CMakeLists.txt.orig 2014-02-11 02:55:11 UTC
2	+++ common/CMakeLists.txt
3	@@ -4,6 +4,8 @@
4
5	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
6
7	+ADD_DEFINITIONS(-fPIC)
8	+
9	add_library(vglcommon STATIC Frame.cpp Profiler.cpp)
10	target_link_libraries(vglcommon vglutil ${TJPEG_LIBRARY})
11

Lines 1-11 Link Here

(-)files/patch-include_Socket.h (-11 lines)
1	--- include/Socket.h.orig 2014-07-17 11:36:01 UTC
2	+++ include/Socket.h
3	@@ -138,7 +138,7 @@ namespace vglutil
4	{
5	public:
6
7	- Socket(bool doSSL);
8	+ Socket(bool doSSL=false);
9	#ifdef USESSL
10	Socket(SOCKET sd, SSL *ssl);
11	#else




--- server/CMakeLists.txt.orig	2015-05-26 23:34:37 UTC
+++ server/CMakeLists.txt
@@ -21,6 +21,8 @@ configure_file(vendor.h.in vendor.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 	../common)
 
+ADD_DEFINITIONS(-fPIC)
+
 set(FBXFAKERLIB fbx-faker)
 if(VGL_USEXV)
 	set(FBXFAKERLIB ${FBXFAKERLIB};fbxv)
@@ -73,9 +75,9 @@ if(MAPFLAG)
 	set_source_files_properties(faker-sym.cpp PROPERTIES
 		OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
 	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES
-		LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
+		LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
 else()
-	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
+	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
 endif()
 if(VGL_FAKEXCB)
 	set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb)
@@ -99,7 +101,7 @@ target_link_libraries(${VGL_DLFAKER_NAME
 install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR})
 
 add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c)
-set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
+set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
 target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL})
 install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR})
 
@@ -148,8 +150,8 @@ target_link_libraries(dlfakerut ${X11_X1
 add_library(GLdlfakerut SHARED libGLdlfakerut.c)
 
 add_executable(fakerut fakerut.cpp fakerut-supplement.c)
-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
-	${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil)
+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
+	${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
 
 add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp)
 if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")

Line 0 Link Here

(-)files/patch-server__fakerconfig.cpp (+11 lines)
	1	--- server/fakerconfig.cpp 2019-10-20 16:29:00.000000000 -0500
	2	+++ server/fakerconfig.cpp 2020-04-14 10:37:51.384994000 -0500
	3	@@ -97,7 +97,7 @@
	4	if((addr = shmat(fconfig_shmid, 0, 0)) == (void *)-1) THROW_UNIX();
	5	if(!addr)
	6	THROW("Could not attach to config structure in shared memory");
	7	- #ifdef linux
	8	+ #if defined(linux) \|\| defined(__FreeBSD__)
	9	shmctl(fconfig_shmid, IPC_RMID, 0);
	10	#endif
	11	char *env = NULL;

Lines 1-11 Link Here

(-)files/patch-util_Socket.cpp (-11 lines)
1	--- util/Socket.cpp.orig 2014-07-17 11:36:01 UTC
2	+++ util/Socket.cpp
3	@@ -125,7 +125,7 @@ static X509 newCert(EVP_PKEY priv)
4	#endif // USESSL
5
6
7	-Socket::Socket(bool doSSL_=false)
8	+Socket::Socket(bool doSSL_)
9	#ifdef USESSL
10	: doSSL(doSSL_)
11	#endif

Lines 1-8 Link Here

(-)files/patch-util__CMakeLists.txt (-8 lines)
1	--- util/CMakeLists.txt.orig 2014-11-01 06:04:28 UTC
2	+++ util/CMakeLists.txt
3	@@ -1,3 +1,5 @@
4	+ADD_DEFINITIONS(-fPIC)
5	+
6	add_library(vglutil STATIC GenericQ.cpp Log.cpp Mutex.cpp Thread.cpp bmp.c)
7	if(UNIX)
8	target_link_libraries(vglutil pthread)




VirtualGL/bin/vgllogin
VirtualGL/bin/vglrun
VirtualGL/bin/vglserver_config
%%DOCSDIR%%/ChangeLog.md
%%DOCSDIR%%/422.gif
%%DOCSDIR%%/444.gif
%%DOCSDIR%%/ChangeLog.txt
%%DOCSDIR%%/LGPL.txt
%%DOCSDIR%%/LICENSE-FLTK.txt
%%DOCSDIR%%/LICENSE.txt

%%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/libvglfaker-nodl.so
%%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so
VirtualGL/lib/libvglfaker.so

Return to bug 241660

Lines 2-9 Link Here

(-)Makefile (-13 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualgl	4	PORTNAME= virtualgl
5	PORTVERSION= 2.4.1	5	PORTVERSION= 2.6.3
6	PORTREVISION= 7
7	CATEGORIES= x11 graphics	6	CATEGORIES= x11 graphics
8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
9	DISTNAME= VirtualGL-${PORTVERSION}	8	DISTNAME= VirtualGL-${PORTVERSION}
Lines 20-42 Link Here
20	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL	19	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
21	DOCSDIR= ${LOCALBASE}/VirtualGL/doc	20	DOCSDIR= ${LOCALBASE}/VirtualGL/doc
22		21
23	USES= cmake:noninja compiler:c++11-lang gl xorg	22	USES= cmake compiler:c++11-lang gl xorg
24	USE_GL= gl glu	23	USE_GL= gl glu
25	USE_XORG= x11 xcb xext	24	USE_XORG= x11 xcb xext xtst
26	CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\	25	CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \
27	-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so\	26	-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \
28	-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on -DVGL_SYSTEMGLX=on	27	-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \
29	USE_LDCONFIG= ${PREFIX}/VirtualGL/fakelib ${PREFIX}/VirtualGL/lib	28	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
		29	USE_LDCONFIG= ${PREFIX}/VirtualGL/lib
30	LDFLAGS+= -L${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib
31		31
32	OPTIONS_DEFINE= OPENSSL XVIDEO	32	OPTIONS_DEFINE= OPENCL OPENSSL XVIDEO
		33	OPTIONS_DEFAULT= OPENCL
		34	OPTIONS_SUB= yes
33		35
34	OPENSSL_CMAKE_ON= -DVGL_USESSL:BOOL=ON	36	OPENCL_CMAKE_BOOL= VGL_FAKEOPENCL
35	OPENSSL_CMAKE_OFF= -DVGL_USESSL:BOOL=OFF	37	OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl
		38	OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd
		39	OPENCL_DESC= Build OpenCL interposer library
		40
		41	OPENSSL_CMAKE_BOOL= VGL_USESSL
36	OPENSSL_USES= ssl	42	OPENSSL_USES= ssl
37		43
38	XVIDEO_CMAKE_ON= -DVGL_USEXV:BOOL=ON	44	XVIDEO_CMAKE_BOOL= VGL_USEXV
39	XVIDEO_CMAKE_OFF= -DVGL_USEXV:BOOL=OFF
40	XVIDEO_USE= XORG=xv	45	XVIDEO_USE= XORG=xv
41		46
42	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>

Lines 1-43 Link Here

(-)files/patch-server__CMakeLists.txt (-43 lines)
1	--- server/CMakeLists.txt.orig 2015-05-26 23:34:37 UTC
2	+++ server/CMakeLists.txt
3	@@ -21,6 +21,8 @@ configure_file(vendor.h.in vendor.h)
4	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
5	../common)
6
7	+ADD_DEFINITIONS(-fPIC)
8	+
9	set(FBXFAKERLIB fbx-faker)
10	if(VGL_USEXV)
11	set(FBXFAKERLIB ${FBXFAKERLIB};fbxv)
12	@@ -73,9 +75,9 @@ if(MAPFLAG)
13	set_source_files_properties(faker-sym.cpp PROPERTIES
14	OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
15	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES
16	- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
17	+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
18	else()
19	- set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
20	+ set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
21	endif()
22	if(VGL_FAKEXCB)
23	set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb)
24	@@ -99,7 +101,7 @@ target_link_libraries(${VGL_DLFAKER_NAME
25	install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR})
26
27	add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c)
28	-set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
29	+set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
30	target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL})
31	install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR})
32
33	@@ -148,8 +150,8 @@ target_link_libraries(dlfakerut ${X11_X1
34	add_library(GLdlfakerut SHARED libGLdlfakerut.c)
35
36	add_executable(fakerut fakerut.cpp fakerut-supplement.c)
37	-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
38	- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil)
39	+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
40	+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
41
42	add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp)
43	if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 13-22 Link Here

(-)pkg-plist (-6 / +5 lines)
13	VirtualGL/bin/vgllogin	13	VirtualGL/bin/vgllogin
14	VirtualGL/bin/vglrun	14	VirtualGL/bin/vglrun
15	VirtualGL/bin/vglserver_config	15	VirtualGL/bin/vglserver_config
16	%%DOCSDIR%%/411.gif	16	%%DOCSDIR%%/ChangeLog.md
17	%%DOCSDIR%%/422.gif
18	%%DOCSDIR%%/444.gif
19	%%DOCSDIR%%/ChangeLog.txt
20	%%DOCSDIR%%/LGPL.txt	17	%%DOCSDIR%%/LGPL.txt
21	%%DOCSDIR%%/LICENSE-FLTK.txt	18	%%DOCSDIR%%/LICENSE-FLTK.txt
22	%%DOCSDIR%%/LICENSE.txt	19	%%DOCSDIR%%/LICENSE.txt
Lines 24-36 Link Here
24	%%DOCSDIR%%/index.html	21	%%DOCSDIR%%/index.html
25	%%DOCSDIR%%/somerights20.png	22	%%DOCSDIR%%/somerights20.png
26	%%DOCSDIR%%/sshtunnel.png	23	%%DOCSDIR%%/sshtunnel.png
		24	%%DOCSDIR%%/subsampling.gif
27	%%DOCSDIR%%/vgltransport.png	25	%%DOCSDIR%%/vgltransport.png
28	%%DOCSDIR%%/vgltransportservernetwork.png	26	%%DOCSDIR%%/vgltransportservernetwork.png
29	%%DOCSDIR%%/virtualgl.css	27	%%DOCSDIR%%/virtualgl.css
30	%%DOCSDIR%%/x11transport.png	28	%%DOCSDIR%%/x11transport.png
31	VirtualGL/fakelib/libGL.so
32	VirtualGL/include/rr.h	29	VirtualGL/include/rr.h
33	VirtualGL/include/rrtransport.h	30	VirtualGL/include/rrtransport.h
34	VirtualGL/lib/libdlfaker.so	31	VirtualGL/lib/libdlfaker.so
35	VirtualGL/lib/libgefaker.so	32	VirtualGL/lib/libgefaker.so
36	VirtualGL/lib/librrfaker.so	33	VirtualGL/lib/libvglfaker-nodl.so
		34	%%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so
		35	VirtualGL/lib/libvglfaker.so