Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Aug 2019 12:07:44 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510005 - in head/multimedia/mp4v2: . files
Message-ID:  <201908271207.x7RC7iwo094511@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Tue Aug 27 12:07:44 2019
New Revision: 510005
URL: https://svnweb.freebsd.org/changeset/ports/510005

Log:
  Update to upstream release 2.0.0
  
  Details:
  Update to what seems to be the latest generally accepted upstream
  release (judging by what major Linux distributions have been including
  in the recent past and what consumers of the lib are using.)
  
  PR:		212785
  Submitted by:	wulf (patch set for the port)
  Reported by:	rkoberman@gmail.com

Added:
  head/multimedia/mp4v2/files/patch-src-itmf-type.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-src-mp4.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-src-mp4file_io.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-src-mp4info.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-src-mp4util.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-src_mp4util.h   (contents, props changed)
  head/multimedia/mp4v2/files/patch-util-mp4chaps.cpp   (contents, props changed)
  head/multimedia/mp4v2/files/patch-util-mp4tags.cpp   (contents, props changed)
Deleted:
  head/multimedia/mp4v2/files/patch-GNUmakefile.in
  head/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h
  head/multimedia/mp4v2/files/patch-src__bmff__typebmff.cpp
  head/multimedia/mp4v2/files/patch-src__itmf__type.cpp
Modified:
  head/multimedia/mp4v2/Makefile
  head/multimedia/mp4v2/distinfo
  head/multimedia/mp4v2/files/patch-src_rtphint.cpp
  head/multimedia/mp4v2/pkg-plist

Modified: head/multimedia/mp4v2/Makefile
==============================================================================
--- head/multimedia/mp4v2/Makefile	Tue Aug 27 11:57:45 2019	(r510004)
+++ head/multimedia/mp4v2/Makefile	Tue Aug 27 12:07:44 2019	(r510005)
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	mp4v2
-PORTVERSION=	1.9.1
-PORTREVISION=	3
+PORTVERSION=	2.0.0
 CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/riggs/mp4v2
+MASTER_SITES=	GENTOO
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Library and tools to read, create, and modify mp4 files
 
 LICENSE=	MPL11
 
-CONFLICTS=	mpeg4ip-libmp4v2-[0-9.]*
 USES=		compiler:features gmake libtool tar:bzip2
+
 MAKEFILE=	GNUmakefile
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

Modified: head/multimedia/mp4v2/distinfo
==============================================================================
--- head/multimedia/mp4v2/distinfo	Tue Aug 27 11:57:45 2019	(r510004)
+++ head/multimedia/mp4v2/distinfo	Tue Aug 27 12:07:44 2019	(r510005)
@@ -1,2 +1,3 @@
-SHA256 (mp4v2-1.9.1.tar.bz2) = 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4
-SIZE (mp4v2-1.9.1.tar.bz2) = 432943
+TIMESTAMP = 1566907643
+SHA256 (mp4v2-2.0.0.tar.bz2) = 0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338
+SIZE (mp4v2-2.0.0.tar.bz2) = 495672

Added: head/multimedia/mp4v2/files/patch-src-itmf-type.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src-itmf-type.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,11 @@
+--- src/itmf/type.cpp.orig	2012-05-20 22:11:53 UTC
++++ src/itmf/type.cpp
+@@ -284,7 +284,7 @@ namespace {
+         { BT_BMP,  "\x42\x4d" },
+         { BT_GIF,  "GIF87a" },
+         { BT_GIF,  "GIF89a" },
+-        { BT_JPEG, "\xff\xd8\xff\xe0" },
++        { BT_JPEG, "\xff\xd8\xff" },
+         { BT_PNG,  "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a" },
+         { BT_UNDEFINED } // must be last
+     };

