cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 1.4.2

Browse Source 
joint work with dcoppa@ who fixed some cmake-beginners mistakes
  from the synergy devs
This commit is contained in:
jasper 2011-04-18 18:37:48 +00:00
parent b2b5112c77
commit 8c5012090e
12 changed files with 155 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/synergy/Makefile
View File

@ -1,37 +1,35 @@
# $OpenBSD: Makefile,v 1.12 2010/10/24 21:30:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2011/04/18 18:37:48 jasper Exp $
COMMENT= mouse and keyboard sharing utility
DISTNAME= synergy-1.3.1
REVISION= 4
CATEGORIES= net
DISTNAME= synergy-1.4.2-Source
PKGNAME= ${DISTNAME:S/-Source//}
CATEGORIES= net x11
HOMEPAGE= http://synergy2.sourceforge.net/
HOMEPAGE= http://synergy-foss.org/
MAINTAINER= Dimitry Andric <dim@openbsd.org>
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xinerama Xtst c m pthread \
pthread-stubs stdc++ xcb
WANTLIB += ICE SM X11 Xext Xinerama Xtst c m pthread stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synergy2/}
MASTER_SITES= http://synergy.googlecode.com/files/
CONFIGURE_STYLE= gnu
MODULES= devel/cmake
NO_REGRESS= Yes
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/synergy
@cd ${WRKDIST}/doc && tar cf - *.html *.css images | \
tar -C ${PREFIX}/share/doc/synergy -xpf -
@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/synergy
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/synergy
@${INSTALL_DATA} ${WRKBUILD}/examples/synergy.conf \
${PREFIX}/share/examples/synergy
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/synergy[cs] ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/synergy
${INSTALL_DATA} ${WRKBUILD}/doc/synergy.conf.exampl* \
${PREFIX}/share/examples/synergy/
${INSTALL_MAN} ${WRKBUILD}/doc/synergyc.man \
${PREFIX}/man/man1/synergyc.1
${INSTALL_MAN} ${WRKBUILD}/doc/synergys.man \
${PREFIX}/man/man1/synergys.1
.include <bsd.port.mk>

10
net/synergy/distinfo
View File

@ -1,5 +1,5 @@
MD5 (synergy-1.3.1.tar.gz) = puCda3HLIX8jBpmABgq/Jw==
RMD160 (synergy-1.3.1.tar.gz) = X118uPz7V6bI6ug/tTxwTLhcbBY=
SHA1 (synergy-1.3.1.tar.gz) = AxE+yKrf7K66jjabCD9PtbRPXGI=
SHA256 (synergy-1.3.1.tar.gz) = ShXiZFZJjdpfOqfWiKSJLgxQOUovAWhRNvvJVLrMlpE=
SIZE (synergy-1.3.1.tar.gz) = 793172
MD5 (synergy-1.4.2-Source.tar.gz) = zU4YogbUwybee3KCVjUNhw==
RMD160 (synergy-1.4.2-Source.tar.gz) = bcVHUMyTN7u3wEFDatrlG/aYi3k=
SHA1 (synergy-1.4.2-Source.tar.gz) = 0BsUelfMmtEih3gLGRM6CuAJUIM=
SHA256 (synergy-1.4.2-Source.tar.gz) = 6yd4M9t+AisGRYj2S3i/o2tVWueu4eXdTa+xwQe8FxY=
SIZE (synergy-1.4.2-Source.tar.gz) = 868390

21
net/synergy/patches/patch-build_toolchain_py Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-build_toolchain_py,v 1.1 2011/04/18 18:37:48 jasper Exp $
--- build/toolchain.py.orig Mon Apr 18 15:02:33 2011
+++ build/toolchain.py Mon Apr 18 15:03:21 2011
@@ -352,7 +352,7 @@ class InternalCommands:
def make_gui(self, targets):
if sys.platform == 'win32':
gui_make_cmd = self.w32_make_cmd
- elif sys.platform in ['linux2', 'sunos5', 'freebsd7']:
+ elif sys.platform in ['linux2', 'sunos5', 'freebsd7', 'openbsd4']:
gui_make_cmd = self.make_cmd
elif sys.platform == 'darwin':
gui_make_cmd = self.xcodebuild_cmd
@@ -794,7 +794,7 @@ class InternalCommands:
def get_generators(self):
if sys.platform == 'win32':
return self.win32_generators
- elif sys.platform in ['linux2', 'sunos5', 'freebsd7']:
+ elif sys.platform in ['linux2', 'sunos5', 'freebsd7', 'openbsd4']:
return self.unix_generators
elif sys.platform == 'darwin':
return self.darwin_generators

