Date: Sun, 2 Jul 2023 21:12:07 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2d3f2d33e224 - main - audio/taglib: Update to 1.13.1 Message-ID: <202307022112.362LC7e8030869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d3f2d33e22410d46537d51ef1f5426944971fe0 commit 2d3f2d33e22410d46537d51ef1f5426944971fe0 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-07-02 20:56:16 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2023-07-02 21:11:53 +0000 audio/taglib: Update to 1.13.1 https://github.com/taglib/taglib/releases/tag/v1.13.1 --- audio/taglib/Makefile | 2 +- audio/taglib/distinfo | 6 +++--- audio/taglib/files/extrapatch-rcc | 30 +++++++++++++++--------------- audio/taglib/pkg-plist | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 3143470f65b0..2ffc0df07776 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -1,5 +1,5 @@ PORTNAME= taglib -DISTVERSION= 1.13 +DISTVERSION= 1.13.1 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \ https://taglib.org/releases/ diff --git a/audio/taglib/distinfo b/audio/taglib/distinfo index d8108c7f77c2..bd9ce3753aea 100644 --- a/audio/taglib/distinfo +++ b/audio/taglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666898708 -SHA256 (taglib-1.13.tar.gz) = 58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0 -SIZE (taglib-1.13.tar.gz) = 1371504 +TIMESTAMP = 1688325610 +SHA256 (taglib-1.13.1.tar.gz) = c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b +SIZE (taglib-1.13.1.tar.gz) = 1372618 diff --git a/audio/taglib/files/extrapatch-rcc b/audio/taglib/files/extrapatch-rcc index 0fe833407650..b5654c5a3217 100644 --- a/audio/taglib/files/extrapatch-rcc +++ b/audio/taglib/files/extrapatch-rcc @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06a7c2fa..122e87c2 100644 +index 832af866..d02ccaf1 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -139,6 +139,8 @@ if(NOT BUILD_FRAMEWORK) @@ -52,7 +52,7 @@ index ed8b0d7a..6a7a2632 100644 TagLib::List<TagLib::FileRef>::ConstIterator it; for(it = fileList.begin(); it != fileList.end(); ++it) { diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt -index 527c0073..ed405225 100644 +index ea1ab838..2f7bad07 100644 --- taglib/CMakeLists.txt +++ taglib/CMakeLists.txt @@ -39,6 +39,7 @@ set(tag_HDRS @@ -83,7 +83,7 @@ index 527c0073..ed405225 100644 set_target_properties(tag PROPERTIES diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp -index 358a9595..1dbf37e7 100644 +index 667adfa6..8b2ceef5 100644 --- taglib/mpeg/id3v1/id3v1tag.cpp +++ taglib/mpeg/id3v1/id3v1tag.cpp @@ -69,14 +69,14 @@ StringHandler::StringHandler() @@ -115,14 +115,14 @@ index 358a9595..1dbf37e7 100644 offset += 30; diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp -index 815e5e1a..cf253284 100644 +index add0bf2f..b641c49d 100644 --- taglib/mpeg/id3v2/frames/commentsframe.cpp +++ taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -150,10 +150,10 @@ void CommentsFrame::parseFields(const ByteVector &data) return; } -- d->textEncoding = String::Type(data[0]); +- d->textEncoding = static_cast<String::Type>(data[0]); + d->textEncoding = String::ID3Type(data[0]); d->language = data.mid(1, 3); @@ -140,20 +140,20 @@ index 815e5e1a..cf253284 100644 encoding = checkTextEncoding(d->description, encoding); encoding = checkTextEncoding(d->text, encoding); -- v.append(char(encoding)); -+ v.append(char(String::ID3RealType(encoding))); +- v.append(static_cast<char>(encoding)); ++ v.append(static_cast<char>(String::ID3RealType(encoding))); v.append(d->language.size() == 3 ? d->language : "XXX"); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp -index f468b485..bf5251a1 100644 +index cda40d95..6ac15400 100644 --- taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -194,12 +194,12 @@ void TextIdentificationFrame::parseFields(const ByteVector &data) // read the string data type (the first byte of the field data) -- d->textEncoding = String::Type(data[0]); +- d->textEncoding = static_cast<String::Type>(data[0]); + d->textEncoding = String::ID3Type(data[0]); // split the byte array into chunks based on the string type (two byte delimiter @@ -176,13 +176,13 @@ index f468b485..bf5251a1 100644 ByteVector v; -- v.append(char(encoding)); -+ v.append(char(String::ID3RealType(encoding))); +- v.append(static_cast<char>(encoding)); ++ v.append(static_cast<char>(String::ID3RealType(encoding))); for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) { diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp -index ae735b54..1d853058 100644 +index c3a45a2a..fac929b9 100644 --- taglib/mpeg/id3v2/id3v2frame.cpp +++ taglib/mpeg/id3v2/id3v2frame.cpp @@ -297,7 +297,7 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin @@ -464,7 +464,7 @@ index 00000000..31f44106 + +#endif /* _RCC_PATCH_H */ diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp -index 669cd0eb..7168b1bd 100644 +index 212c186f..690720ec 100644 --- taglib/toolkit/tstring.cpp +++ taglib/toolkit/tstring.cpp @@ -33,6 +33,7 @@ @@ -597,7 +597,7 @@ index 669cd0eb..7168b1bd 100644 case Latin1: { ByteVector v(size(), 0); -@@ -737,7 +800,33 @@ const TagLib::String operator+(const TagLib::String &s1, const char *s2) +@@ -737,7 +800,33 @@ TagLib::String operator+(const TagLib::String &s1, const char *s2) std::ostream &operator<<(std::ostream &s, const TagLib::String &str) { @@ -633,7 +633,7 @@ index 669cd0eb..7168b1bd 100644 + return type; +} diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h -index e6bbbe7b..0c60df9c 100644 +index e3853d80..b8eb70df 100644 --- taglib/toolkit/tstring.h +++ taglib/toolkit/tstring.h @@ -95,6 +95,18 @@ namespace TagLib { diff --git a/audio/taglib/pkg-plist b/audio/taglib/pkg-plist index 6e6d7a3beb12..ee0d3f0008da 100644 --- a/audio/taglib/pkg-plist +++ b/audio/taglib/pkg-plist @@ -109,7 +109,7 @@ include/taglib/xmproperties.h %%STATIC%%lib/libtag.a %%NO_STATIC%%lib/libtag.so %%NO_STATIC%%lib/libtag.so.1 -%%NO_STATIC%%lib/libtag.so.1.19.0 +%%NO_STATIC%%lib/libtag.so.1.19.1 %%STATIC%%lib/libtag_c.a %%NO_STATIC%%lib/libtag_c.so %%NO_STATIC%%lib/libtag_c.so.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307022112.362LC7e8030869>