diff options
author | Alex Alexander <wired@gentoo.org> | 2009-10-30 09:24:22 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2009-10-30 09:24:22 +0000 |
commit | 3fcf27f8d835dcfdc45a12db3bca940f3c22cc3a (patch) | |
tree | b3c42422bf0aba18207db80f9aaeb8a1fed37084 /x11-misc | |
parent | Version bump (#288578). Adds heimdal support (#185652, #231400). Drops Kerber... (diff) | |
download | historical-3fcf27f8d835dcfdc45a12db3bca940f3c22cc3a.tar.gz historical-3fcf27f8d835dcfdc45a12db3bca940f3c22cc3a.tar.bz2 historical-3fcf27f8d835dcfdc45a12db3bca940f3c22cc3a.zip |
added patch that reduces delays - bug 257794
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/synergy/ChangeLog | 8 | ||||
-rw-r--r-- | x11-misc/synergy/Manifest | 4 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.3.1-stuttered-delay-fix.patch | 58 | ||||
-rw-r--r-- | x11-misc/synergy/synergy-1.3.1-r1.ebuild | 61 |
4 files changed, 129 insertions, 2 deletions
diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog index e2f1717b1a84..cd216ce01c49 100644 --- a/x11-misc/synergy/ChangeLog +++ b/x11-misc/synergy/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/synergy # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.59 2009/10/23 20:47:16 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.60 2009/10/30 09:24:21 wired Exp $ + +*synergy-1.3.1-r1 (30 Oct 2009) + + 30 Oct 2009; Alex Alexander <wired@gentoo.org> +synergy-1.3.1-r1.ebuild, + +files/synergy-1.3.1-stuttered-delay-fix.patch: + added patch that reduces delays - bug 257794 23 Oct 2009; Jeremy Olexa <darkside@gentoo.org> synergy-1.3.1.ebuild: add --disable-debug because debugging exposes an assertion error in diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 16a665fe3eea..fbed2b409f9f 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,5 +1,7 @@ AUX synergy-1.3.1+gcc-4.3.patch 4463 RMD160 e7c4fb526ec0011a3a9b9974dc20956ccef03a22 SHA1 b3a179405bc5b98c2379e13c27a760b543f7a476 SHA256 0dfcdedce8de2cf1285a7af30652eba7234d95d769f762774975ea4d0f293375 +AUX synergy-1.3.1-stuttered-delay-fix.patch 2144 RMD160 0b375058a69d7f74e5f0da45e16b26bb114eb38f SHA1 b4be9b68a7caae1aa5476139e10566c380a80169 SHA256 4ffbbaea726e507e024d550459fb0ab25a9da70cb90245400e86d035bbd9a1b9 DIST synergy-1.3.1.tar.gz 793172 RMD160 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16 SHA1 03113ec8aadfecaeba8e369b083f4fb5b44f5c62 SHA256 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691 +EBUILD synergy-1.3.1-r1.ebuild 1505 RMD160 533a7aa6a13363bded155070b4ba915c369aba6b SHA1 23f23ee03045a759bf5431b2b4d7ac476220dc99 SHA256 01222850654e54021f2bf3d94a26bf384530de45c72a92661d8e636704d214f5 EBUILD synergy-1.3.1.ebuild 1427 RMD160 5fd8e2b3c2e4adbfa10a79d9a608f8a41fa6d777 SHA1 987920d242b123b19cca0c637f2bd6eb8e5ff2a7 SHA256 3c6f65e2d4284ce44add8f33d224d7a44c3cf6c4f7783f0a73004bb8346a36fe -MISC ChangeLog 7756 RMD160 05358148d50ffe3b9015bdfdd2141006020f0082 SHA1 d9cac57e0bc1b0b7e38bbd53e5383ffbd5127d2b SHA256 fac1c4e28e9d5b29b0d5b3723b0c6c2c4b73f818d277c2e3e1787c4e7e6aa172 +MISC ChangeLog 7959 RMD160 0c759d5a13d66b1249af176bd8b3234863640442 SHA1 cbc8221f5218fafce897b363f18935ee50fec163 SHA256 1bec30ef37cec04cee38bee992b9ff7e359392d2ce599f5f39d587072dd88bf4 MISC metadata.xml 270 RMD160 6aa4dff8f35775a40f4d04bfca8e1e24161e9585 SHA1 d38202d496f7bbe77326209191e346917562d9ab SHA256 f683d99386ed59553eff64672bda4e5ecc840de7f5cdf8aa4c117b1dd3b2235a diff --git a/x11-misc/synergy/files/synergy-1.3.1-stuttered-delay-fix.patch b/x11-misc/synergy/files/synergy-1.3.1-stuttered-delay-fix.patch new file mode 100644 index 000000000000..30d5abbe129e --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.3.1-stuttered-delay-fix.patch @@ -0,0 +1,58 @@ +--- synergy-1.3.1/lib/platform/CXWindowsEventQueueBuffer.cpp 2005-04-24 12:32:16.000000000 +0930 ++++ synergy-1.3.1/lib/platform/CXWindowsEventQueueBuffer.cpp 2008-10-02 11:14:18.112098206 +0930 +@@ -84,6 +73,8 @@ + 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 +93,31 @@ + 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. ++ while( remaining > 0 && QLength(m_display)==0 && retval==0){ + #if HAVE_POLL +- poll(pfds, 1, timeout); ++ retval = poll(pfds, 1, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu + #else +- select(ConnectionNumber(m_display) + 1, ++ 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 +184,7 @@ + CXWindowsEventQueueBuffer::isEmpty() const + { + CLock lock(&m_mutex); +- return (XPending(m_display) == 0); ++ return (QLength(m_display) == 0 ); + } + + CEventQueueTimer* diff --git a/x11-misc/synergy/synergy-1.3.1-r1.ebuild b/x11-misc/synergy/synergy-1.3.1-r1.ebuild new file mode 100644 index 000000000000..f0fa654b8db2 --- /dev/null +++ b/x11-misc/synergy/synergy-1.3.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.1-r1.ebuild,v 1.1 2009/10/30 09:24:21 wired Exp $ + +inherit eutils autotools + +DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers." +SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz" +HOMEPAGE="http://synergy2.sourceforge.net/" +LICENSE="GPL-2" +KEYWORDS="~arm ~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +IUSE="" + +RDEPEND="x11-libs/libXtst + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama" +DEPEND="${RDEPEND} + x11-proto/xextproto + x11-proto/xproto + x11-proto/kbproto + x11-proto/xineramaproto + x11-libs/libXt" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}+gcc-4.3.patch" + + # fix for #257794 + epatch "${FILESDIR}/${P}-stuttered-delay-fix.patch" + + # Remove -Werror usage. + sed -i -e '/ACX_CXX_WARNINGS_ARE_ERRORS/d' \ + configure.in || die "unable to sed out -Werror usage." + eautoreconf +} + +src_compile() { + # debug causes an assertion error in switchInDirection() + econf --sysconfdir=/etc \ + --disable-dependency-tracking \ + --disable-debug + emake || die +} + +src_install () { + make DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README + insinto /etc + doins "${S}"/examples/synergy.conf +} + +pkg_postinst() { + elog + elog "${PN} can also be used to connect to computers running Windows." + elog "Visit ${HOMEPAGE} to find the Windows client." + elog +} |