63
net/synergy/patches/patch-cmake_CMakeLists_config_txt Normal file
View File

@ -0,0 +1,63 @@
$OpenBSD: patch-cmake_CMakeLists_config_txt,v 1.1 2011/04/18 18:37:48 jasper Exp $
--- cmake/CMakeLists_config.txt.orig Sun Jan 23 06:53:37 2011
+++ cmake/CMakeLists_config.txt Mon Apr 18 14:45:20 2011
@@ -41,7 +41,7 @@ IF(UNIX)
CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
CHECK_INCLUDE_FILES(sys/select.h HAVE_SYS_SELECT_H)
- CHECK_INCLUDE_FILES(sys/socket.h HAVE_SYS_SOCKET_H)
+ CHECK_INCLUDE_FILES("sys/types.h;sys/socket.h" HAVE_SYS_SOCKET_H)
CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
CHECK_INCLUDE_FILES(sys/utsname.h HAVE_SYS_UTSNAME_H)
@@ -52,7 +52,6 @@ IF(UNIX)
CHECK_FUNCTION_EXISTS(gmtime_r HAVE_GMTIME_R)
CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
CHECK_FUNCTION_EXISTS(poll HAVE_POLL)
- CHECK_FUNCTION_EXISTS(sigwait HAVE_POSIX_SIGWAIT)
CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON)
@@ -88,13 +87,17 @@ IF(UNIX)
CHECK_TYPE_SIZE(short SIZEOF_SHORT)
# pthread is used on both Linux and Mac
- CHECK_LIBRARY_EXISTS("pthread" pthread_create "" HAVE_PTHREAD)
+ CHECK_LIBRARY_EXISTS("-pthread" pthread_create "" HAVE_PTHREAD)
IF(HAVE_PTHREAD)
- LIST(APPEND libs pthread)
+ LIST(APPEND libs "-pthread")
ELSE(HAVE_PTHREAD)
MESSAGE(FATAL_ERROR "Missing library: pthread")
ENDIF(HAVE_PTHREAD)
+ SET(CMAKE_REQUIRED_LIBRARIES "-pthread")
+ CHECK_FUNCTION_EXISTS(sigwait HAVE_POSIX_SIGWAIT)
+ SET(CMAKE_REQUIRED_LIBRARIES)
+
IF(APPLE)
# build mac os x universal
@@ -125,6 +128,7 @@ IF(UNIX)
ELSE(APPLE)
+ SET(CMAKE_REQUIRED_INCLUDES "${OPENBSD_X11BASE}/include")
SET(XKBlib "X11/XKBlib.h")
CHECK_INCLUDE_FILES("${XKBlib};X11/extensions/dpms.h" HAVE_X11_EXTENSIONS_DPMS_H)
CHECK_INCLUDE_FILES("X11/extensions/Xinerama.h" HAVE_X11_EXTENSIONS_XINERAMA_H)
@@ -142,10 +146,10 @@ IF(UNIX)
MESSAGE(FATAL_ERROR "Missing header: " ${XKBlib})
ENDIF(NOT HAVE_X11_XKBLIB_H)
- CHECK_LIBRARY_EXISTS("SM;ICE" IceConnectionNumber "" HAVE_ICE)
- CHECK_LIBRARY_EXISTS("X11;Xext" DPMSQueryExtension "" HAVE_Xext)
- CHECK_LIBRARY_EXISTS("X11;Xext;Xtst" XTestQueryExtension "" HAVE_Xtst)
- CHECK_LIBRARY_EXISTS("Xinerama" XineramaQueryExtension "" HAVE_Xinerama)
+ CHECK_LIBRARY_EXISTS("SM;ICE" IceConnectionNumber "${OPENBSD_X11BASE}/lib" HAVE_ICE)
+ CHECK_LIBRARY_EXISTS("X11;Xext" DPMSQueryExtension "${OPENBSD_X11BASE}/lib" HAVE_Xext)
+ CHECK_LIBRARY_EXISTS("X11;Xext;Xtst" XTestQueryExtension "${OPENBSD_X11BASE}/lib" HAVE_Xtst)
+ CHECK_LIBRARY_EXISTS("Xinerama" XineramaQueryExtension "${OPENBSD_X11BASE}/lib" HAVE_Xinerama)
IF(HAVE_ICE)

