This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has submitted this change and it was merged.
Change subject: ortp: Remove unused old ortp 0.16.5
......................................................................
ortp: Remove unused old ortp 0.16.5
A new version 0.25.0 was added around 3 years ago and has been used
since then, because osmocom stack requires at least 0.22.0.
This 0.16.5 version has been unused since then, so we can drop it.
Change-Id: Ica158e8ddabf5a8ce2a2254ca4fabdc35e7db668
---
D recipes-misc/ortp/files/0001-fix-unused-variables.patch
D recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
D recipes-misc/ortp/ortp_0.16.5.bb
3 files changed, 0 insertions(+), 97 deletions(-)
Approvals:
Pau Espin Pedrol: Verified
Harald Welte: Looks good to me, approved
diff --git a/recipes-misc/ortp/files/0001-fix-unused-variables.patch b/recipes-misc/ortp/files/0001-fix-unused-variables.patch
deleted file mode 100644
index a57eaff..0000000
--- a/recipes-misc/ortp/files/0001-fix-unused-variables.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From eb4f54377e2560a76a05f62a22c961edbce8f4c2 Mon Sep 17 00:00:00 2001
-From: Simon Morlat <simon.morlat at linphone.org>
-Date: Tue, 31 May 2011 10:52:49 +0200
-Subject: [PATCH] fix unused variables
-
----
- src/stun.c | 10 +++++-----
- src/tests/rtprecv.c | 6 +++++-
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/stun.c b/src/stun.c
-index ccac58f..e0d7c80 100644
---- a/src/stun.c
-+++ b/src/stun.c
-@@ -1993,7 +1993,6 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
-
- bool_t changePort=FALSE;
- bool_t changeIP=FALSE;
-- bool_t discard=FALSE;
-
- StunMessage req;
- char buf[STUN_MAX_MESSAGE_SIZE];
-@@ -2015,9 +2014,10 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
- case 4:
- changeIP=TRUE;
- break;
-- case 5:
-+ /* case 5:
- discard=TRUE;
- break;
-+ */
- default:
- ortp_error("stun: Test %i is unkown\n", testNum);
- return ; /* error */
-@@ -2162,7 +2162,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;
-@@ -2345,8 +2345,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/src/tests/rtprecv.c b/src/tests/rtprecv.c
-index 1861592..5eee649 100644
---- a/src/tests/rtprecv.c
-+++ b/src/tests/rtprecv.c
-@@ -163,8 +163,12 @@ int main(int argc, char*argv[])
- /* 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);
-- if (sound_fd>0)
-+ if (sound_fd>0){
- ret = write(sound_fd,buffer,err);
-+ if (ret==-1){
-+ fprintf(stderr,"write to sound card failed (%s)",strerror(errno));
-+ }
-+ }
- }
- }
- ts+=160;
---
-1.7.5.4
-
diff --git a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff b/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
deleted file mode 100644
index 94ddde0..0000000
--- a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ortp-0.16.5/src/stun.c
-===================================================================
---- ortp-0.16.5.orig/src/stun.c
-+++ ortp-0.16.5/src/stun.c
-@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in
- char* body;
- unsigned int size;
- ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
-- memset(msg, 0, sizeof(msg));
-+ memset(msg, 0, sizeof(*msg));
-
- if (sizeof(StunMsgHdr) > bufLen)
- {
diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb
deleted file mode 100644
index 919405f..0000000
--- a/recipes-misc/ortp/ortp_0.16.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require ortp.inc
-DEPENDS = "glib-2.0 openssl"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \
- file://compile-fixes-newer-gcc.diff"
-
-SRC_URI[md5sum] = "94546901d14b85f97342f4ecf39489b1"
-SRC_URI[sha256sum] = "3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835"
--
To view, visit https://gerrit.osmocom.org/5170
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica158e8ddabf5a8ce2a2254ca4fabdc35e7db668
Gerrit-PatchSet: 2
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>