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)

6 files changed, 11 insertions, 84 deletions

diff --git a/x11/virtualgl/files/patch-common__CMakeLists.txt b/x11/virtualgl/files/patch-common__CMakeLists.txt
deleted file mode 100644
index 204b63a05fa4..000000000000
--- a/x11/virtualgl/files/patch-common__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/CMakeLists.txt.orig	2014-02-11 02:55:11 UTC
-+++ common/CMakeLists.txt
-@@ -4,6 +4,8 @@
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- 
-+ADD_DEFINITIONS(-fPIC)
-+
- add_library(vglcommon STATIC Frame.cpp Profiler.cpp)
- target_link_libraries(vglcommon vglutil ${TJPEG_LIBRARY})
- 
diff --git a/x11/virtualgl/files/patch-include_Socket.h b/x11/virtualgl/files/patch-include_Socket.h
deleted file mode 100644
index a17518d52343..000000000000
--- a/x11/virtualgl/files/patch-include_Socket.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Socket.h.orig	2014-07-17 11:36:01 UTC
-+++ include/Socket.h
-@@ -138,7 +138,7 @@ namespace vglutil
- 	{
- 		public:
- 
--			Socket(bool doSSL);
-+			Socket(bool doSSL=false);
- 			#ifdef USESSL
- 			Socket(SOCKET sd, SSL *ssl);
- 			#else
diff --git a/x11/virtualgl/files/patch-server__CMakeLists.txt b/x11/virtualgl/files/patch-server__CMakeLists.txt
deleted file mode 100644
index 8b4c53f994e3..000000000000
--- a/x11/virtualgl/files/patch-server__CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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")
diff --git a/x11/virtualgl/files/patch-server__fakerconfig.cpp b/x11/virtualgl/files/patch-server__fakerconfig.cpp
new file mode 100644
index 000000000000..4750fd638397
--- /dev/null
+++ b/x11/virtualgl/files/patch-server__fakerconfig.cpp
@@ -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;
diff --git a/x11/virtualgl/files/patch-util_Socket.cpp b/x11/virtualgl/files/patch-util_Socket.cpp
deleted file mode 100644
index 0d37186acbed..000000000000
--- a/x11/virtualgl/files/patch-util_Socket.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/Socket.cpp.orig	2014-07-17 11:36:01 UTC
-+++ util/Socket.cpp
-@@ -125,7 +125,7 @@ static X509 *newCert(EVP_PKEY *priv)
- #endif // USESSL
- 
- 
--Socket::Socket(bool doSSL_=false)
-+Socket::Socket(bool doSSL_)
- 	#ifdef USESSL
- 	: doSSL(doSSL_)
- 	#endif
diff --git a/x11/virtualgl/files/patch-util__CMakeLists.txt b/x11/virtualgl/files/patch-util__CMakeLists.txt
deleted file mode 100644
index 9f1f49838bb4..000000000000
--- a/x11/virtualgl/files/patch-util__CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- util/CMakeLists.txt.orig	2014-11-01 06:04:28 UTC
-+++ util/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+ADD_DEFINITIONS(-fPIC)
-+
- add_library(vglutil STATIC GenericQ.cpp Log.cpp Mutex.cpp Thread.cpp bmp.c)
- if(UNIX)
- 	target_link_libraries(vglutil pthread)