11
net/synergy/patches/patch-cmake_CMakeLists_lib_txt Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-cmake_CMakeLists_lib_txt,v 1.1 2011/04/18 18:37:48 jasper Exp $
--- cmake/CMakeLists_lib.txt.orig Sun Jan 23 06:53:37 2011
+++ cmake/CMakeLists_lib.txt Mon Apr 18 14:08:05 2011
@@ -405,6 +405,7 @@ SET(inc_lib_dirs
{$root_dir}/lib/platform
{$root_dir}/lib/server
{$root_dir}/lib/synergy
+ ${OPENBSD_X11BASE}/include
)
INCLUDE_DIRECTORIES(${inc_lib_dirs})

10
net/synergy/patches/patch-cmake_CMakeLists_synergyc_txt Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-cmake_CMakeLists_synergyc_txt,v 1.1 2011/04/18 18:37:48 jasper Exp $
--- cmake/CMakeLists_synergyc.txt.orig Mon Apr 18 14:19:49 2011
+++ cmake/CMakeLists_synergyc.txt Mon Apr 18 14:21:39 2011
@@ -80,5 +80,6 @@ SET(inc_dirs_cmd_synergyc
)
INCLUDE_DIRECTORIES(${inc_dirs_cmd_synergyc})
+LINK_DIRECTORIES(${OPENBSD_X11BASE}/lib)
ADD_EXECUTABLE(synergyc ${src_cmd_synergyc})
TARGET_LINK_LIBRARIES(synergyc synergy ${libs})

10
net/synergy/patches/patch-cmake_CMakeLists_synergys_txt Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-cmake_CMakeLists_synergys_txt,v 1.1 2011/04/18 18:37:48 jasper Exp $
--- cmake/CMakeLists_synergys.txt.orig Mon Apr 18 14:19:55 2011
+++ cmake/CMakeLists_synergys.txt Mon Apr 18 14:21:55 2011
@@ -80,5 +80,6 @@ SET(inc_dirs_cmd_synergys
)
INCLUDE_DIRECTORIES(${inc_dirs_cmd_synergys})
+LINK_DIRECTORIES(${OPENBSD_X11BASE}/lib)
ADD_EXECUTABLE(synergys ${src_cmd_synergys})
TARGET_LINK_LIBRARIES(synergys synergy ${libs})

10
net/synergy/patches/patch-lib_arch_CMultibyte_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib_arch_CMultibyte_cpp,v 1.2 2009/09/03 18:05:36 pvalchev Exp $
--- lib/arch/CMultibyte.cpp.orig Tue Nov 29 20:33:24 2005
+++ lib/arch/CMultibyte.cpp Wed Sep 2 14:18:01 2009
@@ -24,7 +24,7 @@
$OpenBSD: patch-lib_arch_CMultibyte_cpp,v 1.3 2011/04/18 18:37:48 jasper Exp $
--- lib/arch/CMultibyte.cpp.orig Sun Jan 23 06:53:37 2011
+++ lib/arch/CMultibyte.cpp Sun Apr 17 21:01:57 2011
@@ -28,7 +28,7 @@
#endif
#if HAVE_WCHAR_H || defined(_MSC_VER)
# include <wchar.h>
-#elif __APPLE__
+#elif __APPLE__ || __OpenBSD__
// wtf? Darwin puts mbtowc() et al. in stdlib
# include <stdlib.h>
# include <cstdlib>
#else

16
net/synergy/patches/patch-lib_common_common_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lib_common_common_h,v 1.1 2010/05/24 09:14:39 espie Exp $
--- lib/common/common.h.orig Mon May 24 11:10:29 2010
+++ lib/common/common.h Mon May 24 11:12:01 2010
@@ -128,7 +128,11 @@
// define NULL
#ifndef NULL
-#define NULL 0
+#if defined __GNUG__
+#define NULL __null
+#else
+#define NULL 0L
+#endif
#endif
// make assert available since we use it a lot

71
net/synergy/patches/patch-lib_platform_CXWindowsEventQueueBuffer_cpp
View File

