Date: Thu, 6 Sep 2012 21:34:24 -0400 From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171395: [MAINTAINER] audio/taglib: Update to 1.8 Message-ID: <1346981664.414638.43342@mocha.verizon.net> Resent-Message-ID: <201209070140.q871e13d053591@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171395 >Category: ports >Synopsis: [MAINTAINER] audio/taglib: Update to 1.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 07 01:40:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 9.0-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386 Redports builds: https://redports.org/buildarchive/20120907010224-41841/ >Description: - Update audio/taglib to 1.8 - Update WWW in pkg-descr - Remove $FreeBSD$ keyword from pkg-plist >How-To-Repeat: - Use attached diff >Fix: --- 2012-09-06-taglib.diff begins here --- Index: pkg-plist =================================================================== --- pkg-plist (revision 303798) +++ pkg-plist (working copy) @@ -1,4 +1,3 @@ -@comment $FreeBSD$ bin/taglib-config include/taglib/aifffile.h include/taglib/aiffproperties.h @@ -30,6 +29,12 @@ include/taglib/id3v2header.h include/taglib/id3v2synchdata.h include/taglib/id3v2tag.h +include/taglib/itfile.h +include/taglib/itproperties.h +include/taglib/modfile.h +include/taglib/modfilebase.h +include/taglib/modproperties.h +include/taglib/modtag.h include/taglib/mp4atom.h include/taglib/mp4coverart.h include/taglib/mp4file.h @@ -45,11 +50,14 @@ include/taglib/oggflacfile.h include/taglib/oggpage.h include/taglib/oggpageheader.h +include/taglib/ownershipframe.h include/taglib/popularimeterframe.h include/taglib/privateframe.h %%RCC%%include/taglib/rccpatch.h include/taglib/relativevolumeframe.h include/taglib/rifffile.h +include/taglib/s3mfile.h +include/taglib/s3mproperties.h include/taglib/speexfile.h include/taglib/speexproperties.h include/taglib/tag.h @@ -59,12 +67,16 @@ include/taglib/taglib_export.h include/taglib/tbytevector.h include/taglib/tbytevectorlist.h +include/taglib/tbytevectorstream.h include/taglib/textidentificationframe.h include/taglib/tfile.h +include/taglib/tfilestream.h +include/taglib/tiostream.h include/taglib/tlist.h include/taglib/tlist.tcc include/taglib/tmap.h include/taglib/tmap.tcc +include/taglib/tpropertymap.h include/taglib/trueaudiofile.h include/taglib/trueaudioproperties.h include/taglib/tstring.h @@ -81,9 +93,11 @@ include/taglib/wavproperties.h include/taglib/xingheader.h include/taglib/xiphcomment.h +include/taglib/xmfile.h +include/taglib/xmproperties.h lib/libtag.so lib/libtag.so.1 -lib/libtag.so.1.7.2 +lib/libtag.so.1.12.0 lib/libtag_c.so lib/libtag_c.so.0 lib/libtag_c.so.0.0.0 Index: Makefile =================================================================== --- Makefile (revision 303798) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= taglib -PORTVERSION= 1.7.2 +PORTVERSION= 1.8 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/taglib/taglib/ \ http://developer.kde.org/~wheeler/files/src/ @@ -16,7 +16,6 @@ LICENSE= LGPL21 MPL LICENSE_COMB= dual -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL OPTIONS_DEFINE= RCC Index: pkg-descr =================================================================== --- pkg-descr (revision 303798) +++ pkg-descr (working copy) @@ -3,4 +3,4 @@ Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files. -WWW: http://developer.kde.org/~wheeler/taglib.html +WWW: http://taglib.github.com/ Index: distinfo =================================================================== --- distinfo (revision 303798) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (taglib-1.7.2.tar.gz) = 38f7e5283b594021b28426a61339cffbf2d503b450338b02f651fab1b0b42899 -SIZE (taglib-1.7.2.tar.gz) = 535427 +SHA256 (taglib-1.8.tar.gz) = 66d33481703c90236a0a9d1c38fd81b584ca7109ded049225f5463dcaffc209a +SIZE (taglib-1.8.tar.gz) = 595937 Index: files/extrapatch-rcc =================================================================== --- files/extrapatch-rcc (revision 303798) +++ files/extrapatch-rcc (working copy) @@ -7,11 +7,11 @@ +#cmakedefine HAVE_LIBRCC 1 + #cmakedefine NO_ITUNES_HACKS 1 ---- ConfigureChecks.cmake.orig 2008-12-21 16:46:41.000000000 -0500 -+++ ConfigureChecks.cmake 2009-09-29 07:08:08.000000000 -0400 -@@ -20,6 +20,21 @@ - SET(HAVE_ZLIB 0) - ENDIF(ZLIB_FOUND) +--- ConfigureChecks.cmake.orig 2012-07-14 15:53:09.000000000 -0400 ++++ ConfigureChecks.cmake 2012-07-14 20:58:15.000000000 -0400 +@@ -14,6 +14,21 @@ + set(HAVE_ZLIB 0) + endif() +#check for librcc +find_path(RCC_INCLUDE_DIR librcc.h) @@ -28,12 +28,12 @@ + +mark_as_advanced(RCC_LIBRARY RCC_INCLUDE_DIR) + - SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - FIND_PACKAGE(CppUnit) - IF (NOT CppUnit_FOUND AND BUILD_TESTS) ---- taglib/mpeg/id3v1/id3v1tag.cpp.orig 2008-02-04 16:14:45.000000000 +0100 -+++ taglib/mpeg/id3v1/id3v1tag.cpp 2008-11-20 15:24:19.000000000 +0100 -@@ -59,17 +59,18 @@ + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + find_package(CppUnit) + if(NOT CppUnit_FOUND AND BUILD_TESTS) +--- taglib/mpeg/id3v1/id3v1tag.cpp.orig 2012-07-14 15:53:09.000000000 -0400 ++++ taglib/mpeg/id3v1/id3v1tag.cpp 2012-07-14 20:49:26.000000000 -0400 +@@ -64,17 +64,18 @@ String ID3v1::StringHandler::parse(const ByteVector &data) const { @@ -54,7 +54,7 @@ } //////////////////////////////////////////////////////////////////////////////// -@@ -240,7 +241,7 @@ +@@ -247,7 +248,7 @@ d->track = uchar(data[offset + 29]); } else @@ -63,9 +63,9 @@ offset += 30; ---- taglib/mpeg/id3v2/frames/commentsframe.cpp.orig 2008-02-04 16:14:46.000000000 +0100 -+++ taglib/mpeg/id3v2/frames/commentsframe.cpp 2008-11-20 15:24:19.000000000 +0100 -@@ -136,10 +136,10 @@ +--- taglib/mpeg/id3v2/frames/commentsframe.cpp.orig 2012-07-14 15:53:09.000000000 -0400 ++++ taglib/mpeg/id3v2/frames/commentsframe.cpp 2012-07-14 21:08:29.000000000 -0400 +@@ -150,10 +150,10 @@ return; } @@ -78,24 +78,23 @@ ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2); -@@ -155,10 +155,12 @@ +@@ -169,10 +169,12 @@ String::Type encoding = d->textEncoding; + encoding = String::ID3WType(encoding); + - encoding = checkEncoding(d->description, encoding); - encoding = checkEncoding(d->text, encoding); -- + encoding = checkTextEncoding(d->description, encoding); + encoding = checkTextEncoding(d->text, encoding); + - v.append(char(encoding)); -+ + v.append(char(String::ID3RealType(encoding))); v.append(d->language.size() == 3 ? d->language : "XXX"); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); ---- taglib/mpeg/id3v2/frames/textidentificationframe.cpp.orig 2008-02-04 16:14:46.000000000 +0100 -+++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2008-11-20 15:24:19.000000000 +0100 -@@ -105,12 +105,12 @@ +--- taglib/mpeg/id3v2/frames/textidentificationframe.cpp.orig 2012-07-14 15:53:09.000000000 -0400 ++++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2012-07-14 21:13:35.000000000 -0400 +@@ -187,12 +187,12 @@ // read the string data type (the first byte of the field data) @@ -110,11 +109,11 @@ // build a small counter to strip nulls off the end of the field -@@ -139,11 +139,14 @@ +@@ -221,11 +221,14 @@ ByteVector TextIdentificationFrame::renderFields() const { -- String::Type encoding = checkEncoding(d->fieldList, d->textEncoding); +- String::Type encoding = checkTextEncoding(d->fieldList, d->textEncoding); + String::Type encoding = d->textEncoding; + + encoding = String::ID3WType(encoding); @@ -127,11 +126,6 @@ for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) { ---- taglib/toolkit/CMakeLists.txt.orig 2008-01-11 01:54:01.000000000 +0100 -+++ taglib/toolkit/CMakeLists.txt 2008-11-20 15:58:31.000000000 +0100 -@@ -1 +1 @@ --INSTALL( FILES taglib.h tstring.h tlist.h tlist.tcc tstringlist.h tbytevector.h tbytevectorlist.h tfile.h tmap.h tmap.tcc DESTINATION ${INCLUDE_INSTALL_DIR}/taglib) -+INSTALL( FILES rccpatch.h taglib.h tstring.h tlist.h tlist.tcc tstringlist.h tbytevector.h tbytevectorlist.h tfile.h tmap.h tmap.tcc DESTINATION ${INCLUDE_INSTALL_DIR}/taglib) --- taglib/toolkit/rccpatch.cpp.orig 1970-01-01 01:00:00.000000000 +0100 +++ taglib/toolkit/rccpatch.cpp 2008-11-20 15:58:31.000000000 +0100 @@ -0,0 +1,198 @@ @@ -491,34 +485,43 @@ /*! * Constructs an empty String. */ ---- taglib/CMakeLists.txt.orig 2008-02-12 05:15:20.000000000 +0100 -+++ taglib/CMakeLists.txt 2008-11-20 15:58:31.000000000 +0100 -@@ -17,6 +17,11 @@ - ${CMAKE_CURRENT_BINARY_DIR}/taglib - ${CMAKE_CURRENT_BINARY_DIR}/.. +--- taglib/CMakeLists.txt.orig 2012-07-14 15:53:09.000000000 -0400 ++++ taglib/CMakeLists.txt 2012-07-14 21:34:40.000000000 -0400 +@@ -25,6 +25,10 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/xm ) -+ + +if(HAVE_LIBRCC) + INCLUDE_DIRECTORIES(${RCC_INCLUDE_DIR}) +endif(HAVE_LIBRCC) + if(ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - endif(ZLIB_FOUND) -@@ -119,6 +119,7 @@ + include_directories(${ZLIB_INCLUDE_DIR}) + endif() +@@ -35,6 +39,7 @@ + audioproperties.h + taglib_export.h + ${CMAKE_BINARY_DIR}/taglib_config.h ++ toolkit/rccpatch.h + toolkit/taglib.h + toolkit/tstring.h + toolkit/tlist.h +@@ -267,6 +272,7 @@ ) - SET(toolkit_SRCS -+toolkit/rccpatch.cpp - toolkit/tstring.cpp - toolkit/tstringlist.cpp - toolkit/tbytevector.cpp -@@ -140,7 +141,7 @@ + set(toolkit_SRCS ++ toolkit/rccpatch.cpp + toolkit/tstring.cpp + toolkit/tstringlist.cpp + toolkit/tbytevector.cpp +@@ -297,6 +303,10 @@ + target_link_libraries(tag ${ZLIB_LIBRARIES}) + endif() - ADD_LIBRARY(tag SHARED ${tag_LIB_SRCS}) - --TARGET_LINK_LIBRARIES(tag ) -+TARGET_LINK_LIBRARIES(tag ${RCC_LIBRARIES}) - if(ZLIB_FOUND) - TARGET_LINK_LIBRARIES(tag ${ZLIB_LIBRARIES}) - endif(ZLIB_FOUND) ++if(HAVE_LIBRCC) ++ target_link_libraries(tag ${RCC_LIBRARIES}) ++endif() ++ + set_target_properties(tag PROPERTIES + VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH} + SOVERSION ${TAGLIB_SOVERSION_MAJOR} --- 2012-09-06-taglib.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1346981664.414638.43342>