Attachment #162133 for bug #202804




# $FreeBSD$

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

COMMENT=	Redirects commands from an OpenGL app to another X server

LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
		libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo \
		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms

# due to the libjpeg-turbo requirement
ONLY_FOR_ARCHS=	amd64 i386

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

USES=		cmake compiler:c++11-lang
USE_GL=		gl glu
USE_XORG=	x11 xau xcb xdamage xdmcp xext xfixes xxf86vm
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
LDFLAGS+=	-L${LOCALBASE}/lib

.include <bsd.port.pre.mk>


Lines 1-2 Link Here

(-)x11/virtualgl/distinfo (-2 / +2 lines)
1	SHA256 (VirtualGL-2.3.3.tar.gz) = 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45	1	SHA256 (VirtualGL-2.4.1.tar.gz) = 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e
2	SIZE (VirtualGL-2.3.3.tar.gz) = 2614988	2	SIZE (VirtualGL-2.4.1.tar.gz) = 1116018

Lines 1-11 Link Here

(-)x11/virtualgl/files/patch-common__CMakeLists.txt (-5 / +5 lines)
1	--- ./common/CMakeLists.txt.orig 2011-12-23 19:15:16.000000000 +0000	1	--- common/CMakeLists.txt.orig 2014-02-11 02:55:11 UTC
2	+++ ./common/CMakeLists.txt 2014-08-10 17:43:04.000000000 +0100	2	+++ common/CMakeLists.txt
3	@@ -4,6 +4,8 @@	3	@@ -4,6 +4,8 @@
4		4
5	include_directories(${CMAKE_CURRENT_SOURCE_DIR})	5	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
6		6
7	+ADD_DEFINITIONS(-fPIC)	7	+ADD_DEFINITIONS(-fPIC)
8	+	8	+
9	add_library(rrframe STATIC rrframe.cpp)	9	add_library(vglcommon STATIC Frame.cpp Profiler.cpp)
10	target_link_libraries(rrframe rrutil ${TJPEG_LIBRARY})	10	target_link_libraries(vglcommon vglutil ${TJPEG_LIBRARY})
11		11

Line 0 Link Here

(-)x11/virtualgl/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

(-)x11/virtualgl/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

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

Lines 1-11 Link Here

(-)x11/virtualgl/files/patch-util__rrsocket.cpp (-11 lines)
1	--- ./util/rrsocket.cpp.orig 2011-12-22 18:27:13.000000000 +0000
2	+++ ./util/rrsocket.cpp 2014-08-10 17:43:04.000000000 +0100
3	@@ -120,7 +120,7 @@
4	#endif // USESSL
5
6
7	-rrsocket::rrsocket(bool dossl=false)
8	+rrsocket::rrsocket(bool dossl)
9	#ifdef USESSL
10	: _dossl(dossl)
11	#endif




%%DOCSDIR%%/ChangeLog.txt
%%DOCSDIR%%/LGPL.txt
%%DOCSDIR%%/LICENSE-FLTK.txt
%%DOCSDIR%%/LICENSE-PuTTY.txt
%%DOCSDIR%%/LICENSE-xauth.txt
%%DOCSDIR%%/LICENSE.txt
%%DOCSDIR%%/chromium-displaywall.png
%%DOCSDIR%%/chromium-sortfirst.png
%%DOCSDIR%%/chromium-sortlast.png
%%DOCSDIR%%/configdialog.gif
%%DOCSDIR%%/exceed1.png
%%DOCSDIR%%/exceed2.png
%%DOCSDIR%%/exceed3.png
%%DOCSDIR%%/exceed6.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/somerights20.png
%%DOCSDIR%%/sshtunnel.png

Return to bug 202804

Lines 2-9 Link Here

