aboutsummaryrefslogtreecommitdiff
path: root/x11/virtualgl/files
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2015-10-19 19:27:44 +0000
committerKurt Jaeger <pi@FreeBSD.org>2015-10-19 19:27:44 +0000
commitca08bd5987f2232fa0c72764a1c3f31e906c8898 (patch)
treede01d429d19bee020510897f90739dff438a6e1a /x11/virtualgl/files
parent278dd71cd64bfa519c87a05c66250688bb147f5e (diff)
downloadports-ca08bd5987f2232fa0c72764a1c3f31e906c8898.tar.gz
ports-ca08bd5987f2232fa0c72764a1c3f31e906c8898.zip
x11/virtualgl: 2.3.3 -> 2.4.1
Changes: https://github.com/VirtualGL/virtualgl/blob/master/ChangeLog.txt PR: 202804 Submitted by: Ultima1252@gmail.com, matthew@reztek.cz Approved by: David Mackay <davidjx8p@gmail.com> (maintainer)
Notes
Notes: svn path=/head/; revision=399713
Diffstat (limited to 'x11/virtualgl/files')
-rw-r--r--x11/virtualgl/files/patch-common__CMakeLists.txt10
-rw-r--r--x11/virtualgl/files/patch-include_Socket.h11
-rw-r--r--x11/virtualgl/files/patch-server__CMakeLists.txt49
-rw-r--r--x11/virtualgl/files/patch-util_Socket.cpp11
-rw-r--r--x11/virtualgl/files/patch-util__CMakeLists.txt10
-rw-r--r--x11/virtualgl/files/patch-util__rrsocket.cpp11
6 files changed, 61 insertions, 41 deletions
diff --git a/x11/virtualgl/files/patch-common__CMakeLists.txt b/x11/virtualgl/files/patch-common__CMakeLists.txt
index 1f368152a571..204b63a05fa4 100644
--- a/x11/virtualgl/files/patch-common__CMakeLists.txt
+++ b/x11/virtualgl/files/patch-common__CMakeLists.txt
@@ -1,11 +1,11 @@
---- ./common/CMakeLists.txt.orig 2011-12-23 19:15:16.000000000 +0000
-+++ ./common/CMakeLists.txt 2014-08-10 17:43:04.000000000 +0100
+--- 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_DEFINITIONS(-fPIC)
+
- add_library(rrframe STATIC rrframe.cpp)
- target_link_libraries(rrframe rrutil ${TJPEG_LIBRARY})
+ 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
new file mode 100644
index 000000000000..a17518d52343
--- /dev/null
+++ b/x11/virtualgl/files/patch-include_Socket.h
@@ -0,0 +1,11 @@
+--- 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
index 85ee651f456a..8b4c53f994e3 100644
--- a/x11/virtualgl/files/patch-server__CMakeLists.txt
+++ b/x11/virtualgl/files/patch-server__CMakeLists.txt
@@ -1,34 +1,43 @@
---- ./server/CMakeLists.txt.orig 2013-09-27 06:10:02.000000000 +0100
-+++ ./server/CMakeLists.txt 2014-08-10 17:43:04.000000000 +0100
-@@ -36,9 +36,9 @@
+--- 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(rrfaker PROPERTIES
+ 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(rrfaker PROPERTIES LINK_FLAGS "-z defs")
-+ set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")
+- set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs")
++ set_target_properties(${VGL_RRFAKER_NAME} PROPERTIES LINK_FLAGS "-Wl,-z,defs")
endif()
- target_link_libraries(rrfaker rrframe ${FBXFAKERLIB} rrsocket m
- ${OPENGL_gl_LIBRARY} ${LIBDL})
-@@ -59,7 +59,7 @@
- install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR})
+ 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(gefaker SHARED gefaker.c)
--set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs")
-+set_target_properties(gefaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")
- target_link_libraries(gefaker ${LIBDL})
- install(TARGETS gefaker 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})
-@@ -119,8 +119,8 @@
+@@ -148,8 +150,8 @@ target_link_libraries(dlfakerut ${X11_X1
add_library(GLdlfakerut SHARED libGLdlfakerut.c)
- add_executable(fakerut fakerut.cpp)
+ 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} pthread)
+- ${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} pthread)
++ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
- add_library(vgltrans_test SHARED testplugin.cpp vgltransconn.cpp)
+ 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-util_Socket.cpp b/x11/virtualgl/files/patch-util_Socket.cpp
new file mode 100644
index 000000000000..0d37186acbed
--- /dev/null
+++ b/x11/virtualgl/files/patch-util_Socket.cpp
@@ -0,0 +1,11 @@
+--- 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
index 0bf30764624f..9f1f49838bb4 100644
--- a/x11/virtualgl/files/patch-util__CMakeLists.txt
+++ b/x11/virtualgl/files/patch-util__CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./util/CMakeLists.txt.orig 2014-08-10 17:44:08.000000000 +0100
-+++ ./util/CMakeLists.txt 2014-08-10 17:44:16.000000000 +0100
+--- util/CMakeLists.txt.orig 2014-11-01 06:04:28 UTC
++++ util/CMakeLists.txt
@@ -1,3 +1,5 @@
-+ADD_DEFINITIONS(-fPIC)
++ADD_DEFINITIONS(-fPIC)
+
- add_library(rrutil STATIC rrlog.cpp genericQ.cpp bmp.c)
+ add_library(vglutil STATIC GenericQ.cpp Log.cpp Mutex.cpp Thread.cpp bmp.c)
if(UNIX)
- target_link_libraries(rrutil pthread)
+ target_link_libraries(vglutil pthread)
diff --git a/x11/virtualgl/files/patch-util__rrsocket.cpp b/x11/virtualgl/files/patch-util__rrsocket.cpp
deleted file mode 100644
index d9e48f5bd605..000000000000
--- a/x11/virtualgl/files/patch-util__rrsocket.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./util/rrsocket.cpp.orig 2011-12-22 18:27:13.000000000 +0000
-+++ ./util/rrsocket.cpp 2014-08-10 17:43:04.000000000 +0100
-@@ -120,7 +120,7 @@
- #endif // USESSL
-
-
--rrsocket::rrsocket(bool dossl=false)
-+rrsocket::rrsocket(bool dossl)
- #ifdef USESSL
- : _dossl(dossl)
- #endif