@ -1,71 +0,0 @@
$OpenBSD: patch-lib_platform_CXWindowsEventQueueBuffer_cpp,v 1.2 2009/12/23 09:08:44 sturm Exp $
--- lib/platform/CXWindowsEventQueueBuffer.cpp.orig Sun Apr 24 05:02:16 2005
+++ lib/platform/CXWindowsEventQueueBuffer.cpp Mon Dec 21 22:26:21 2009
@@ -84,6 +84,8 @@ CXWindowsEventQueueBuffer::waitForEvent(double dtimeou
pfds[0].events = POLLIN;
int timeout = (dtimeout < 0.0) ? -1 :
static_cast<int>(1000.0 * dtimeout);
+ int remaining = timeout;
+ int retval = 0;
#else
struct timeval timeout;
struct timeval* timeoutPtr;
@@ -102,19 +104,43 @@ CXWindowsEventQueueBuffer::waitForEvent(double dtimeou
FD_ZERO(&rfds);
FD_SET(ConnectionNumber(m_display), &rfds);
#endif
+ // It's possible that the X server has queued events locally
+ // in xlib's event buffer and not pushed on to the fd. Hence we
+ // can't simply monitor the fd as we may never be woken up.
+ // ie addEvent calls flush, XFlush may not send via the fd hence
+ // there is an event waiting to be sent but we must exit the poll
+ // before it can.
+ // Instead we poll for a brief period of time (so if events
+ // queued locally in the xlib buffer can be processed)
+ // and continue doing this until timeout is reached.
+ // The human eye can notice 60hz (ansi) which is 16ms, however
+ // we want to give the cpu a chance s owe up this to 25ms
+#define TIMEOUT_DELAY 25
- // wait for message from X server or for timeout. also check
- // if the thread has been cancelled. poll() should return -1
- // with EINTR when the thread is cancelled.
+ if (timeout == -1) {
#if HAVE_POLL
- poll(pfds, 1, timeout);
+ poll(pfds, 1, timeout);
#else
- select(ConnectionNumber(m_display) + 1,
+ select(ConnectionNumber(m_display) + 1,
+ SELECT_TYPE_ARG234 &rfds,
+ SELECT_TYPE_ARG234 NULL,
+ SELECT_TYPE_ARG234 NULL,
+ SELECT_TYPE_ARG5 timeoutPtr);
+#endif
+ } else {
+ while( remaining > 0 && QLength(m_display)==0 && retval==0){
+#if HAVE_POLL
+ retval = poll(pfds, 1, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
+#else
+ retval = select(ConnectionNumber(m_display) + 1,
SELECT_TYPE_ARG234 &rfds,
SELECT_TYPE_ARG234 NULL,
SELECT_TYPE_ARG234 NULL,
- SELECT_TYPE_ARG5 timeoutPtr);
+ SELECT_TYPE_ARG5 TIMEOUT_DELAY);
#endif
+ remaining-=TIMEOUT_DELAY;
+ }
+ }
{
// we're no longer waiting for events
@@ -179,7 +205,7 @@ bool
CXWindowsEventQueueBuffer::isEmpty() const
{
CLock lock(&m_mutex);
- return (XPending(m_display) == 0);
+ return (QLength(m_display) == 0 );
}
CEventQueueTimer*

4
net/synergy/pkg/DESCR
View File

@ -1 +1,3 @@
Synergy lets you use one keyboard and mouse across multiple computers.
Synergy lets you easily share your mouse and keyboard between multiple
computers, where each computer has it's own display. No special hardware
is required, all you need is a local area network.

39
net/synergy/pkg/PLIST
View File

@ -1,31 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2007/09/21 05:46:26 bernd Exp $
bin/synergyc
bin/synergys
share/doc/synergy/
share/doc/synergy/about.html
share/doc/synergy/authors.html
share/doc/synergy/autostart.html
share/doc/synergy/banner.html
share/doc/synergy/border.html
share/doc/synergy/compiling.html
share/doc/synergy/configuration.html
share/doc/synergy/contact.html
share/doc/synergy/developer.html
share/doc/synergy/faq.html
share/doc/synergy/history.html
share/doc/synergy/home.html
share/doc/synergy/images/
share/doc/synergy/images/logo.gif
share/doc/synergy/images/warp.gif
share/doc/synergy/index.html
share/doc/synergy/license.html
share/doc/synergy/news.html
share/doc/synergy/roadmap.html
share/doc/synergy/running.html
share/doc/synergy/security.html
share/doc/synergy/synergy.css
share/doc/synergy/tips.html
share/doc/synergy/toc.html
share/doc/synergy/trouble.html
@comment $OpenBSD: PLIST,v 1.4 2011/04/18 18:37:48 jasper Exp $
@bin bin/synergyc
@bin bin/synergys
@man man/man1/synergyc.1
@man man/man1/synergys.1
share/examples/synergy/
share/examples/synergy/synergy.conf
share/examples/synergy/synergy.conf.example
@sample ${SYSCONFDIR}/synergy.conf
share/examples/synergy/synergy.conf.example-advanced
share/examples/synergy/synergy.conf.example-basic