diff options
7 files changed, 148 insertions, 1 deletions
diff --git a/multimedia/libnms/distinfo b/multimedia/libnms/distinfo index 131ca75f90a..4b8509e6bad 100644 --- a/multimedia/libnms/distinfo +++ b/multimedia/libnms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2011/01/02 12:23:32 obache Exp $ +$NetBSD: distinfo,v 1.3 2012/10/26 20:41:45 joerg Exp $ SHA1 (libnms-0.6.0.tar.bz2) = 914676b86c1eb15068a95984b197796693bbfe99 RMD160 (libnms-0.6.0.tar.bz2) = 4c5b82969d0e60be9c2fb686161c0ef619287bbd @@ -6,3 +6,9 @@ Size (libnms-0.6.0.tar.bz2) = 347203 bytes SHA1 (patch-aa) = bcb4f65cb547281b475eb21468e93f34ee806260 SHA1 (patch-ab) = b613b522f1b68d5f34549e337064c69bbd5f10bc SHA1 (patch-ac) = be1f5eb82de917259ea30c2652666dad81cedfd8 +SHA1 (patch-rtp_rtp__rm__pkt.c) = e8d68c213e3c36f4482bc18f09a62764ec64b008 +SHA1 (patch-rtp_rtp__transport__wrappers.c) = 04b44e9e2fd463793b130d56a4c6bcf0ae061593 +SHA1 (patch-rtp_rtpparsers_rtpparsers.c) = c32dd462fb570141db49b92a4c1a65311e083d17 +SHA1 (patch-rtsp_rtsp__get__rtp__queue.c) = 3c163d56d0b57b77c488c8495ac98f5097f4ad01 +SHA1 (patch-rtsp_rtsp__get__rtp__th.c) = adf456d6a7d824c1ca848884e589052e8c35b198 +SHA1 (patch-wsocket_nmst__is__active.c) = cecbc255935be886b7b9c8a0ff586954fc708f7a diff --git a/multimedia/libnms/patches/patch-rtp_rtp__rm__pkt.c b/multimedia/libnms/patches/patch-rtp_rtp__rm__pkt.c new file mode 100644 index 00000000000..94734bc41d2 --- /dev/null +++ b/multimedia/libnms/patches/patch-rtp_rtp__rm__pkt.c @@ -0,0 +1,13 @@ +$NetBSD: patch-rtp_rtp__rm__pkt.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- rtp/rtp_rm_pkt.c.orig 2012-10-26 16:07:08.000000000 +0000 ++++ rtp/rtp_rm_pkt.c +@@ -28,7 +28,7 @@ + + #include <nemesi/rtp.h> + +-inline int rtp_rm_pkt(rtp_ssrc * stm_src) ++int rtp_rm_pkt(rtp_ssrc * stm_src) + { + return bprmv(&(stm_src->rtp_sess->bp), &(stm_src->po), + stm_src->po.potail); diff --git a/multimedia/libnms/patches/patch-rtp_rtp__transport__wrappers.c b/multimedia/libnms/patches/patch-rtp_rtp__transport__wrappers.c new file mode 100644 index 00000000000..d0dbdaafce2 --- /dev/null +++ b/multimedia/libnms/patches/patch-rtp_rtp__transport__wrappers.c @@ -0,0 +1,76 @@ +$NetBSD: patch-rtp_rtp__transport__wrappers.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- rtp/rtp_transport_wrappers.c.orig 2012-10-26 16:04:56.000000000 +0000 ++++ rtp/rtp_transport_wrappers.c +@@ -34,7 +34,7 @@ inline char *rtp_get_spec(rtp_session * + return rtp_sess->transport.spec; + } + +-inline enum deliveries rtp_get_delivery(rtp_session * rtp_sess) ++enum deliveries rtp_get_delivery(rtp_session * rtp_sess) + { + return rtp_sess->transport.delivery; + } +@@ -63,22 +63,22 @@ inline nms_addr *rtp_get_dstaddr(rtp_ses + return &rtp_sess->transport.RTP.u.udp.dstaddr; + } + +-inline enum modes rtp_get_mode(rtp_session * rtp_sess) ++enum modes rtp_get_mode(rtp_session * rtp_sess) + { + return rtp_sess->transport.mode; + } + +-inline int rtp_get_layers(rtp_session * rtp_sess) ++int rtp_get_layers(rtp_session * rtp_sess) + { + return rtp_sess->transport.layers; + } + +-inline int rtp_get_append(rtp_session * rtp_sess) ++int rtp_get_append(rtp_session * rtp_sess) + { + return rtp_sess->transport.append; + } + +-inline int rtp_get_ttl(rtp_session * rtp_sess) ++int rtp_get_ttl(rtp_session * rtp_sess) + { + return rtp_sess->transport.ttl; + } +@@ -93,7 +93,7 @@ inline in_port_t rtp_get_mcsrtcpport(rtp + return rtp_sess->transport.RTCP.multicast_port; + } + +-inline int rtp_get_mcsports(rtp_session * rtp_sess, in_port_t ports[2]) ++int rtp_get_mcsports(rtp_session * rtp_sess, in_port_t ports[2]) + { + return rtp_transport_get(rtp_sess, RTP_TRANSPORT_MCSPORTS, ports, + sizeof(ports)); +@@ -125,7 +125,7 @@ inline in_port_t rtp_get_clirtcpport(rtp + return rtp_sess->transport.RTCP.local_port; + } + +-inline int rtp_get_cliports(rtp_session * rtp_sess, in_port_t ports[2]) ++int rtp_get_cliports(rtp_session * rtp_sess, in_port_t ports[2]) + { + return rtp_transport_get(rtp_sess, RTP_TRANSPORT_CLIPORTS, ports, + sizeof(ports)); +@@ -141,7 +141,7 @@ inline uint8 rtp_get_ilvdrtcp(rtp_sessio + return rtp_sess->transport.RTCP.u.tcp.ilvd; + } + +-inline int rtp_get_interleaved(rtp_session * rtp_sess, uint8 ilvds[2]) ++int rtp_get_interleaved(rtp_session * rtp_sess, uint8 ilvds[2]) + { + return rtp_transport_get(rtp_sess, RTP_TRANSPORT_INTERLEAVED, ilvds, + sizeof(ilvds)); +@@ -163,7 +163,7 @@ inline int rtp_get_streams(rtp_session * + sizeof(streams)); + } + +-inline uint32 rtp_get_ssrc(rtp_session * rtp_sess) ++uint32 rtp_get_ssrc(rtp_session * rtp_sess) + { + return rtp_sess->transport.ssrc; + } diff --git a/multimedia/libnms/patches/patch-rtp_rtpparsers_rtpparsers.c b/multimedia/libnms/patches/patch-rtp_rtpparsers_rtpparsers.c new file mode 100644 index 00000000000..6dfe5912b4f --- /dev/null +++ b/multimedia/libnms/patches/patch-rtp_rtpparsers_rtpparsers.c @@ -0,0 +1,13 @@ +$NetBSD: patch-rtp_rtpparsers_rtpparsers.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- rtp/rtpparsers/rtpparsers.c.orig 2012-10-26 16:08:03.000000000 +0000 ++++ rtp/rtpparsers/rtpparsers.c +@@ -131,7 +131,7 @@ void rtp_parsers_new(rtp_parser * new_pa + sizeof(rtp_parsers_inits)); + } + +-inline void rtp_parser_set_uninit(rtp_session * rtp_sess, unsigned pt, ++void rtp_parser_set_uninit(rtp_session * rtp_sess, unsigned pt, + rtp_parser_uninit parser_uninit) + { + rtp_sess->parsers_uninits[pt] = parser_uninit; diff --git a/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__queue.c b/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__queue.c new file mode 100644 index 00000000000..c0e71d87be4 --- /dev/null +++ b/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__queue.c @@ -0,0 +1,13 @@ +$NetBSD: patch-rtsp_rtsp__get__rtp__queue.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- rtsp/rtsp_get_rtp_queue.c.orig 2012-10-26 16:07:42.000000000 +0000 ++++ rtsp/rtsp_get_rtp_queue.c +@@ -28,7 +28,7 @@ + + #include <nemesi/rtsp.h> + +-inline rtp_session *rtsp_get_rtp_queue(rtsp_ctrl * rtsp_ctl) ++rtp_session *rtsp_get_rtp_queue(rtsp_ctrl * rtsp_ctl) + { + return ((rtsp_thread *) rtsp_ctl)->rtp_th->rtp_sess_head; + } diff --git a/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__th.c b/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__th.c new file mode 100644 index 00000000000..5bb9745b980 --- /dev/null +++ b/multimedia/libnms/patches/patch-rtsp_rtsp__get__rtp__th.c @@ -0,0 +1,13 @@ +$NetBSD: patch-rtsp_rtsp__get__rtp__th.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- rtsp/rtsp_get_rtp_th.c.orig 2012-10-26 16:07:36.000000000 +0000 ++++ rtsp/rtsp_get_rtp_th.c +@@ -28,7 +28,7 @@ + + #include <nemesi/rtsp.h> + +-inline rtp_thread *rtsp_get_rtp_th(rtsp_ctrl * rtsp_ctl) ++rtp_thread *rtsp_get_rtp_th(rtsp_ctrl * rtsp_ctl) + { + return ((rtsp_thread *) rtsp_ctl)->rtp_th; + } diff --git a/multimedia/libnms/patches/patch-wsocket_nmst__is__active.c b/multimedia/libnms/patches/patch-wsocket_nmst__is__active.c new file mode 100644 index 00000000000..0a0a694233e --- /dev/null +++ b/multimedia/libnms/patches/patch-wsocket_nmst__is__active.c @@ -0,0 +1,13 @@ +$NetBSD: patch-wsocket_nmst__is__active.c,v 1.1 2012/10/26 20:41:45 joerg Exp $ + +--- wsocket/nmst_is_active.c.orig 2012-10-26 16:08:24.000000000 +0000 ++++ wsocket/nmst_is_active.c +@@ -28,7 +28,7 @@ + + #include <nemesi/wsocket.h> + +-inline int nmst_is_active(nms_transport * transport) ++int nmst_is_active(nms_transport * transport) + { + return ((transport->type != SOCK_NONE) && (transport->fd >= 0)); + } |