mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

x11/virtualgl: 2.3.3 -> 2.4.1

Browse Source 
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)
This commit is contained in:
Kurt Jaeger 2015-10-19 19:27:44 +00:00
parent 278dd71cd6
commit ca08bd5987
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=399713
9 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/virtualgl/Makefile
View File

@ -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}
@ -12,8 +11,10 @@ MAINTAINER= davidjx8p@gmail.com
COMMENT= Redirects commands from an OpenGL app to another X server
LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \
libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo \
libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
# due to the libjpeg-turbo requirement
ONLY_FOR_ARCHS= amd64 i386
@ -21,11 +22,14 @@ ONLY_FOR_ARCHS= amd64 i386
CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
DOCSDIR= ${LOCALBASE}/VirtualGL/doc
USES= cmake
USE_GL= glu
USES= cmake compiler:c++11-lang
USE_GL= gl glu
USE_XORG= x11 xau xcb xdamage xdmcp xext xfixes xxf86vm
CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include -DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so
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
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>

4
x11/virtualgl/distinfo
View File

@ -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

10
x11/virtualgl/files/patch-common__CMakeLists.txt
View File

@ -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})

11
x11/virtualgl/files/patch-include_Socket.h Normal file
View File

@ -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

49
x11/virtualgl/files/patch-server__CMakeLists.txt
View File

@ -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")

11
x11/virtualgl/files/patch-util_Socket.cpp Normal file
View File

@ -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

10
x11/virtualgl/files/patch-util__CMakeLists.txt
View File

@ -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)

11
x11/virtualgl/files/patch-util__rrsocket.cpp
View File

@ -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

9
x11/virtualgl/pkg-plist
View File

@ -19,17 +19,8 @@ VirtualGL/bin/vglserver_config
%%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