From owner-svn-ports-head@freebsd.org Sat Jan 2 02:00:31 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11F81A5EFA8; Sat, 2 Jan 2016 02:00:31 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E066412B8; Sat, 2 Jan 2016 02:00:30 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0220UpZ068713; Sat, 2 Jan 2016 02:00:30 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0220T7R068709; Sat, 2 Jan 2016 02:00:29 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201601020200.u0220T7R068709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 2 Jan 2016 02:00:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405041 - in head/audio/taglib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2016 02:00:31 -0000 Author: jhale Date: Sat Jan 2 02:00:29 2016 New Revision: 405041 URL: https://svnweb.freebsd.org/changeset/ports/405041 Log: - Update to 1.10 - Remove hack for audio/clementine-player that was added in r335257. It has no effect on the resulting library and clementine-player seems to build and read tags fine without it. Modified: head/audio/taglib/Makefile head/audio/taglib/distinfo head/audio/taglib/files/extrapatch-rcc head/audio/taglib/pkg-plist Modified: head/audio/taglib/Makefile ============================================================================== --- head/audio/taglib/Makefile Sat Jan 2 00:16:40 2016 (r405040) +++ head/audio/taglib/Makefile Sat Jan 2 02:00:29 2016 (r405041) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= taglib -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 1.10 CATEGORIES= audio MASTER_SITES= http://taglib.github.io/releases/ @@ -20,10 +19,6 @@ CMAKE_ARGS= -DWITH_ASF:BOOL=ON \ -DWITH_MP4:BOOL=ON USE_LDCONFIG= yes -# clang will generate code that just doesn't work with clementine-player -# if this isn't compiled as though it were C99. -USE_CSTD= c99 - CPE_VENDOR= scott_wheeler OPTIONS_DEFINE= RCC Modified: head/audio/taglib/distinfo ============================================================================== --- head/audio/taglib/distinfo Sat Jan 2 00:16:40 2016 (r405040) +++ head/audio/taglib/distinfo Sat Jan 2 02:00:29 2016 (r405041) @@ -1,2 +1,2 @@ -SHA256 (taglib-1.9.1.tar.gz) = 72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a -SIZE (taglib-1.9.1.tar.gz) = 654074 +SHA256 (taglib-1.10.tar.gz) = 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa +SIZE (taglib-1.10.tar.gz) = 1233893 Modified: head/audio/taglib/files/extrapatch-rcc ============================================================================== --- head/audio/taglib/files/extrapatch-rcc Sat Jan 2 00:16:40 2016 (r405040) +++ head/audio/taglib/files/extrapatch-rcc Sat Jan 2 02:00:29 2016 (r405041) @@ -1,7 +1,7 @@ diff -dPNur ./config.h.cmake ./config.h.cmake ---- ./config.h.cmake 2013-10-08 17:50:01.000000000 +0200 -+++ ./config.h.cmake 2013-11-11 13:43:48.500304915 +0100 -@@ -31,6 +31,9 @@ +--- config.h.cmake.orig 2015-11-11 21:41:59 UTC ++++ config.h.cmake +@@ -22,6 +22,9 @@ /* Defined if you have libz */ #cmakedefine HAVE_ZLIB 1 @@ -12,16 +12,17 @@ diff -dPNur ./config.h.cmake ./config.h. #cmakedefine TRACE_IN_RELEASE 1 diff -dPNur ./ConfigureChecks.cmake ./ConfigureChecks.cmake ---- ./ConfigureChecks.cmake 2013-10-08 17:50:01.000000000 +0200 -+++ ./ConfigureChecks.cmake 2013-11-11 13:42:53.017126134 +0100 -@@ -216,6 +216,7 @@ - set(HAVE_ZLIB 0) +--- ConfigureChecks.cmake.orig 2015-11-11 21:41:59 UTC ++++ ConfigureChecks.cmake +@@ -201,6 +201,8 @@ if(NOT ZLIB_SOURCE) + endif() endif() +SET(HAVE_LIBRCC 1) - - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - ++ + if(BUILD_TESTS) + find_package(CppUnit) + if(NOT CppUnit_FOUND) diff -dPNur ./examples/tagreader_c.c ./examples/tagreader_c.c --- ./examples/tagreader_c.c 2013-10-08 17:50:01.000000000 +0200 +++ ./examples/tagreader_c.c 2013-11-11 13:42:53.017126134 +0100 @@ -47,17 +48,17 @@ diff -dPNur ./examples/tagwriter.cpp ./e TagLib::List::Iterator it; for(it = fileList.begin(); it != fileList.end(); ++it) { diff -dPNur ./taglib/CMakeLists.txt ./taglib/CMakeLists.txt ---- ./taglib/CMakeLists.txt 2013-10-08 17:50:01.000000000 +0200 -+++ ./taglib/CMakeLists.txt 2013-11-11 13:42:53.042126665 +0100 -@@ -36,6 +36,7 @@ +--- taglib/CMakeLists.txt.orig 2015-11-11 21:41:59 UTC ++++ taglib/CMakeLists.txt +@@ -38,6 +38,7 @@ set(tag_HDRS audioproperties.h taglib_export.h - ${CMAKE_BINARY_DIR}/taglib_config.h + ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h + toolkit/rccpatch.h toolkit/taglib.h toolkit/tstring.h toolkit/tlist.h -@@ -281,6 +282,7 @@ +@@ -291,6 +292,7 @@ set(xm_SRCS ) set(toolkit_SRCS @@ -65,12 +66,12 @@ diff -dPNur ./taglib/CMakeLists.txt ./ta toolkit/tstring.cpp toolkit/tstringlist.cpp toolkit/tbytevector.cpp -@@ -310,7 +312,7 @@ +@@ -337,7 +339,7 @@ set(tag_LIB_SRCS add_library(tag ${tag_LIB_SRCS} ${tag_HDRS}) if(ZLIB_FOUND) -- target_link_libraries(tag ${ZLIB_LIBRARIES}) -+ target_link_libraries(tag rcc ${ZLIB_LIBRARIES}) +- target_link_libraries(tag ${ZLIB_LIBRARIES}) ++ target_link_libraries(tag rcc ${ZLIB_LIBRARIES}) endif() set_target_properties(tag PROPERTIES @@ -450,8 +451,8 @@ diff -dPNur ./taglib/toolkit/rccpatch.h + +#endif /* _RCC_PATCH_H */ diff -dPNur ./taglib/toolkit/tstring.cpp ./taglib/toolkit/tstring.cpp ---- ./taglib/toolkit/tstring.cpp 2013-10-08 17:50:01.000000000 +0200 -+++ ./taglib/toolkit/tstring.cpp 2013-11-11 13:42:53.046126750 +0100 +--- taglib/toolkit/tstring.cpp.orig 2015-11-11 21:41:59 UTC ++++ taglib/toolkit/tstring.cpp @@ -29,6 +29,7 @@ #include #endif @@ -460,21 +461,21 @@ diff -dPNur ./taglib/toolkit/tstring.cpp #include "tstring.h" #include "tdebug.h" #include "tstringlist.h" -@@ -197,8 +198,11 @@ +@@ -167,8 +168,11 @@ String::String(const String &s) String::String(const std::string &s, Type t) : d(new StringPrivate()) { - if(t == Latin1) -- copyFromLatin1(&s[0], s.length()); +- copyFromLatin1(s.c_str(), s.length()); + if(t == Locale) + t = rccTaglibPatchGetLocaleType(); + + if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) -+ copyFromLatin1(&s[0], s.length(), true, t); ++ copyFromLatin1(s.c_str(), s.length(), true, t); else if(t == String::UTF8) - copyFromUTF8(&s[0], s.length()); + copyFromUTF8(s.c_str(), s.length()); else { -@@ -229,8 +233,11 @@ +@@ -215,8 +219,11 @@ String::String(const wchar_t *s, Type t) String::String(const char *s, Type t) : d(new StringPrivate()) { @@ -488,7 +489,7 @@ diff -dPNur ./taglib/toolkit/tstring.cpp else if(t == String::UTF8) copyFromUTF8(s, ::strlen(s)); else { -@@ -251,7 +258,10 @@ +@@ -237,7 +244,10 @@ String::String(wchar_t c, Type t) String::String(char c, Type t) : d(new StringPrivate(1, static_cast(c))) { @@ -497,31 +498,30 @@ diff -dPNur ./taglib/toolkit/tstring.cpp + t = rccTaglibPatchGetLocaleType(); + + if(t != Latin1 && t != Latin1ID3 && t != Latin1ID3V2 && t != UTF8) { - debug("String::String() -- A char should not contain UTF16."); + debug("String::String() -- char should not contain UTF16."); } } -@@ -262,8 +272,11 @@ +@@ -248,8 +258,11 @@ String::String(const ByteVector &v, Type if(v.isEmpty()) return; -- if(t == Latin1) +- if(t == Latin1) - copyFromLatin1(v.data(), v.size()); + if(t == Locale) + t = rccTaglibPatchGetLocaleType(); + + if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) + copyFromLatin1(v.data(), v.size(), true, t); - else if(t == UTF8) + else if(t == UTF8) copyFromUTF8(v.data(), v.size()); - else -@@ -428,16 +441,46 @@ + else +@@ -396,8 +409,37 @@ bool String::isNull() const ByteVector String::data(Type t) const { -- switch(t) +- switch(t) - { + ByteVector v; -+ + if (t == Locale) { + // The source is either Unicode or real Latin1 (if rcc is bypassed) + std::string s = to8Bit(true); @@ -555,17 +555,7 @@ diff -dPNur ./taglib/toolkit/tstring.cpp case Latin1: { ByteVector v(size(), 0); - char *p = v.data(); -- -+ - for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) - *p++ = static_cast(*it); -- -+ - return v; - } - case UTF8: -@@ -763,12 +806,29 @@ +@@ -738,12 +780,29 @@ void String::detach() // private members //////////////////////////////////////////////////////////////////////////////// @@ -597,7 +587,7 @@ diff -dPNur ./taglib/toolkit/tstring.cpp } void String::copyFromUTF8(const char *s, size_t length) -@@ -874,7 +934,33 @@ +@@ -859,7 +918,33 @@ const TagLib::String operator+(const Tag std::ostream &operator<<(std::ostream &s, const TagLib::String &str) { Modified: head/audio/taglib/pkg-plist ============================================================================== --- head/audio/taglib/pkg-plist Sat Jan 2 00:16:40 2016 (r405040) +++ head/audio/taglib/pkg-plist Sat Jan 2 02:00:29 2016 (r405041) @@ -13,7 +13,9 @@ include/taglib/asfproperties.h include/taglib/asftag.h include/taglib/attachedpictureframe.h include/taglib/audioproperties.h +include/taglib/chapterframe.h include/taglib/commentsframe.h +include/taglib/eventtimingcodesframe.h include/taglib/fileref.h include/taglib/flacfile.h include/taglib/flacmetadatablock.h @@ -63,6 +65,8 @@ include/taglib/s3mfile.h include/taglib/s3mproperties.h include/taglib/speexfile.h include/taglib/speexproperties.h +include/taglib/synchronizedlyricsframe.h +include/taglib/tableofcontentsframe.h include/taglib/tag.h include/taglib/tag_c.h include/taglib/taglib.h @@ -102,7 +106,7 @@ include/taglib/xmfile.h include/taglib/xmproperties.h lib/libtag.so lib/libtag.so.1 -lib/libtag.so.1.14.0 +lib/libtag.so.1.15.1 lib/libtag_c.so lib/libtag_c.so.0 lib/libtag_c.so.0.0.0