(-)x11/virtualgl/Makefile (-6 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualgl	4	PORTNAME= virtualgl
5	PORTVERSION= 2.3.3	5	PORTVERSION= 2.4.1
6	PORTREVISION= 1
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 12-19 Link Here
12	COMMENT= Redirects commands from an OpenGL app to another X server	11	COMMENT= Redirects commands from an OpenGL app to another X server
13		12
14	LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \	13	LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \
		14	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
15	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \	15	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
16	libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo	16	libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo \
		17	libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
17		18
18	# due to the libjpeg-turbo requirement	19	# due to the libjpeg-turbo requirement
19	ONLY_FOR_ARCHS= amd64 i386	20	ONLY_FOR_ARCHS= amd64 i386
Lines 21-31 Link Here
21	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL	22	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
22	DOCSDIR= ${LOCALBASE}/VirtualGL/doc	23	DOCSDIR= ${LOCALBASE}/VirtualGL/doc
23		24
24	USES= cmake	25	USES= cmake compiler:c++11-lang
25	USE_GL= glu	26	USE_GL= gl glu
26	USE_XORG= x11 xau xcb xdamage xdmcp xext xfixes xxf86vm	27	USE_XORG= x11 xau xcb xdamage xdmcp xext xfixes xxf86vm
27	CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include -DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so	28	CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\
		29	-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so\
		30	-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on -DVGL_SYSTEMGLX=on
28	USE_LDCONFIG= ${PREFIX}/VirtualGL/fakelib ${PREFIX}/VirtualGL/lib	31	USE_LDCONFIG= ${PREFIX}/VirtualGL/fakelib ${PREFIX}/VirtualGL/lib
		32	LDFLAGS+= -L${LOCALBASE}/lib
29		33
30	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
31		35

Lines 1-34 Link Here

(-)x11/virtualgl/files/patch-server__CMakeLists.txt (-20 / +29 lines)
1	--- ./server/CMakeLists.txt.orig 2013-09-27 06:10:02.000000000 +0100	1	--- server/CMakeLists.txt.orig 2015-05-26 23:34:37 UTC
2	+++ ./server/CMakeLists.txt 2014-08-10 17:43:04.000000000 +0100	2	+++ server/CMakeLists.txt
3	@@ -36,9 +36,9 @@	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)
4	set_source_files_properties(faker-sym.cpp PROPERTIES	13	set_source_files_properties(faker-sym.cpp PROPERTIES
5	OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)	14	OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
6	set_target_properties(rrfaker PROPERTIES	15	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES
7	- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")	16	- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
8	+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")	17	+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
9	else()	18	else()
10	- set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-z defs")	19	- set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
11	+ set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")	20	+ set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
12	endif()	21	endif()
13	target_link_libraries(rrfaker rrframe ${FBXFAKERLIB} rrsocket m	22	if(VGL_FAKEXCB)
14	${OPENGL_gl_LIBRARY} ${LIBDL})	23	set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb)
15	@@ -59,7 +59,7 @@	24	@@ -99,7 +101,7 @@ target_link_libraries(${VGL_DLFAKER_NAME
16	install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR})	25	install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR})
17		26
18	add_library(gefaker SHARED gefaker.c)	27	add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c)
19	-set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs")	28	-set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
20	+set_target_properties(gefaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")	29	+set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
21	target_link_libraries(gefaker ${LIBDL})	30	target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL})
22	install(TARGETS gefaker DESTINATION ${VGL_LIBDIR})	31	install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR})
23		32
24	@@ -119,8 +119,8 @@	33	@@ -148,8 +150,8 @@ target_link_libraries(dlfakerut ${X11_X1
25	add_library(GLdlfakerut SHARED libGLdlfakerut.c)	34	add_library(GLdlfakerut SHARED libGLdlfakerut.c)
26		35
27	add_executable(fakerut fakerut.cpp)	36	add_executable(fakerut fakerut.cpp fakerut-supplement.c)
28	-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"	37	-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
29	- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} pthread)	38	- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil)
30	+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"	39	+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
31	+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} pthread)	40	+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
32		41
33	add_library(vgltrans_test SHARED testplugin.cpp vgltransconn.cpp)	42	add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp)
34	if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")	43	if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 19-35 Link Here

(-)x11/virtualgl/pkg-plist (-9 lines)
19	%%DOCSDIR%%/ChangeLog.txt	19	%%DOCSDIR%%/ChangeLog.txt
20	%%DOCSDIR%%/LGPL.txt	20	%%DOCSDIR%%/LGPL.txt
21	%%DOCSDIR%%/LICENSE-FLTK.txt	21	%%DOCSDIR%%/LICENSE-FLTK.txt
22	%%DOCSDIR%%/LICENSE-PuTTY.txt
23	%%DOCSDIR%%/LICENSE-xauth.txt
24	%%DOCSDIR%%/LICENSE.txt	22	%%DOCSDIR%%/LICENSE.txt
25	%%DOCSDIR%%/chromium-displaywall.png
26	%%DOCSDIR%%/chromium-sortfirst.png
27	%%DOCSDIR%%/chromium-sortlast.png
28	%%DOCSDIR%%/configdialog.gif	23	%%DOCSDIR%%/configdialog.gif
29	%%DOCSDIR%%/exceed1.png
30	%%DOCSDIR%%/exceed2.png
31	%%DOCSDIR%%/exceed3.png
32	%%DOCSDIR%%/exceed6.png
33	%%DOCSDIR%%/index.html	24	%%DOCSDIR%%/index.html
34	%%DOCSDIR%%/somerights20.png	25	%%DOCSDIR%%/somerights20.png
35	%%DOCSDIR%%/sshtunnel.png	26	%%DOCSDIR%%/sshtunnel.png