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

16 files changed, 157 insertions, 150 deletions

diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index 5c2a25ccafdc..5e3ab7755efe 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -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
diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo
index 1cae261c8821..4ecbbb829c0c 100644
--- a/multimedia/mp4v2/distinfo
+++ b/multimedia/mp4v2/distinfo
@@ -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
diff --git a/multimedia/mp4v2/files/patch-GNUmakefile.in b/multimedia/mp4v2/files/patch-GNUmakefile.in
deleted file mode 100644
index f8bef790c0c1..000000000000
--- a/multimedia/mp4v2/files/patch-GNUmakefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./GNUmakefile.in.orig	2010-07-12 21:25:25.000000000 +0100
-+++ ./GNUmakefile.in	2010-07-12 21:26:04.000000000 +0100
-@@ -443,7 +443,7 @@
- lib_LTLIBRARIES = libmp4v2.la
- 
- ###############################################################################
--libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
-+libmp4v2_la_LDFLAGS = -version-info 10:1:9
- libmp4v2_la_SOURCES = src/3gp.cpp src/atom_ac3.cpp src/atom_amr.cpp \
- 	src/atom_avc1.cpp src/atom_avcC.cpp src/atom_chpl.cpp \
- 	src/atom_colr.cpp src/atom_d263.cpp src/atom_dac3.cpp \
diff --git a/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h b/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h
deleted file mode 100644
index a29fd4a97774..000000000000
--- a/multimedia/mp4v2/files/patch-include__mp4v2__itmf_tags.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/mp4v2/itmf_tags.h.orig	2010-07-14 16:35:27.000000000 +0100
-+++ ./include/mp4v2/itmf_tags.h	2010-07-14 16:35:35.000000000 +0100
-@@ -122,7 +122,7 @@
-  *  @return structure with all tags missing.
-  */
- MP4V2_EXPORT
--const MP4Tags* MP4TagsAlloc();
-+const MP4Tags* MP4TagsAlloc(void);
- 
- /** Fetch data from mp4 file and populate structure.
-  *
diff --git a/multimedia/mp4v2/files/patch-src-itmf-type.cpp b/multimedia/mp4v2/files/patch-src-itmf-type.cpp
new file mode 100644
index 000000000000..25c240c00728
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src-itmf-type.cpp
@@ -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
+     };
diff --git a/multimedia/mp4v2/files/patch-src-mp4.cpp b/multimedia/mp4v2/files/patch-src-mp4.cpp
new file mode 100644
index 000000000000..676c227e13eb
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src-mp4.cpp
@@ -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.
diff --git a/multimedia/mp4v2/files/patch-src-mp4file_io.cpp b/multimedia/mp4v2/files/patch-src-mp4file_io.cpp
new file mode 100644
index 000000000000..59698e927357
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src-mp4file_io.cpp
@@ -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;
+     }
+ 
diff --git a/multimedia/mp4v2/files/patch-src-mp4info.cpp b/multimedia/mp4v2/files/patch-src-mp4info.cpp
new file mode 100644
index 000000000000..96dfc8391b85
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src-mp4info.cpp
@@ -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,
diff --git a/multimedia/mp4v2/files/patch-src-mp4util.cpp b/multimedia/mp4v2/files/patch-src-mp4util.cpp
new file mode 100644
index 000000000000..aee3b7b26ed0
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src-mp4util.cpp
@@ -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)
+ {
diff --git a/multimedia/mp4v2/files/patch-src__bmff__typebmff.cpp b/multimedia/mp4v2/files/patch-src__bmff__typebmff.cpp
deleted file mode 100644
index 7c04291bc4a3..000000000000
--- a/multimedia/mp4v2/files/patch-src__bmff__typebmff.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./src/bmff/typebmff.cpp.orig	2009-07-14 03:07:10.000000000 +0400
-+++ ./src/bmff/typebmff.cpp	2012-01-15 22:14:12.057757646 +0400
-@@ -23,19 +23,12 @@
- 
- #include "impl.h"
- 
--// VStudio idiocy prevents defining template instanced static data
--// in a namespace. Workaround it by defining in global scope.
--// Other platforms will continue to put things in the proper namespace.
--#if defined( _MSC_VER )
--using namespace mp4v2::impl::bmff;
--#else
--namespace mp4v2 { namespace impl { namespace bmff {
--#endif
-+namespace mp4v2 { namespace impl {
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
-+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
-     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },
-     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },
-     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },
-@@ -526,9 +519,7 @@
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
--#if defined( _MSC_VER )
--namespace mp4v2 { namespace impl { namespace bmff {
--#endif
-+namespace bmff {
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
diff --git a/multimedia/mp4v2/files/patch-src__itmf__type.cpp b/multimedia/mp4v2/files/patch-src__itmf__type.cpp
deleted file mode 100644
index ba698bfc6911..000000000000
--- a/multimedia/mp4v2/files/patch-src__itmf__type.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./src/itmf/type.cpp.orig	2009-07-14 03:07:08.000000000 +0400
-+++ ./src/itmf/type.cpp	2012-01-15 22:14:12.054748862 +0400
-@@ -24,19 +24,12 @@
- 
- #include "impl.h"
- 
--// VStudio idiocy prevents defining template instanced static data
--// in a namespace. Workaround it by defining in global scope.
--// Other platforms will continue to put things in the proper namespace.
--#if defined( _MSC_VER )
--using namespace mp4v2::impl::itmf;
--#else
--namespace mp4v2 { namespace impl { namespace itmf {
--#endif
-+namespace mp4v2 { namespace impl {
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumBasicType::Entry EnumBasicType::data[] = {
-+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
-     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },
-     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },
-     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },
-@@ -64,7 +57,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumGenreType::Entry EnumGenreType::data[] = {
-+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
-     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             "Blues" },
-     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       "Classic Rock" },
-     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           "Country" },
-@@ -200,7 +193,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumStikType::Entry EnumStikType::data[] = {
-+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
-     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },
-     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },
-     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio Book" },
-@@ -216,7 +209,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumAccountType::Entry EnumAccountType::data[] = {
-+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
-     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },
-     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },
- 
-@@ -226,7 +219,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumCountryCode::Entry EnumCountryCode::data[] = {
-+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
-     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },
-     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },
-     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },
-@@ -256,7 +249,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- template <>
--const EnumContentRating::Entry EnumContentRating::data[] = {
-+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
-     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },
-     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },
-     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },
-@@ -266,9 +259,7 @@
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
--#if defined( _MSC_VER )
--namespace mp4v2 { namespace impl { namespace itmf {
--#endif
-+namespace itmf {
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
diff --git a/multimedia/mp4v2/files/patch-src_mp4util.h b/multimedia/mp4v2/files/patch-src_mp4util.h
new file mode 100644
index 000000000000..13114eb8da71
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-src_mp4util.h
@@ -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
+ 
diff --git a/multimedia/mp4v2/files/patch-src_rtphint.cpp b/multimedia/mp4v2/files/patch-src_rtphint.cpp
index 6f921a90993f..f9a84dc00179 100644
--- a/multimedia/mp4v2/files/patch-src_rtphint.cpp
+++ b/multimedia/mp4v2/files/patch-src_rtphint.cpp
@@ -2,14 +2,14 @@ src/rtphint.cpp:348:32: error: comparison between pointer and integer ('const ch
                     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);
diff --git a/multimedia/mp4v2/files/patch-util-mp4chaps.cpp b/multimedia/mp4v2/files/patch-util-mp4chaps.cpp
new file mode 100644
index 000000000000..f20a842e0116
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-util-mp4chaps.cpp
@@ -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();
diff --git a/multimedia/mp4v2/files/patch-util-mp4tags.cpp b/multimedia/mp4v2/files/patch-util-mp4tags.cpp
new file mode 100644
index 000000000000..50bb132812ac
--- /dev/null
+++ b/multimedia/mp4v2/files/patch-util-mp4tags.cpp
@@ -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] );
diff --git a/multimedia/mp4v2/pkg-plist b/multimedia/mp4v2/pkg-plist
index 07522c3d3e5f..1f12d2b7fbc9 100644
--- a/multimedia/mp4v2/pkg-plist
+++ b/multimedia/mp4v2/pkg-plist
@@ -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