diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-16 09:25:10 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-16 09:25:10 +0000 |
| commit | 17ed49bfc8276bf19ecda1c368dca215f944e3b3 (patch) | |
| tree | 6860f1e17a8bda30afb17c78d7846afbb3b8382e /multimedia | |
| parent | 1109b9dd234ea5ef3c26af092d4d1a93dd2ac8ad (diff) | |
| download | pkgsrc-17ed49bfc8276bf19ecda1c368dca215f944e3b3.tar.gz | |
Some -fpermissive fixes.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libmp4v2/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmp4v2/patches/patch-lib_utils_config__opts.cpp | 18 | ||||
| -rw-r--r-- | multimedia/libmp4v2/patches/patch-player_src_media__utils.cpp | 15 |
3 files changed, 36 insertions, 1 deletions
diff --git a/multimedia/libmp4v2/distinfo b/multimedia/libmp4v2/distinfo index 81757472434..ec37854dece 100644 --- a/multimedia/libmp4v2/distinfo +++ b/multimedia/libmp4v2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2017/05/06 18:12:00 maya Exp $ +$NetBSD: distinfo,v 1.16 2017/05/16 09:25:10 jperkin Exp $ SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38 RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7 @@ -40,6 +40,8 @@ SHA1 (patch-lib_mp4_udta.c) = af025f404668d1bc02861620b79d6a56fbe18295 SHA1 (patch-lib_mp4v2_atom__standard.cpp) = 27a2bac270ac4a1fd5169d89d312690a4dcb58ab SHA1 (patch-lib_mp4v2_mp4atom.cpp) = ad0a1006293d8bea250de695919d8cdc59a7a4fa SHA1 (patch-lib_rtp_net__udp.c) = 3250d0ebcc0899ec4521eb20bc83f6e8a8bce3c9 +SHA1 (patch-lib_utils_config__opts.cpp) = 15a385df3635b9441ceacf898031ce0a94d1cd0e SHA1 (patch-player_lib_audio_faad_config.c) = 6448e02ed9f95fc94bca986958ac61c0bf0ec752 SHA1 (patch-player_lib_audio_faad_huffdec.c) = 1106e902c3fe95cb76009613ae6641339580adac SHA1 (patch-player_lib_audio_faad_monopred.c) = 0833f17e10f91b69c63c896c15e98471c62f3025 +SHA1 (patch-player_src_media__utils.cpp) = d11bcfe9ade690e14686e1091b7f5c834068cd3c diff --git a/multimedia/libmp4v2/patches/patch-lib_utils_config__opts.cpp b/multimedia/libmp4v2/patches/patch-lib_utils_config__opts.cpp new file mode 100644 index 00000000000..3a1aeafab80 --- /dev/null +++ b/multimedia/libmp4v2/patches/patch-lib_utils_config__opts.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-lib_utils_config__opts.cpp,v 1.1 2017/05/16 09:25:10 jperkin Exp $ + +Handle SunOS getopt. + +--- lib/utils/config_opts.cpp.orig 2004-05-05 23:36:25.000000000 +0000 ++++ lib/utils/config_opts.cpp +@@ -22,7 +22,11 @@ struct option *create_long_opts_from_con + memset(long_options, 0, opts_size); + + for (ix = 0; ix < max_vars; ix++) { ++#ifdef __sun ++ long_options[ix].name = (char *)pConfig->GetNameFromIndex(ix); ++#else + long_options[ix].name = pConfig->GetNameFromIndex(ix); ++#endif + long_options[ix].has_arg = pConfig->GetTypeFromIndex(ix) == CONFIG_TYPE_BOOL ? 2 : 1; + long_options[ix].val = base_offset + ix; + } diff --git a/multimedia/libmp4v2/patches/patch-player_src_media__utils.cpp b/multimedia/libmp4v2/patches/patch-player_src_media__utils.cpp new file mode 100644 index 00000000000..1f74e772061 --- /dev/null +++ b/multimedia/libmp4v2/patches/patch-player_src_media__utils.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-player_src_media__utils.cpp,v 1.1 2017/05/16 09:25:10 jperkin Exp $ + +C++ strchr() reeturns const char *. + +--- player/src/media_utils.cpp.orig 2007-03-29 18:52:19.000000000 +0000 ++++ player/src/media_utils.cpp +@@ -610,7 +610,7 @@ static int create_media_for_iptv (CPlaye + session_desc_t *sdp; + + name += strlen("iptv://"); +- slash = strchr(name, '/'); ++ slash = (char *)strchr(name, '/'); + if (slash == NULL || slash == name) { + psptr->set_message("Invalid iptv content manager"); + return -1; |