Attachment #160615 for bug #202804

Lines 2-9 Link Here

(-)virtualgl/Makefile (-2 / +1 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 1-2 Link Here

(-)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

(-)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




--- server/CMakeLists.txt.orig	2015-05-26 23:34:37 UTC
+++ server/CMakeLists.txt
@@ -73,9 +73,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 +99,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 +148,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")

Lines 1-8 Link Here

(-)virtualgl/files/patch-util__CMakeLists.txt (-4 / +4 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)

Line 0 Link Here

(-)virtualgl/files/patch-util__Socket.cpp (+11 lines)
	1	--- util/Socket.cpp.orig 2015-09-02 06:08:35 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-11 Link Here

(-)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




VirtualGL/bin/vgllogin
VirtualGL/bin/vglrun
VirtualGL/bin/vglserver_config
%%PORTDOCS%%%%DOCSDIR%%/411.gif
%%PORTDOCS%%%%DOCSDIR%%/422.gif
%%PORTDOCS%%%%DOCSDIR%%/444.gif
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
%%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%%/vgltransport.png
%%PORTDOCS%%%%DOCSDIR%%/vgltransportservernetwork.png
%%PORTDOCS%%%%DOCSDIR%%/virtualgl.css
%%PORTDOCS%%%%DOCSDIR%%/x11transport.png
%%DOCSDIR%%/exceed3.png
%%DOCSDIR%%/exceed6.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/somerights20.png
%%DOCSDIR%%/sshtunnel.png
%%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
libdata/ldconfig/virtualgl

Return to bug 202804

Lines 1-34 Link Here

(-)virtualgl/files/patch-server__CMakeLists.txt (-20 / +20 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	@@ -73,9 +73,9 @@ if(MAPFLAG)
4	set_source_files_properties(faker-sym.cpp PROPERTIES	4	set_source_files_properties(faker-sym.cpp PROPERTIES
5	OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)	5	OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
6	set_target_properties(rrfaker PROPERTIES	6	set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES
7	- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")	7	- LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
8	+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")	8	+ LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
9	else()	9	else()
10	- set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-z defs")	10	- set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
11	+ set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")	11	+ set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
12	endif()	12	endif()
13	target_link_libraries(rrfaker rrframe ${FBXFAKERLIB} rrsocket m	13	if(VGL_FAKEXCB)
14	${OPENGL_gl_LIBRARY} ${LIBDL})	14	set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb)
15	@@ -59,7 +59,7 @@	15	@@ -99,7 +99,7 @@ target_link_libraries(${VGL_DLFAKER_NAME
16	install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR})	16	install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR})
17		17
18	add_library(gefaker SHARED gefaker.c)	18	add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c)
19	-set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs")	19	-set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
20	+set_target_properties(gefaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")	20	+set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
21	target_link_libraries(gefaker ${LIBDL})	21	target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL})
22	install(TARGETS gefaker DESTINATION ${VGL_LIBDIR})	22	install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR})
23		23
24	@@ -119,8 +119,8 @@	24	@@ -148,8 +148,8 @@ target_link_libraries(dlfakerut ${X11_X1
25	add_library(GLdlfakerut SHARED libGLdlfakerut.c)	25	add_library(GLdlfakerut SHARED libGLdlfakerut.c)
26		26
27	add_executable(fakerut fakerut.cpp)	27	add_executable(fakerut fakerut.cpp fakerut-supplement.c)
28	-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"	28	-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
29	- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} pthread)	29	- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil)
30	+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"	30	+target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
31	+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} pthread)	31	+ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
32		32
33	add_library(vgltrans_test SHARED testplugin.cpp vgltransconn.cpp)	33	add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp)
34	if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")	34	if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 13-42 Link Here

(-)virtualgl/pkg-plist (-24 / +16 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	%%PORTDOCS%%%%DOCSDIR%%/411.gif
17	%%DOCSDIR%%/422.gif	17	%%PORTDOCS%%%%DOCSDIR%%/422.gif
18	%%DOCSDIR%%/444.gif	18	%%PORTDOCS%%%%DOCSDIR%%/444.gif
19	%%DOCSDIR%%/ChangeLog.txt	19	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
20	%%DOCSDIR%%/LGPL.txt	20	%%PORTDOCS%%%%DOCSDIR%%/LGPL.txt
21	%%DOCSDIR%%/LICENSE-FLTK.txt	21	%%PORTDOCS%%%%DOCSDIR%%/LICENSE-FLTK.txt
22	%%DOCSDIR%%/LICENSE-PuTTY.txt	22	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
23	%%DOCSDIR%%/LICENSE-xauth.txt	23	%%PORTDOCS%%%%DOCSDIR%%/configdialog.gif
24	%%DOCSDIR%%/LICENSE.txt	24	%%PORTDOCS%%%%DOCSDIR%%/index.html
25	%%DOCSDIR%%/chromium-displaywall.png	25	%%PORTDOCS%%%%DOCSDIR%%/somerights20.png
26	%%DOCSDIR%%/chromium-sortfirst.png	26	%%PORTDOCS%%%%DOCSDIR%%/sshtunnel.png
27	%%DOCSDIR%%/chromium-sortlast.png	27	%%PORTDOCS%%%%DOCSDIR%%/vgltransport.png
28	%%DOCSDIR%%/configdialog.gif	28	%%PORTDOCS%%%%DOCSDIR%%/vgltransportservernetwork.png
29	%%DOCSDIR%%/exceed1.png	29	%%PORTDOCS%%%%DOCSDIR%%/virtualgl.css
30	%%DOCSDIR%%/exceed2.png	30	%%PORTDOCS%%%%DOCSDIR%%/x11transport.png
31	%%DOCSDIR%%/exceed3.png
32	%%DOCSDIR%%/exceed6.png
33	%%DOCSDIR%%/index.html
34	%%DOCSDIR%%/somerights20.png
35	%%DOCSDIR%%/sshtunnel.png
36	%%DOCSDIR%%/vgltransport.png
37	%%DOCSDIR%%/vgltransportservernetwork.png
38	%%DOCSDIR%%/virtualgl.css
39	%%DOCSDIR%%/x11transport.png
40	VirtualGL/fakelib/libGL.so	31	VirtualGL/fakelib/libGL.so
41	VirtualGL/include/rr.h	32	VirtualGL/include/rr.h
42	VirtualGL/include/rrtransport.h	33	VirtualGL/include/rrtransport.h
Lines 43-45 Link Here
43	VirtualGL/lib/libdlfaker.so	34	VirtualGL/lib/libdlfaker.so
44	VirtualGL/lib/libgefaker.so	35	VirtualGL/lib/libgefaker.so
45	VirtualGL/lib/librrfaker.so	36	VirtualGL/lib/librrfaker.so
		37	libdata/ldconfig/virtualgl