From e9dbeb874fced6800bfba7af9c153aa26a22e22d Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 10 Mar 2022 15:05:05 +0000 Subject: libmediainfo,mediainfo: Update to 21.09 * Update LICENSE to 2-clause-bsd. CHangelog: Version 21.09, 2021-09-17 ------------- + Graph view for 3D audio streams (thanks to graphviz) + ADM: full featured support (programmes, content, objects, pack formats...) + ADM: in WAV (axml, bxml), MXF + S-ADM in AES3: support of Levels A1 and AX1 + MOV/MP4: support of Dolby Vision Metadata XML + MXF: detection of IAB + SMPTE ST 337 (AES3): support of subframe mode + HEVC: CEA-608/708 caption support + MP4/QuickTime: Android slow motion real frame rate + JSON output: add creatingLibrary field x MPEG-4: read too much data with some predecessor definitions x EBUCore: fix of fields order and types Version 21.03, 2021-03-26 ------------- + WAV: ADM profile detection of Dolby Atmos Master or MPEG-H + SMPTE ST 337: support of AC-4 + AC-3/AC-4: show top layer channels after Lw/Rw, as it becomes the defacto standard layout + Dolby Surround EX and Pro Logic IIz detection + Matroska: add DV support + JavaScript module: reduce binary size + JavaScript module: reserve less memory at startup + CLI: read from stdin + DV: remove check of zeroed bytes in timecode, considered again as valid timecode + TIFF; add support of compression codes 7 and 8 + WAV: show bext (BWF) version in verbose mode / XML / JSON + MXF: detection fo DCI P3 mastering display color primaries + Options: add software version to text output (CLI or Windows GUI) + Options: add report creation timestamp to text output (CLI or Windows GUI) + macOS: native build for Apple Silicon (arm64) x HDR: mastering max. luminance precision was wrong x WM: fix EncodingTime parsing x MOV/MP4: skip XMP huge atoms, fix x MPEG-TS: fix inverted supplementary_audio_descriptor mix_type values x AAC: fix File_Aac::is_intensity according to ISO/IEC 14496-3:2009 x I1353, MP4: Skip user data Xtra and free atoms x FFV1: fix crash with some bitstreams parsing x TIFF: fix division by 0 x RF64: fix the WAV malformed chunk size test x macOS 10.9/10.10: fix crash at startup x Supported platforms: this is the last version compatible with Windows XP, macOS 10.5-10.9, RHEL/CentOS 6 Version 20.09, 2020-10-09 ------------- + Dolby ED2: full featured support (presentations, presentation targets, beds, objects) + MKV: support of Dolby Vision metadata + MXF: detection of Dolby E hidden in PCM tracks having more than 2 channels + WAV: detection of Dolby E hidden in PCM tracks having more than 2 channels + CineForm: display of color space (including Bayer), bit depth x WAV: more precise sample count x SMPTE ST 337: catch of streams starting later than usual (probing increased from 4 to 16 PCM "frames") x PNG: detection of additional alpha plane in color space x MXF: detection of additional alpha plane in color space x AVI: detection of additional alpha plane in color space x MPEG Audio: was wrongly flagging Xing info tag as CBR x VorbisTag: does not skip DISCID x Miscellaneous bug/crash fixes Version 20.08, 2020-08-11 ------------- + MPEG-H 3D Audio full featured support (group presets, switch groups, groups, signal groups) + MP4/MOV: support of more metadata locations + JSON and XML outputs: authorize "complete" output + MPEG-4: support of TrueHD + WM: show legacy value of performer if not same as modern one + WAV: trace of adtl (Associated Data List) chunk x URL encoding detection fix for URL having a query part (issue with e.g. pre-signed AWS S3 URLs) x Don't try to seek to the end (false positive range related error with HTTP) x DPX: don't load the whole file in RAM x Opus: fix wrong channel mapping x Miscellaneous other bug fixes --- multimedia/libmediainfo/Makefile | 5 ++--- multimedia/mediainfo/Makefile | 5 ++--- multimedia/mediainfo/Makefile.common | 4 ++-- multimedia/mediainfo/distinfo | 12 +++++------ ...InfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp | 16 --------------- ...oLib_Source_MediaInfo_Multiple_File__MpegPs.cpp | 16 --------------- .../mediainfo/patches/patch-wxWidgets_configure | 24 ++++++++++++++++++++++ .../patches/patch-wxWidgets_src_tiff_configure | 15 ++++++++++++++ 8 files changed, 51 insertions(+), 46 deletions(-) delete mode 100644 multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp delete mode 100644 multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp create mode 100644 multimedia/mediainfo/patches/patch-wxWidgets_configure create mode 100644 multimedia/mediainfo/patches/patch-wxWidgets_src_tiff_configure (limited to 'multimedia') diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index c65a7916393..ac00bae874b 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2022/02/08 13:15:54 gavan Exp $ +# $NetBSD: Makefile,v 1.10 2022/03/10 15:05:05 ryoon Exp $ -PKGREVISION= 1 .include "../../multimedia/mediainfo/Makefile.common" PKGNAME= libmediainfo-${MIVER} COMMENT= MediaInfoLib, support library for MediaInfo program -LICENSE= zlib +LICENSE= 2-clause-bsd USE_TOOLS+= autoconf automake autoreconf gmake pkg-config USE_LIBTOOL= yes diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index d690414f9f4..4df18bd03ef 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2021/10/14 07:03:02 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2022/03/10 15:05:05 ryoon Exp $ -PKGREVISION= 1 .include "../../multimedia/mediainfo/Makefile.common" PKGNAME= mediainfo-${MIVER} -LICENSE= gnu-lgpl-v3 +LICENSE= 2-clause-bsd USE_TOOLS+= autoconf automake autoreconf gmake pkg-config USE_LIBTOOL= yes diff --git a/multimedia/mediainfo/Makefile.common b/multimedia/mediainfo/Makefile.common index a75b99e6212..f68cfed6f87 100644 --- a/multimedia/mediainfo/Makefile.common +++ b/multimedia/mediainfo/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.9 2020/08/03 09:51:28 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2022/03/10 15:05:05 ryoon Exp $ # # used by multimedia/mediainfo/Makefile # used by multimedia/libmediainfo/Makefile -MIVER= 20.03 +MIVER= 21.09 DISTNAME= mediainfo_${MIVER}_AllInclusive CATEGORIES= multimedia diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo index c561798924b..29ae67a8248 100644 --- a/multimedia/mediainfo/distinfo +++ b/multimedia/mediainfo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2021/10/26 11:01:11 nia Exp $ +$NetBSD: distinfo,v 1.19 2022/03/10 15:05:05 ryoon Exp $ -BLAKE2s (mediainfo_20.03_AllInclusive.7z) = 105c0d9e3fe9ac48e166bab2da67cddd085743cdc9e28832bec3732fd96c2f8a -SHA512 (mediainfo_20.03_AllInclusive.7z) = 850f4ee5f8ceb3a91a4466ff73c9f2fb70a1a63f8bdd7ffd8dd40e83b619b71c59e9b8659a8636758c90a62d7024b4e617b17025c72f23a7bcd25a3823d2ee39 -Size (mediainfo_20.03_AllInclusive.7z) = 3706487 bytes +BLAKE2s (mediainfo_21.09_AllInclusive.7z) = 29ac47313bc39a1ea6f8be9c564485d0d69c2afa463d5cee4be4469a28e2548d +SHA512 (mediainfo_21.09_AllInclusive.7z) = 8371b4f9b9a0a77c0b5a0930363266f1c236b6eff8acfd5873edde7a18bfd2e6305092742f9094a64252b6f13d339526ad153587d1f5d8b03a6b09594dbbf752 +Size (mediainfo_21.09_AllInclusive.7z) = 18232082 bytes SHA1 (patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h) = 19d6cba816c9e282e31fac527cbc39b9303f9f08 -SHA1 (patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp) = 04f3533bf6a79a2dd8dcee80fd0f68e73303ccbb -SHA1 (patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp) = 800904386799b205a366f4f693ad9a7ff3d5856b +SHA1 (patch-wxWidgets_configure) = 1e66f21dd53cab7777650b82e0a030bd557c1de1 +SHA1 (patch-wxWidgets_src_tiff_configure) = 42c668792c114d17426f0c34ffff972bf1c90e0f diff --git a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp b/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp deleted file mode 100644 index 27abc8c41aa..00000000000 --- a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-MediaInfoLib_Source_MediaInfo_Multiple_File__Gxf.cpp,v 1.1 2021/10/14 07:03:02 wiz Exp $ - -Fix CVE-2020-26797 -https://github.com/MediaArea/MediaInfoLib/commit/7bab1c3a043784be2c90f2e54a0e5a8d7263eead - ---- MediaInfoLib/Source/MediaInfo/Multiple/File_Gxf.cpp.orig 2020-04-03 12:46:46.000000000 +0000 -+++ MediaInfoLib/Source/MediaInfo/Multiple/File_Gxf.cpp -@@ -1577,7 +1577,7 @@ File__Analyze* File_Gxf::ChooseParser_Ch - File_ChannelGrouping* Parser; - if (Audio_Count%2) - { -- if (!Streams[TrackID-1].IsChannelGrouping) -+ if (!TrackID || !Streams[TrackID-1].IsChannelGrouping) - return NULL; //Not a channel grouping - - Parser=new File_ChannelGrouping; diff --git a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp b/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp deleted file mode 100644 index e0cf0517402..00000000000 --- a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-MediaInfoLib_Source_MediaInfo_Multiple_File__MpegPs.cpp,v 1.1 2021/10/14 07:03:02 wiz Exp $ - -Fix for CVE-2020-15395 -https://github.com/MediaArea/MediaInfoLib/commit/7b935cda2db88bfb63bda157bb93d69091c2c199 - ---- MediaInfoLib/Source/MediaInfo/Multiple/File_MpegPs.cpp.orig 2020-04-03 12:46:46.000000000 +0000 -+++ MediaInfoLib/Source/MediaInfo/Multiple/File_MpegPs.cpp -@@ -405,7 +405,7 @@ void File_MpegPs::Streams_Fill_PerStream - Fill(Stream_Audio, StreamPos_Last, Audio_MuxingMode, "SL"); - #endif //MEDIAINFO_MPEG4_YES - -- if (Counts[StreamKind_Last]+Count==Count_Get(StreamKind_Last)) //Old method -+ if (StreamKind_Last&6; } + SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" + fi + +- if test "x$GCC" == "xyes"; then ++ if test "x$GCC" = "xyes"; then + PIC_FLAG="-dynamic -fPIC" + fi + if test "x$XLCC" = "xyes"; then diff --git a/multimedia/mediainfo/patches/patch-wxWidgets_src_tiff_configure b/multimedia/mediainfo/patches/patch-wxWidgets_src_tiff_configure new file mode 100644 index 00000000000..2c1d0ead895 --- /dev/null +++ b/multimedia/mediainfo/patches/patch-wxWidgets_src_tiff_configure @@ -0,0 +1,15 @@ +$NetBSD: patch-wxWidgets_src_tiff_configure,v 1.1 2022/03/10 15:05:05 ryoon Exp $ + +* Fix shell portability issue. + +--- wxWidgets/src/tiff/configure.orig 2016-02-28 21:33:37.000000000 +0000 ++++ wxWidgets/src/tiff/configure +@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set; + fi + + +-if test "x$enable_jpeg12" == "xyes" ; then ++if test "x$enable_jpeg12" = "xyes" ; then + + if test "x$with_jpeg12_lib" != "x" ; then + LIBS="$with_jpeg12_lib $LIBS" -- cgit v1.2.3