From c9397cea176234b0bf93468489d56f5432ff8f47 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 13 Apr 2021 16:32:09 +0000 Subject: mp4v2: updated to 4.1.6 4.1.6: Unknown changes --- multimedia/mp4v2/Makefile | 5 ++--- multimedia/mp4v2/distinfo | 17 +++++++++------ multimedia/mp4v2/patches/patch-libutil_Utility.h | 15 ++++++++++++++ multimedia/mp4v2/patches/patch-src_rtphint.cpp | 15 -------------- multimedia/mp4v2/patches/patch-util_mp4art.cpp | 24 ++++++++++++++++++++++ multimedia/mp4v2/patches/patch-util_mp4chaps.cpp | 24 ++++++++++++++++++++++ multimedia/mp4v2/patches/patch-util_mp4file.cpp | 24 ++++++++++++++++++++++ .../mp4v2/patches/patch-util_mp4subtitle.cpp | 24 ++++++++++++++++++++++ multimedia/mp4v2/patches/patch-util_mp4track.cpp | 24 ++++++++++++++++++++++ 9 files changed, 148 insertions(+), 24 deletions(-) create mode 100644 multimedia/mp4v2/patches/patch-libutil_Utility.h delete mode 100644 multimedia/mp4v2/patches/patch-src_rtphint.cpp create mode 100644 multimedia/mp4v2/patches/patch-util_mp4art.cpp create mode 100644 multimedia/mp4v2/patches/patch-util_mp4chaps.cpp create mode 100644 multimedia/mp4v2/patches/patch-util_mp4file.cpp create mode 100644 multimedia/mp4v2/patches/patch-util_mp4subtitle.cpp create mode 100644 multimedia/mp4v2/patches/patch-util_mp4track.cpp (limited to 'multimedia') diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index 6eb45f85885..f12fa58baf7 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2020/12/20 13:07:58 nia Exp $ +# $NetBSD: Makefile,v 1.9 2021/04/13 16:32:09 adam Exp $ -DISTNAME= mp4v2-4.1.5 -PKGREVISION= 1 +DISTNAME= mp4v2-4.1.6 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=TechSmith/} GITHUB_TAG= Release-ThirdParty-MP4v2-${PKGVERSION_NOREV} diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo index b47b76aebfc..4343e914262 100644 --- a/multimedia/mp4v2/distinfo +++ b/multimedia/mp4v2/distinfo @@ -1,10 +1,15 @@ -$NetBSD: distinfo,v 1.6 2020/12/20 13:07:58 nia Exp $ +$NetBSD: distinfo,v 1.7 2021/04/13 16:32:09 adam Exp $ -SHA1 (mp4v2-4.1.5.tar.gz) = a57fb90b4d14b240f90431ba06c450283e0f9d28 -RMD160 (mp4v2-4.1.5.tar.gz) = 58b1b4de372499505447e6854cfe1214881bf813 -SHA512 (mp4v2-4.1.5.tar.gz) = 593071e3e2d48a7bc704d4b32b28de300363d797236cf8904b3c403758fa08fcd9c0a1ebafc462f69d3964493515eeb391e23d5e27366e06c8d65f68c936b65a -Size (mp4v2-4.1.5.tar.gz) = 2681905 bytes +SHA1 (mp4v2-4.1.6.tar.gz) = f2ee0853cc7219f1dc4bb09d9cf0cf1327704813 +RMD160 (mp4v2-4.1.6.tar.gz) = 5fc23086c05822c04eefa407076177218ae9a8b7 +SHA512 (mp4v2-4.1.6.tar.gz) = 91f5183d38c9d7fd754ba4b5e149b00600d5b6cb8da063667e5c3a6c8edb4e5efc919d6c4381acd6e011ef56dce3f722a78c51b984066f5c0cc54aae735f3611 +Size (mp4v2-4.1.6.tar.gz) = 4322307 bytes SHA1 (patch-include_mp4v2_file.h) = bfb8ed37208a1e04c2cb2ca4a8409e4b2b274065 +SHA1 (patch-libutil_Utility.h) = 982a92307e50061cefb8b979382c227cae144358 SHA1 (patch-src_mp4.cpp) = 53435290d3f3fd9ecc552357f674c54f5c6ec98d SHA1 (patch-src_mp4atom.cpp) = 78a6dce747a8c5cc73f231fa9b81d116b51cf4bb -SHA1 (patch-src_rtphint.cpp) = 7ccbacb6873a410b6e8b0d376a2ae7ada1c022d5 +SHA1 (patch-util_mp4art.cpp) = e14257a57bb297f158c1d2a9e39023535e558895 +SHA1 (patch-util_mp4chaps.cpp) = c22a9b8b086165d8e65aeb9f470d7c3eabb9adb6 +SHA1 (patch-util_mp4file.cpp) = 7e8ca0b042e96df1bc096f3efb351600432cdfd0 +SHA1 (patch-util_mp4subtitle.cpp) = cbb1848e1c439710e07bd4a21eeb9278a3a240d8 +SHA1 (patch-util_mp4track.cpp) = 70a30ea2d54fa6e5c740d515fd11cbbbc5223063 diff --git a/multimedia/mp4v2/patches/patch-libutil_Utility.h b/multimedia/mp4v2/patches/patch-libutil_Utility.h new file mode 100644 index 00000000000..370b716c72c --- /dev/null +++ b/multimedia/mp4v2/patches/patch-libutil_Utility.h @@ -0,0 +1,15 @@ +$NetBSD: patch-libutil_Utility.h,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- libutil/Utility.h.orig 2021-04-13 11:52:53.000000000 +0000 ++++ libutil/Utility.h +@@ -141,7 +141,7 @@ protected: + bool dryrunAbort(); + + // delegates +- virtual bool utility_option( int, bool& ) = 0; //!< process command-line option ++ virtual bool utility_option( unsigned int, bool& ) = 0; //!< process command-line option + virtual bool utility_job( JobContext& ) = 0; //!< process positional argument + + private: diff --git a/multimedia/mp4v2/patches/patch-src_rtphint.cpp b/multimedia/mp4v2/patches/patch-src_rtphint.cpp deleted file mode 100644 index e1967472737..00000000000 --- a/multimedia/mp4v2/patches/patch-src_rtphint.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_rtphint.cpp,v 1.1 2020/12/17 09:16:42 triaxx Exp $ - -Fix forbidden comparison between pointer and integer (Github pull request #42). - ---- src/rtphint.cpp.orig 2020-12-07 23:16:32.000000000 +0000 -+++ src/rtphint.cpp -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); diff --git a/multimedia/mp4v2/patches/patch-util_mp4art.cpp b/multimedia/mp4v2/patches/patch-util_mp4art.cpp new file mode 100644 index 00000000000..bce6ca15592 --- /dev/null +++ b/multimedia/mp4v2/patches/patch-util_mp4art.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-util_mp4art.cpp,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- util/mp4art.cpp.orig 2021-04-13 11:47:19.000000000 +0000 ++++ util/mp4art.cpp +@@ -48,7 +48,7 @@ public: + + protected: + // delegates implementation +- bool utility_option( int, bool& ); ++ bool utility_option( unsigned int, bool& ); + bool utility_job( JobContext& ); + + private: +@@ -372,7 +372,7 @@ ArtUtility::utility_job( JobContext& job + /////////////////////////////////////////////////////////////////////////////// + + bool +-ArtUtility::utility_option( int code, bool& handled ) ++ArtUtility::utility_option( unsigned int code, bool& handled ) + { + handled = true; + diff --git a/multimedia/mp4v2/patches/patch-util_mp4chaps.cpp b/multimedia/mp4v2/patches/patch-util_mp4chaps.cpp new file mode 100644 index 00000000000..8d52aecdd67 --- /dev/null +++ b/multimedia/mp4v2/patches/patch-util_mp4chaps.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-util_mp4chaps.cpp,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- util/mp4chaps.cpp.orig 2021-04-13 11:49:05.000000000 +0000 ++++ util/mp4chaps.cpp +@@ -74,7 +74,7 @@ public: + + protected: + // delegates implementation +- bool utility_option( int, bool& ); ++ bool utility_option( unsigned int, bool& ); + bool utility_job( JobContext& ); + + private: +@@ -628,7 +628,7 @@ ChapterUtility::utility_job( JobContext& + * @see Utility::utility_option( int, bool& ) + */ + bool +-ChapterUtility::utility_option( int code, bool& handled ) ++ChapterUtility::utility_option( unsigned int code, bool& handled ) + { + handled = true; + diff --git a/multimedia/mp4v2/patches/patch-util_mp4file.cpp b/multimedia/mp4v2/patches/patch-util_mp4file.cpp new file mode 100644 index 00000000000..d115304de79 --- /dev/null +++ b/multimedia/mp4v2/patches/patch-util_mp4file.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-util_mp4file.cpp,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- util/mp4file.cpp.orig 2021-04-13 11:48:31.000000000 +0000 ++++ util/mp4file.cpp +@@ -43,7 +43,7 @@ public: + + protected: + // delegates implementation +- bool utility_option( int, bool& ); ++ bool utility_option( unsigned int, bool& ); + bool utility_job( JobContext& ); + + private: +@@ -185,7 +185,7 @@ FileUtility::utility_job( JobContext& jo + /////////////////////////////////////////////////////////////////////////////// + + bool +-FileUtility::utility_option( int code, bool& handled ) ++FileUtility::utility_option( unsigned int code, bool& handled ) + { + handled = true; + diff --git a/multimedia/mp4v2/patches/patch-util_mp4subtitle.cpp b/multimedia/mp4v2/patches/patch-util_mp4subtitle.cpp new file mode 100644 index 00000000000..a5d8fd5e51c --- /dev/null +++ b/multimedia/mp4v2/patches/patch-util_mp4subtitle.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-util_mp4subtitle.cpp,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- util/mp4subtitle.cpp.orig 2021-04-13 11:48:49.000000000 +0000 ++++ util/mp4subtitle.cpp +@@ -43,7 +43,7 @@ public: + + protected: + // delegates implementation +- bool utility_option( int, bool& ); ++ bool utility_option( unsigned int, bool& ); + bool utility_job( JobContext& ); + + private: +@@ -160,7 +160,7 @@ SubtitleUtility::utility_job( JobContext + /////////////////////////////////////////////////////////////////////////////// + + bool +-SubtitleUtility::utility_option( int code, bool& handled ) ++SubtitleUtility::utility_option( unsigned int code, bool& handled ) + { + handled = true; + diff --git a/multimedia/mp4v2/patches/patch-util_mp4track.cpp b/multimedia/mp4v2/patches/patch-util_mp4track.cpp new file mode 100644 index 00000000000..32d45dcfeff --- /dev/null +++ b/multimedia/mp4v2/patches/patch-util_mp4track.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-util_mp4track.cpp,v 1.1 2021/04/13 16:32:09 adam Exp $ + +Fix "cannot be narrowed to type 'int'" error. + +--- util/mp4track.cpp.orig 2021-04-13 11:49:26.000000000 +0000 ++++ util/mp4track.cpp +@@ -78,7 +78,7 @@ public: + + protected: + // delegates implementation +- bool utility_option( int, bool& ); ++ bool utility_option( unsigned int, bool& ); + bool utility_job( JobContext& ); + + private: +@@ -784,7 +784,7 @@ TrackUtility::utility_job( JobContext& j + /////////////////////////////////////////////////////////////////////////////// + + bool +-TrackUtility::utility_option( int code, bool& handled ) ++TrackUtility::utility_option( unsigned int code, bool& handled ) + { + handled = true; + -- cgit v1.2.3