Attachment 213437 Details for Bug 241660 – virtualgl-2.6.3 patch #2

[patch] virtualgl-2.6.3 patch #2

virtualgl-2.6.3.diff (text/plain), 9.93 KB, created by Dan Nelson on 2020-04-16 00:37:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nelson

Created: 2020-04-16 00:37:28 UTC

Size: 9.93 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 531752)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	virtualgl
>-PORTVERSION=	2.4.1
>-PORTREVISION=	7
>+PORTVERSION=	2.6.3
> CATEGORIES=	x11 graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> DISTNAME=	VirtualGL-${PORTVERSION}
>@@ -20,23 +19,29 @@
> CMAKE_INSTALL_PREFIX=	${LOCALBASE}/VirtualGL
> DOCSDIR=	${LOCALBASE}/VirtualGL/doc
> 
>-USES=		cmake:noninja compiler:c++11-lang gl xorg
>+USES=		cmake compiler:c++11-lang gl xorg
> USE_GL=		gl glu
>-USE_XORG=	x11 xcb xext
>-CMAKE_ARGS=	-DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\
>-		-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so\
>-		-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on -DVGL_SYSTEMGLX=on
>-USE_LDCONFIG=	${PREFIX}/VirtualGL/fakelib ${PREFIX}/VirtualGL/lib
>+USE_XORG=	x11 xcb xext xtst
>+CMAKE_ARGS=	-DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \
>+		-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \
>+		-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \
>+		-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
>+USE_LDCONFIG=	${PREFIX}/VirtualGL/lib
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=	OPENSSL XVIDEO
>+OPTIONS_DEFINE=	OPENCL OPENSSL XVIDEO
>+OPTIONS_DEFAULT=	OPENCL
>+OPTIONS_SUB=	yes
> 
>-OPENSSL_CMAKE_ON=	-DVGL_USESSL:BOOL=ON
>-OPENSSL_CMAKE_OFF=	-DVGL_USESSL:BOOL=OFF
>+OPENCL_CMAKE_BOOL=	VGL_FAKEOPENCL
>+OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
>+OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
>+OPENCL_DESC=		Build OpenCL interposer library
>+
>+OPENSSL_CMAKE_BOOL=	VGL_USESSL
> OPENSSL_USES=		ssl
> 
>-XVIDEO_CMAKE_ON=	-DVGL_USEXV:BOOL=ON
>-XVIDEO_CMAKE_OFF=	-DVGL_USEXV:BOOL=OFF
>+XVIDEO_CMAKE_BOOL=	VGL_USEXV
> XVIDEO_USE=	XORG=xv
> 
> .include <bsd.port.pre.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 531752)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (VirtualGL-2.4.1.tar.gz) = 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e
>-SIZE (VirtualGL-2.4.1.tar.gz) = 1116018
>+TIMESTAMP = 1586837136
>+SHA256 (VirtualGL-2.6.3.tar.gz) = 9be36c540c512068c8fc26a28722e604e0d2c305f7295229f1e1c8283193cb5e
>+SIZE (VirtualGL-2.6.3.tar.gz) = 1197037
>Index: files/patch-common__CMakeLists.txt
>===================================================================
>--- files/patch-common__CMakeLists.txt	(revision 531752)
>+++ files/patch-common__CMakeLists.txt	(nonexistent)
>@@ -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})
>- 
>
>Property changes on: files/patch-common__CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include_Socket.h
>===================================================================
>--- files/patch-include_Socket.h	(revision 531752)
>+++ files/patch-include_Socket.h	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-include_Socket.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-server__CMakeLists.txt
>===================================================================
>--- files/patch-server__CMakeLists.txt	(revision 531752)
>+++ files/patch-server__CMakeLists.txt	(nonexistent)
>@@ -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")
>
>Property changes on: files/patch-server__CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-server__fakerconfig.cpp
>===================================================================
>--- files/patch-server__fakerconfig.cpp	(nonexistent)
>+++ files/patch-server__fakerconfig.cpp	(working copy)
>@@ -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;
>
>Property changes on: files/patch-server__fakerconfig.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-util_Socket.cpp
>===================================================================
>--- files/patch-util_Socket.cpp	(revision 531752)
>+++ files/patch-util_Socket.cpp	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-util_Socket.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-util__CMakeLists.txt
>===================================================================
>--- files/patch-util__CMakeLists.txt	(revision 531752)
>+++ files/patch-util__CMakeLists.txt	(nonexistent)
>@@ -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)
>
>Property changes on: files/patch-util__CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 531752)
>+++ pkg-plist	(working copy)
>@@ -13,10 +13,7 @@
> VirtualGL/bin/vgllogin
> VirtualGL/bin/vglrun
> VirtualGL/bin/vglserver_config
>-%%DOCSDIR%%/411.gif
>-%%DOCSDIR%%/422.gif
>-%%DOCSDIR%%/444.gif
>-%%DOCSDIR%%/ChangeLog.txt
>+%%DOCSDIR%%/ChangeLog.md
> %%DOCSDIR%%/LGPL.txt
> %%DOCSDIR%%/LICENSE-FLTK.txt
> %%DOCSDIR%%/LICENSE.txt
>@@ -24,13 +21,15 @@
> %%DOCSDIR%%/index.html
> %%DOCSDIR%%/somerights20.png
> %%DOCSDIR%%/sshtunnel.png
>+%%DOCSDIR%%/subsampling.gif
> %%DOCSDIR%%/vgltransport.png
> %%DOCSDIR%%/vgltransportservernetwork.png
> %%DOCSDIR%%/virtualgl.css
> %%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
>+VirtualGL/lib/libvglfaker-nodl.so
>+%%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so
>+VirtualGL/lib/libvglfaker.so

Actions: View | Diff

Attachments on bug 241660: 208784 | 208800 | 213437