aboutsummaryrefslogtreecommitdiff
path: root/x11/virtualgl/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/virtualgl/files')
-rw-r--r--x11/virtualgl/files/patch-common__CMakeLists.txt11
-rw-r--r--x11/virtualgl/files/patch-server__CMakeLists.txt34
-rw-r--r--x11/virtualgl/files/patch-util__CMakeLists.txt8
-rw-r--r--x11/virtualgl/files/patch-util__rrsocket.cpp11
4 files changed, 64 insertions, 0 deletions
diff --git a/x11/virtualgl/files/patch-common__CMakeLists.txt b/x11/virtualgl/files/patch-common__CMakeLists.txt
new file mode 100644
index 000000000000..1f368152a571
--- /dev/null
+++ b/x11/virtualgl/files/patch-common__CMakeLists.txt
@@ -0,0 +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
+@@ -4,6 +4,8 @@
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
++ADD_DEFINITIONS(-fPIC)
++
+ add_library(rrframe STATIC rrframe.cpp)
+ target_link_libraries(rrframe rrutil ${TJPEG_LIBRARY})
+
diff --git a/x11/virtualgl/files/patch-server__CMakeLists.txt b/x11/virtualgl/files/patch-server__CMakeLists.txt
new file mode 100644
index 000000000000..85ee651f456a
--- /dev/null
+++ b/x11/virtualgl/files/patch-server__CMakeLists.txt
@@ -0,0 +1,34 @@
+--- ./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 @@
+ set_source_files_properties(faker-sym.cpp PROPERTIES
+ OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
+ set_target_properties(rrfaker 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")
+ endif()
+ target_link_libraries(rrfaker rrframe ${FBXFAKERLIB} rrsocket m
+ ${OPENGL_gl_LIBRARY} ${LIBDL})
+@@ -59,7 +59,7 @@
+ install(TARGETS dlfaker 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})
+
+@@ -119,8 +119,8 @@
+ add_library(GLdlfakerut SHARED libGLdlfakerut.c)
+
+ add_executable(fakerut fakerut.cpp)
+-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
+- ${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} pthread)
++target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
++ ${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} pthread)
+
+ add_library(vgltrans_test SHARED testplugin.cpp vgltransconn.cpp)
+ if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/x11/virtualgl/files/patch-util__CMakeLists.txt b/x11/virtualgl/files/patch-util__CMakeLists.txt
new file mode 100644
index 000000000000..0bf30764624f
--- /dev/null
+++ b/x11/virtualgl/files/patch-util__CMakeLists.txt
@@ -0,0 +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
+@@ -1,3 +1,5 @@
++ADD_DEFINITIONS(-fPIC)
++
+ add_library(rrutil STATIC rrlog.cpp genericQ.cpp bmp.c)
+ if(UNIX)
+ target_link_libraries(rrutil pthread)
diff --git a/x11/virtualgl/files/patch-util__rrsocket.cpp b/x11/virtualgl/files/patch-util__rrsocket.cpp
new file mode 100644
index 000000000000..d9e48f5bd605
--- /dev/null
+++ b/x11/virtualgl/files/patch-util__rrsocket.cpp
@@ -0,0 +1,11 @@
+--- ./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