svn commit: r426613 - in head/multimedia/mpeg4ip: . files

[Jan Beich]

Author: jbeich
Date: Sun Nov 20 19:17:08 2016
New Revision: 426613
URL: https://svnweb.freebsd.org/changeset/ports/426613

Log:
  multimedia/mpeg4ip: unbreak with libc++ 3.9
  
  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

Added:
  head/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp   (contents, props changed)
Modified:
  head/multimedia/mpeg4ip/Makefile   (contents, props changed)

Modified: head/multimedia/mpeg4ip/Makefile
==============================================================================
--- head/multimedia/mpeg4ip/Makefile	Sun Nov 20 19:07:28 2016	(r426612)
+++ head/multimedia/mpeg4ip/Makefile	Sun Nov 20 19:17:08 2016	(r426613)
@@ -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

Added: head/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp	Sun Nov 20 19:17:08 2016	(r426613)
@@ -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;
+   }