diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-02-05 18:37:21 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-02-05 18:37:21 +0000 |
| commit | 8c9cfb4404f50abfc009e4fbd583f2f60a663b1c (patch) | |
| tree | 09ad227419caf8cd62a0240b6cdb52b14b58fd65 | |
| parent | 04e54311fd7e81fbb0eef3354c65d34183578d36 (diff) | |
| download | pkgsrc-8c9cfb4404f50abfc009e4fbd583f2f60a663b1c.tar.gz | |
libmp4v2: Use C++03, fix a couple of SunOS issues.
| -rw-r--r-- | multimedia/libmp4v2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/libmp4v2/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/libmp4v2/patches/patch-ae | 11 | ||||
| -rw-r--r-- | multimedia/libmp4v2/patches/patch-ah | 15 |
4 files changed, 27 insertions, 9 deletions
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile index f61f242921d..36acad94f6c 100644 --- a/multimedia/libmp4v2/Makefile +++ b/multimedia/libmp4v2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/12/30 11:12:01 he Exp $ +# $NetBSD: Makefile,v 1.21 2018/02/05 18:37:21 jperkin Exp $ DISTNAME= mpeg4ip-1.6.1 PKGNAME= libmp4v2-1.6.1 @@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mpeg4ip.sourceforge.net/ COMMENT= Library for reading and modifying mp4 files -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++03 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/multimedia/libmp4v2/distinfo b/multimedia/libmp4v2/distinfo index 926e2088b5a..ea37ad84479 100644 --- a/multimedia/libmp4v2/distinfo +++ b/multimedia/libmp4v2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2017/12/30 11:12:01 he Exp $ +$NetBSD: distinfo,v 1.20 2018/02/05 18:37:21 jperkin Exp $ SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38 RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7 @@ -8,10 +8,10 @@ SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 -SHA1 (patch-ae) = 232d380e2d65577f6e53dac0d52b167d80ccb067 +SHA1 (patch-ae) = ae22ab68419800bc3e90da8279645b3e50bc51f7 SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 -SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d +SHA1 (patch-ah) = 9892b635bd38f4dcabe83d9b2228777df021fda8 SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7 SHA1 (patch-ak) = 36da5d4d2824cc8b3ac62e10924058dd651cb2a7 diff --git a/multimedia/libmp4v2/patches/patch-ae b/multimedia/libmp4v2/patches/patch-ae index 85fec75be96..c8e29f3474f 100644 --- a/multimedia/libmp4v2/patches/patch-ae +++ b/multimedia/libmp4v2/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2017/04/17 08:40:56 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2018/02/05 18:37:21 jperkin Exp $ let <string.h> declare strcasestr() correctly Fix fpos_t cast on NetBSD (_pos vs. __pos) @@ -30,6 +30,15 @@ Fix fpos_t cast on NetBSD (_pos vs. __pos) #else #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)(fpos) #define VAR_TO_FPOS(fpos, var) (fpos) = (var) +@@ -194,7 +189,7 @@ typedef uint16_t in_port_t; + typedef unsigned int socklen_t; + #endif + +-#ifdef sun ++#ifdef __sun + #include <limits.h> + #define u_int8_t uint8_t + #define u_int16_t uint16_t @@ -233,7 +228,8 @@ char *strsep(char **strp, const char *de #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} diff --git a/multimedia/libmp4v2/patches/patch-ah b/multimedia/libmp4v2/patches/patch-ah index 1dfa9aea0e0..98a6cf41f27 100644 --- a/multimedia/libmp4v2/patches/patch-ah +++ b/multimedia/libmp4v2/patches/patch-ah @@ -1,10 +1,10 @@ -$NetBSD: patch-ah,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $ +$NetBSD: patch-ah,v 1.2 2018/02/05 18:37:21 jperkin Exp $ The MAX macro is not defined on all systems (e.g. solaris) ---- lib/rtp/rtp.c.orig 2006-03-20 18:08:24.000000000 -0500 +--- lib/rtp/rtp.c.orig 2007-01-22 17:31:08.000000000 +0000 +++ lib/rtp/rtp.c -@@ -61,6 +61,10 @@ +@@ -62,6 +62,10 @@ #include "rtp.h" @@ -15,3 +15,12 @@ The MAX macro is not defined on all systems (e.g. solaris) typedef struct { uint32_t key; /* Original allocation number */ uint32_t size; /* Size of allocation requested */ +@@ -2553,7 +2557,7 @@ int rtp_send_data_iov (struct rtp *sessi + /* Add the RTP packet header to the beginning of the iov list */ + my_iov = (struct iovec*)xmalloc(my_iov_count * sizeof(struct iovec)); + +- my_iov[0].iov_base = buffer + RTP_PACKET_HEADER_SIZE; ++ my_iov[0].iov_base = (void *)buffer + RTP_PACKET_HEADER_SIZE; + my_iov[0].iov_len = buffer_len; + + for (i = 1, payload_len = 0; i < my_iov_count; i++) { |