diff options
| author | markd <markd> | 2012-03-10 22:05:03 +0000 |
|---|---|---|
| committer | markd <markd> | 2012-03-10 22:05:03 +0000 |
| commit | 6e7a9a70e879f1039b5d56f0383dc19c2f33a506 (patch) | |
| tree | a5dbe229af4e99171eec825515809972d3b94fee /net/ortp | |
| parent | a6a6bee33ae43859ed108a073f71950c02a32817 (diff) | |
| download | pkgsrc-6e7a9a70e879f1039b5d56f0383dc19c2f33a506.tar.gz | |
Fix build with gcc 4.6
Diffstat (limited to 'net/ortp')
| -rw-r--r-- | net/ortp/patches/patch-src_stun.c | 42 | ||||
| -rw-r--r-- | net/ortp/patches/patch-src_tests_rtprecv.c | 18 |
2 files changed, 60 insertions, 0 deletions
diff --git a/net/ortp/patches/patch-src_stun.c b/net/ortp/patches/patch-src_stun.c new file mode 100644 index 00000000000..865888d6cce --- /dev/null +++ b/net/ortp/patches/patch-src_stun.c @@ -0,0 +1,42 @@ +$NetBSD: patch-src_stun.c,v 1.1 2012/03/10 22:07:25 markd Exp $ + +Fix build with gcc 4.6 + +--- src/stun.c.orig 2012-02-13 09:03:33.121945876 +0000 ++++ src/stun.c +@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4 + + bool_t changePort=FALSE; + bool_t changeIP=FALSE; +- bool_t discard=FALSE; + + StunMessage req; + char buf[STUN_MAX_MESSAGE_SIZE]; +@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4 + changeIP=TRUE; + break; + case 5: +- discard=TRUE; + break; + default: + ortp_error("stun: Test %i is unkown\n", testNum); +@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest, + + bool_t respTestI=FALSE; + bool_t isNat=TRUE; +- StunAddress4 testIchangedAddr; ++ /* StunAddress4 testIchangedAddr; */ + StunAddress4 testImappedAddr; + bool_t respTestI2=FALSE; + bool_t mappedIpSame = TRUE; +@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest, + if ( !respTestI ) + { + +- testIchangedAddr.addr = resp.changedAddress.ipv4.addr; +- testIchangedAddr.port = resp.changedAddress.ipv4.port; ++ /* testIchangedAddr.addr = resp.changedAddress.ipv4.addr; */ ++ /* testIchangedAddr.port = resp.changedAddress.ipv4.port; */ + testImappedAddr.addr = resp.mappedAddress.ipv4.addr; + testImappedAddr.port = resp.mappedAddress.ipv4.port; + diff --git a/net/ortp/patches/patch-src_tests_rtprecv.c b/net/ortp/patches/patch-src_tests_rtprecv.c new file mode 100644 index 00000000000..62d4a753aa3 --- /dev/null +++ b/net/ortp/patches/patch-src_tests_rtprecv.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_tests_rtprecv.c,v 1.1 2012/03/10 22:07:25 markd Exp $ + +Fix build with gcc 4.6 + +--- src/tests/rtprecv.c.orig 2012-02-13 09:13:43.992297823 +0000 ++++ src/tests/rtprecv.c +@@ -162,9 +162,9 @@ int main(int argc, char*argv[]) + if (err>0) stream_received=1; + /* this is to avoid to write to disk some silence before the first RTP packet is returned*/ + if ((stream_received) && (err>0)) { +- size_t ret = fwrite(buffer,1,err,outfile); ++ fwrite(buffer,1,err,outfile); + if (sound_fd>0) +- ret = write(sound_fd,buffer,err); ++ write(sound_fd,buffer,err); + } + } + ts+=160; |