CVS commit: pkgsrc/multimedia/libmp4v2

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Dec 19 10:08:14 UTC 2017

Modified Files:
        pkgsrc/multimedia/libmp4v2: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libmp4v2/patches: patch-lib_mp4v2_rtphint.cpp

Log Message:
libmp4v2: gcc7 build fix


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/libmp4v2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/libmp4v2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libmp4v2/patches/patch-lib_mp4v2_rtphint.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libmp4v2/Makefile
diff -u pkgsrc/multimedia/libmp4v2/Makefile:1.18 pkgsrc/multimedia/libmp4v2/Makefile:1.19
--- pkgsrc/multimedia/libmp4v2/Makefile:1.18    Mon Sep 25 22:30:06 2017
+++ pkgsrc/multimedia/libmp4v2/Makefile Tue Dec 19 10:08:14 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2017/09/25 22:30:06 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2017/12/19 10:08:14 markd Exp $
 
 DISTNAME=              mpeg4ip-1.6.1
 PKGNAME=               libmp4v2-1.6.1
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            multimedia
 # distfile at sf is corrupt
 #MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/}

Index: pkgsrc/multimedia/libmp4v2/distinfo
diff -u pkgsrc/multimedia/libmp4v2/distinfo:1.17 pkgsrc/multimedia/libmp4v2/distinfo:1.18
--- pkgsrc/multimedia/libmp4v2/distinfo:1.17    Mon Sep 25 22:30:06 2017
+++ pkgsrc/multimedia/libmp4v2/distinfo Tue Dec 19 10:08:14 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2017/09/25 22:30:06 joerg Exp $
+$NetBSD: distinfo,v 1.18 2017/12/19 10:08:14 markd Exp $
 
 SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38
 RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7
@@ -87,6 +87,7 @@ SHA1 (patch-lib_mp4_util.c) = b91ad65df6
 SHA1 (patch-lib_mp4_vmhd.c) = 79035ada521e970b460a6ffffc77ee8f7b62707f
 SHA1 (patch-lib_mp4v2_atom__standard.cpp) = 27a2bac270ac4a1fd5169d89d312690a4dcb58ab
 SHA1 (patch-lib_mp4v2_mp4atom.cpp) = ad0a1006293d8bea250de695919d8cdc59a7a4fa
+SHA1 (patch-lib_mp4v2_rtphint.cpp) = 670c658388b1b7b8e57e02971560ca18e89d48d0
 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

Added files:

Index: pkgsrc/multimedia/libmp4v2/patches/patch-lib_mp4v2_rtphint.cpp
diff -u /dev/null pkgsrc/multimedia/libmp4v2/patches/patch-lib_mp4v2_rtphint.cpp:1.1
--- /dev/null   Tue Dec 19 10:08:14 2017
+++ pkgsrc/multimedia/libmp4v2/patches/patch-lib_mp4v2_rtphint.cpp      Tue Dec 19 10:08:14 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_mp4v2_rtphint.cpp,v 1.1 2017/12/19 10:08:14 markd Exp $
+
+gcc7 fix
+
+--- lib/mp4v2/rtphint.cpp.orig 2007-04-30 20:29:28.000000000 +0000
++++ lib/mp4v2/rtphint.cpp
+@@ -342,7 +342,7 @@ void MP4RtpHintTrack::GetPayload(
+                         pSlash = strchr(pSlash, '/');
+                         if (pSlash != NULL) {
+                           pSlash++;
+-                          if (pSlash != '\0') {
++                          if (*pSlash != '\0') {
+                             length = strlen(pRtpMap) - (pSlash - pRtpMap);
+                             *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                             strncpy(*ppEncodingParams, pSlash, length);