sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/mpeg4ip: unbreak with libc++ 3.9

Browse source 
media_utils.cpp:613:9: error: assigning to 'char *' from incompatible type 'const char *'
  slash = strchr(name, '/');
        ^ ~~~~~~~~~~~~~~~~~

PR:		214659
Reviewed by:	dim
Approved by:	portmgr blanket
This commit is contained in:
Jan Beich 2016-11-20 19:17:08 +00:00
parent 1f3bfd55ac
commit 7082de50b7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=426613
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/mpeg4ip/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
PORTREVISION= 34
PORTREVISION= 35
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136

27
multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp Normal file
View file

@ -0,0 +1,27 @@
--- player/src/media_utils.cpp.orig 2007-03-29 18:52:19 UTC
+++ player/src/media_utils.cpp
@@ -605,12 +605,12 @@ static int create_media_for_iptv (CPlaye
int have_audio_driver,
control_callback_vft_t *cc_vft)
{
- char *slash, *cm;
+ char *cm;
uint64_t prog;
session_desc_t *sdp;
name += strlen("iptv://");
- slash = strchr(name, '/');
+ const char *slash = strchr(name, '/');
if (slash == NULL || slash == name) {
psptr->set_message("Invalid iptv content manager");
return -1;
@@ -618,8 +618,7 @@ static int create_media_for_iptv (CPlaye
cm = (char *)malloc(slash - name + 1);
memcpy(cm, name, slash - name);
cm[slash - name] = '\0';
- slash++;
- if (sscanf(slash, U64, &prog) != 1) {
+ if (sscanf(slash + 1, U64, &prog) != 1) {
psptr->set_message("Invalid iptv program");
return -1;
}