aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-11-21 03:17:08 +0800
committerjbeich <jbeich@FreeBSD.org>2016-11-21 03:17:08 +0800
commit5db120087857bd66c025f747b25045e1cf17f6b7 (patch)
treea6e98e179ddd11935adce9a0a84b732b805f9bd8
parentff3a3346fd01561e180633441b4500545d2ccd08 (diff)
downloadfreebsd-ports-gnome-5db120087857bd66c025f747b25045e1cf17f6b7.tar.gz
freebsd-ports-gnome-5db120087857bd66c025f747b25045e1cf17f6b7.tar.zst
freebsd-ports-gnome-5db120087857bd66c025f747b25045e1cf17f6b7.zip
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
-rw-r--r--multimedia/mpeg4ip/Makefile2
-rw-r--r--multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp27
2 files changed, 28 insertions, 1 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 34b82a6ab852..089b482e3ec0 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -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
diff --git a/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp b/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp
new file mode 100644
index 000000000000..37216b836cd6
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-player_src_media__utils.cpp
@@ -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;
+ }