Added: head/multimedia/mp4v2/files/patch-src-mp4.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src-mp4.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,15 @@
+--- src/mp4.cpp.orig	2012-05-20 22:11:53 UTC
++++ src/mp4.cpp
+@@ -2402,8 +2402,11 @@ MP4FileHandle MP4ReadProvider( const cha
+         if (MP4_IS_VALID_FILE_HANDLE(hFile)) {
+             MP4File *pFile = (MP4File *)hFile;
+             try {
+-                return pFile->GetTrackIntegerProperty(trackId,
++                uint32_t bitrate =  pFile->GetTrackIntegerProperty(trackId,
+                                                       "mdia.minf.stbl.stsd.*.esds.decConfigDescr.avgBitrate");
++                if( bitrate != 0 ) {
++                    return bitrate;
++                }
+             }
+             catch( Exception* x ) {
+                 //mp4v2::impl::log.errorf(*x);  we don't really need to print this.

Added: head/multimedia/mp4v2/files/patch-src-mp4file_io.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src-mp4file_io.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,20 @@
+--- src/mp4file_io.cpp.orig	2012-05-20 22:11:53 UTC
++++ src/mp4file_io.cpp
+@@ -387,7 +387,7 @@ char* MP4File::ReadCountedString(uint8_t
+         charLength = ReadUInt8();
+     }
+     
+-    if (fixedLength && (charLength > fixedLength)) {
++    if (fixedLength && (charLength > fixedLength - 1)) {
+         /*
+          * The counted length of this string is greater than the
+          * maxiumum fixed length, so truncate the string to the
+@@ -397,7 +397,7 @@ char* MP4File::ReadCountedString(uint8_t
+          * a non counted string has been used in the place of a
+          * counted string).
+          */  
+-        WARNING(charLength > fixedLength);
++        WARNING(charLength > fixedLength - 1);
+         charLength = fixedLength - 1U;
+     }
+ 

Added: head/multimedia/mp4v2/files/patch-src-mp4info.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src-mp4info.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,29 @@
+--- src/mp4info.cpp.orig	2012-05-20 22:11:53 UTC
++++ src/mp4info.cpp
+@@ -109,7 +109,7 @@ static char* PrintAudioInfo(
+     const char* typeName = "Unknown";
+     bool foundType = false;
+     uint8_t type = 0;
+-    const char *media_data_name;
++    const char *media_data_name = NULL;
+ 
+     media_data_name = MP4GetTrackMediaDataName(mp4File, trackId);
+ 
+@@ -306,7 +306,7 @@ static char* PrintVideoInfo(
+     bool foundTypeName = false;
+     const char* typeName = "Unknown";
+ 
+-    const char *media_data_name;
++    const char *media_data_name = NULL;
+     char originalFormat[8];
+     char  oformatbuffer[32];
+     originalFormat[0] = 0;
+@@ -315,7 +315,7 @@ static char* PrintVideoInfo(
+ 
+     media_data_name = MP4GetTrackMediaDataName(mp4File, trackId);
+     // encv 264b
+-    if (strcasecmp(media_data_name, "encv") == 0) {
++    if (media_data_name != NULL && strcasecmp(media_data_name, "encv") == 0) {
+         if (MP4GetTrackMediaDataOriginalFormat(mp4File,
+                                                trackId,
+                                                originalFormat,

Added: head/multimedia/mp4v2/files/patch-src-mp4util.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src-mp4util.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,39 @@
+--- src/mp4util.cpp.orig	2012-05-20 22:11:53 UTC
++++ src/mp4util.cpp
+@@ -195,6 +195,9 @@ static bool convertBase64 (const char da
+     return true;
+ }
+ 
++}} // namespace mp4v2::impl
++
++extern "C"
+ uint8_t *Base64ToBinary (const char *pData, uint32_t decodeSize, uint32_t *pDataSize)
+ {
+     uint8_t *ret;
+@@ -208,7 +211,7 @@ uint8_t *Base64ToBinary (const char *pDa
+     }
+     size = (decodeSize * 3) / 4;
+     groups = decodeSize / 4;
+-    ret = (uint8_t *)MP4Calloc(size);
++    ret = (uint8_t *)mp4v2::impl::MP4Calloc(size);
+     if (ret == NULL) return NULL;
+     for (ix = 0; ix < groups; ix++) {
+         uint8_t value[4];
+@@ -220,7 +223,7 @@ uint8_t *Base64ToBinary (const char *pDa
+                 }
+                 size--;
+                 value[jx] = 0;
+-            } else if (convertBase64(pData[jx], &value[jx]) == false) {
++            } else if (mp4v2::impl::convertBase64(pData[jx], &value[jx]) == false) {
+                 free(ret);
+                 return NULL;
+             }
+@@ -234,6 +237,8 @@ uint8_t *Base64ToBinary (const char *pDa
+     return ret;
+ }
+ 
++namespace mp4v2 { namespace impl {
++
+ // log2 of value, rounded up
+ static uint8_t ilog2(uint64_t value)
+ {

Added: head/multimedia/mp4v2/files/patch-src_mp4util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-src_mp4util.h	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,11 @@
+--- src/mp4util.h.orig	2019-08-25 16:36:29 UTC
++++ src/mp4util.h
+@@ -33,7 +33,7 @@ namespace mp4v2 { namespace impl {
+ #ifndef ASSERT
+ #   define ASSERT(expr) \
+         if (!(expr)) { \
+-            throw new Exception("assert failure: "LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
++            throw new Exception("assert failure: " LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
+         }
+ #endif
+ 

Modified: head/multimedia/mp4v2/files/patch-src_rtphint.cpp
==============================================================================
--- head/multimedia/mp4v2/files/patch-src_rtphint.cpp	Tue Aug 27 11:57:45 2019	(r510004)
+++ head/multimedia/mp4v2/files/patch-src_rtphint.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -2,14 +2,14 @@ src/rtphint.cpp:348:32: error: comparison between poin
                     if (pSlash != '\0') {
                         ~~~~~~ ^  ~~~~
 
---- src/rtphint.cpp.orig	2009-07-13 23:07:12 UTC
+--- src/rtphint.cpp.orig	2012-05-20 22:11:53 UTC
 +++ src/rtphint.cpp
-@@ -345,7 +345,7 @@ void MP4RtpHintTrack::GetPayload(
+@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
                  pSlash = strchr(pSlash, '/');
                  if (pSlash != NULL) {
                      pSlash++;
 -                    if (pSlash != '\0') {
 +                    if (*pSlash != '\0') {
-                         length = strlen(pRtpMap) - (pSlash - pRtpMap);
+                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
                          *ppEncodingParams = (char *)MP4Calloc(length + 1);
                          strncpy(*ppEncodingParams, pSlash, length);

Added: head/multimedia/mp4v2/files/patch-util-mp4chaps.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-util-mp4chaps.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,10 @@
+--- util/mp4chaps.cpp.orig	2012-05-20 22:11:55 UTC
++++ util/mp4chaps.cpp
+@@ -856,6 +856,7 @@ ChapterUtility::readChapterFile( const s
+     if( in.read( inBuf, fileSize, nin ) )
+     {
+         in.close();
++        free(inBuf);
+         return herrf( "reading chapter file '%s' failed: %s\n", filename.c_str(), sys::getLastErrorStr() );
+     }
+     in.close();

Added: head/multimedia/mp4v2/files/patch-util-mp4tags.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mp4v2/files/patch-util-mp4tags.cpp	Tue Aug 27 12:07:44 2019	(r510005)
@@ -0,0 +1,10 @@
+--- util/mp4tags.cpp.orig	2012-05-20 22:11:55 UTC
++++ util/mp4tags.cpp
+@@ -539,6 +539,7 @@ extern "C" int
+                         else {
+                             fprintf( stderr, "Art file %s not found\n", tags[i] );
+                         }
++                        break;
+                     }
+                     case OPT_ALBUM_ARTIST:
+                         MP4TagsSetAlbumArtist( mdata, tags[i] );

Modified: head/multimedia/mp4v2/pkg-plist
==============================================================================
--- head/multimedia/mp4v2/pkg-plist	Tue Aug 27 11:57:45 2019	(r510004)
+++ head/multimedia/mp4v2/pkg-plist	Tue Aug 27 12:07:44 2019	(r510005)
@@ -7,7 +7,6 @@ bin/mp4subtitle
 bin/mp4tags
 bin/mp4track
 bin/mp4trackdump
-include/mp4v2/project.h
 include/mp4v2/chapter.h
 include/mp4v2/file.h
 include/mp4v2/file_prop.h
@@ -15,17 +14,17 @@ include/mp4v2/general.h
 include/mp4v2/isma.h
 include/mp4v2/itmf_generic.h
 include/mp4v2/itmf_tags.h
-include/mp4v2/meta.h
 include/mp4v2/mp4v2.h
 include/mp4v2/platform.h
+include/mp4v2/project.h
 include/mp4v2/sample.h
 include/mp4v2/streaming.h
 include/mp4v2/track.h
 include/mp4v2/track_prop.h
 lib/libmp4v2.a
 lib/libmp4v2.so
-lib/libmp4v2.so.1
-lib/libmp4v2.so.1.9.1
+lib/libmp4v2.so.2
+lib/libmp4v2.so.2.0.0
 man/man1/mp4art.1.gz
 man/man1/mp4file.1.gz
 man/man1/mp4subtitle.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908271207.x7RC7iwo094511>