Attachment 160603 Details for Bug 202804 – Fixed patch

[patch] Fixed patch

patch-virtualgl233-241-fix.diff (text/plain), 7.05 KB, created by Ultima on 2015-09-01 18:13:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ultima

Created: 2015-09-01 18:13:42 UTC

Size: 7.05 KB

patch

obsolete

>Index: virtualgl/Makefile
>===================================================================
>--- virtualgl/Makefile	(revision 395737)
>+++ virtualgl/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	virtualgl
>-PORTVERSION=	2.3.3
>-PORTREVISION=	1
>+PORTVERSION=	2.4.1
> CATEGORIES=	x11 graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> DISTNAME=	VirtualGL-${PORTVERSION}
>Index: virtualgl/distinfo
>===================================================================
>--- virtualgl/distinfo	(revision 395737)
>+++ virtualgl/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (VirtualGL-2.3.3.tar.gz) = 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45
>-SIZE (VirtualGL-2.3.3.tar.gz) = 2614988
>+SHA256 (VirtualGL-2.4.1.tar.gz) = 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e
>+SIZE (VirtualGL-2.4.1.tar.gz) = 1116018
>Index: virtualgl/files/patch-common__CMakeLists.txt
>===================================================================
>--- virtualgl/files/patch-common__CMakeLists.txt	(revision 395737)
>+++ virtualgl/files/patch-common__CMakeLists.txt	(working copy)
>@@ -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})
>  
>Index: virtualgl/files/patch-server__CMakeLists.txt
>===================================================================
>--- virtualgl/files/patch-server__CMakeLists.txt	(revision 395737)
>+++ virtualgl/files/patch-server__CMakeLists.txt	(working copy)
>@@ -1,34 +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 @@
>+--- 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(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 +99,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 +148,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")
>Index: virtualgl/files/patch-util__CMakeLists.txt
>===================================================================
>--- virtualgl/files/patch-util__CMakeLists.txt	(revision 395737)
>+++ virtualgl/files/patch-util__CMakeLists.txt	(working copy)
>@@ -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_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)
>Index: virtualgl/pkg-plist
>===================================================================
>--- virtualgl/pkg-plist	(revision 395737)
>+++ virtualgl/pkg-plist	(working copy)
>@@ -13,30 +13,21 @@
> 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
>@@ -43,3 +34,4 @@
> VirtualGL/lib/libdlfaker.so
> VirtualGL/lib/libgefaker.so
> VirtualGL/lib/librrfaker.so
>+libdata/ldconfig/virtualgl

Actions: View | Diff

Attachments on bug 202804: 160573 | 160603 | 160615 | 162006 | 162040 | 162132 | 162133 | 162134 | 162135 | 162136 | 162137