Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27466847026cefe7226c2edfc8baaae962ceee94
commit 27466847026cefe7226c2edfc8baaae962ceee94 Author: James Buren <[email protected]> Date: Mon Sep 29 05:09:09 2014 -0500 nice-0.1.5-3-x86_64 * fix compile time errors on i686 diff --git a/source/xlib/nice/FrugalBuild b/source/xlib/nice/FrugalBuild index 435615f..4a2d0c0 100644 --- a/source/xlib/nice/FrugalBuild +++ b/source/xlib/nice/FrugalBuild @@ -7,14 +7,15 @@ options+=('asneeded') pkgname=nice _F_archive_name=libnice pkgver=0.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="Library for Interactive Connectivity Establishment." url="http://nice.freedesktop.org/wiki/"; depends=('gst1-plugins-base' 'glib2' 'libxml2') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://nice.freedesktop.org/releases/| Flasttar" -source=(http://nice.freedesktop.org/releases/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('dee2758da3a20c62eac4fd00577cbda3dc9413e7') +source=(http://nice.freedesktop.org/releases/$_F_archive_name-$pkgver.tar.gz fixes.patch) +sha1sums=('dee2758da3a20c62eac4fd00577cbda3dc9413e7' \ + '13a7fc28d7888262f3f70cbd8a6b8eab772c090f') # optimization OK diff --git a/source/xlib/nice/fixes.patch b/source/xlib/nice/fixes.patch new file mode 100644 index 0000000..e1bb4d2 --- /dev/null +++ b/source/xlib/nice/fixes.patch @@ -0,0 +1,34 @@ +diff -ur a/agent/pseudotcp.c b/agent/pseudotcp.c +--- a/agent/pseudotcp.c 2014-03-06 19:21:05.000000000 -0600 ++++ b/agent/pseudotcp.c 2014-09-29 05:06:19.834525655 -0500 +@@ -946,24 +946,24 @@ + return FALSE; + } + +- if (*timeout == 0 || *timeout < now) ++ if (*timeout == 0 || *timeout < ((long) now)) + *timeout = now + CLOSED_TIMEOUT; + + if (priv->state == TCP_CLOSED) { +- *timeout = min (*timeout, now + CLOSED_TIMEOUT); ++ *timeout = min (*timeout, ((long) now) + CLOSED_TIMEOUT); + return TRUE; + } + +- *timeout = min (*timeout, now + DEFAULT_TIMEOUT); ++ *timeout = min (*timeout, ((long) now) + DEFAULT_TIMEOUT); + + if (priv->t_ack) { +- *timeout = min(*timeout, priv->t_ack + priv->ack_delay); ++ *timeout = min(*timeout, (long) (priv->t_ack + priv->ack_delay)); + } + if (priv->rto_base) { +- *timeout = min(*timeout, priv->rto_base + priv->rx_rto); ++ *timeout = min(*timeout, (long) (priv->rto_base + priv->rx_rto)); + } + if (priv->snd_wnd == 0) { +- *timeout = min(*timeout, priv->lastsend + priv->rx_rto); ++ *timeout = min(*timeout, (long) (priv->lastsend + priv->rx_rto)); + } + + return TRUE; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
