Attachment 153784 Details for Bug 198277 – The patch

[patch] The patch

virtualgl_2.4.patch (text/plain), 8.94 KB, created by David Mackay on 2015-03-04 15:47:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Mackay

Created: 2015-03-04 15:47:15 UTC

Size: 8.94 KB

patch

obsolete

>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/Makefile virtualgl/Makefile
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/Makefile	2015-03-04 15:43:45.726068000 +0000
>+++ virtualgl/Makefile	2015-03-04 15:44:43.538572000 +0000
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	virtualgl
>-PORTVERSION=	2.3.3
>-PORTREVISION=	1
>+PORTVERSION=	2.4
>+PORTREVISION=	0
> CATEGORIES=	x11 graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> DISTNAME=	VirtualGL-${PORTVERSION}
>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/distinfo virtualgl/distinfo
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/distinfo	2014-09-10 18:45:34.638954721 +0100
>+++ virtualgl/distinfo	2015-03-04 15:24:55.736383000 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (VirtualGL-2.3.3.tar.gz) = 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45
>-SIZE (VirtualGL-2.3.3.tar.gz) = 2614988
>+SHA256 (VirtualGL-2.4.tar.gz) = 56c5169583eb18e9b5ccbaa5f17ebe6cd5365099d5ba5e431eecd7821a6ddefb
>+SIZE (VirtualGL-2.4.tar.gz) = 1109830
>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-common_CMakeLists.txt virtualgl/files/patch-common_CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-common_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ virtualgl/files/patch-common_CMakeLists.txt	2015-03-04 15:36:32.131767000 +0000
>@@ -0,0 +1,11 @@
>+--- common/CMakeLists.txt.orig	2015-03-04 15:35:22 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 -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-common__CMakeLists.txt virtualgl/files/patch-common__CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-common__CMakeLists.txt	2014-09-10 18:45:34.625954353 +0100
>+++ virtualgl/files/patch-common__CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ./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 -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-server_CMakeLists.txt virtualgl/files/patch-server_CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-server_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ virtualgl/files/patch-server_CMakeLists.txt	2015-03-04 15:36:32.157100000 +0000
>@@ -0,0 +1,11 @@
>+--- server/CMakeLists.txt.orig	2015-03-04 15:35:48 UTC
>++++ server/CMakeLists.txt
>+@@ -20,6 +20,8 @@ configure_file(fakerconfig.h.in fakercon
>+ 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)
>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-server__CMakeLists.txt virtualgl/files/patch-server__CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-server__CMakeLists.txt	2014-09-10 18:45:34.624956781 +0100
>+++ virtualgl/files/patch-server__CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,34 +0,0 @@
>---- ./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 -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util_CMakeLists.txt virtualgl/files/patch-util_CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ virtualgl/files/patch-util_CMakeLists.txt	2015-03-04 15:36:32.180440000 +0000
>@@ -0,0 +1,8 @@
>+--- util/CMakeLists.txt.orig	2015-03-04 15:36:01 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)
>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util_Socket.cpp virtualgl/files/patch-util_Socket.cpp
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util_Socket.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ virtualgl/files/patch-util_Socket.cpp	2015-03-04 15:36:32.205339000 +0000
>@@ -0,0 +1,11 @@
>+--- util/Socket.cpp.orig	2015-03-04 15:36:21 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 -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util__CMakeLists.txt virtualgl/files/patch-util__CMakeLists.txt
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util__CMakeLists.txt	2014-09-10 18:45:34.623953916 +0100
>+++ virtualgl/files/patch-util__CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,8 +0,0 @@
>---- ./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 -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util__rrsocket.cpp virtualgl/files/patch-util__rrsocket.cpp
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/files/patch-util__rrsocket.cpp	2014-09-10 18:45:34.624956781 +0100
>+++ virtualgl/files/patch-util__rrsocket.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -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
>diff -ruN /opt/sysadm/ports/freebsd/x11/virtualgl/pkg-plist virtualgl/pkg-plist
>--- /opt/sysadm/ports/freebsd/x11/virtualgl/pkg-plist	2014-12-09 01:58:19.835600117 +0000
>+++ virtualgl/pkg-plist	2015-03-04 15:40:00.855013000 +0000
>@@ -13,33 +13,25 @@
> VirtualGL/bin/vgllogin
> VirtualGL/bin/vglrun
> VirtualGL/bin/vglserver_config
>-%%DOCSDIR%%/411.gif
>-%%DOCSDIR%%/422.gif
>-%%DOCSDIR%%/444.gif
>-%%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
>-%%DOCSDIR%%/vgltransport.png
>-%%DOCSDIR%%/vgltransportservernetwork.png
>-%%DOCSDIR%%/virtualgl.css
>-%%DOCSDIR%%/x11transport.png
>+%%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
> 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

Actions: View | Diff

Attachments on bug 198277: 153784