Update to 1.7.

Manually increase shlib minor in CMake files since upstream
didn't react to my question why it went down with this release.

TagLib 1.7 (Mar 11, 2011)
=========================

1.7:

 * Fixed memory leaks in the FLAC file format parser.
 * Fixed bitrate calculation for WAV files.

1.7 RC1:

 * Support for reading/writing tags from Monkey's Audio files. (BUG:210404)
 * Support for reading/writing embedded pictures from WMA files.
 * Support for reading/writing embedded pictures from FLAC files (BUG:218696).
 * Implemented APE::Tag::isEmpty() to check for all APE tags, not just the
   basic ones.
 * Added reading of WAV audio length. (BUG:116033)
 * Exposed FLAC MD5 signature of the uncompressed audio stream via
   FLAC::Properties::signature(). (BUG:160172)
 * Added function ByteVector::toHex() for hex-encoding of byte vectors.
 * WavPack reader now tries to get the audio length by finding the final
   block, if the header doesn't have the information. (BUG:258016)
 * Fixed a memory leak in the ID3v2.2 PIC frame parser. (BUG:257007)
 * Fixed writing of RIFF files with even chunk sizes. (BUG:243954)
 * Fixed compilation on MSVC 2010.
 * Removed support for building using autoconf/automake.
 * API docs can be now built using "make docs".

4 files changed, 38 insertions, 16 deletions

diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 98b9b81986c..3307a9b9603 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/07/10 07:56:06 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2011/05/21 15:13:20 wiz Exp $
 #
 
-DISTNAME=	taglib-1.6.3
-PKGREVISION=	1
+DISTNAME=	taglib-1.7
 CATEGORIES=	audio
 MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
 
@@ -15,13 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-asf
-CONFIGURE_ARGS+=	--enable-mp4
-
+USE_CMAKE=		YES
+CMAKE_ARGS=		-DWITH_MP4=ON -DWITH_ASF=ON
 USE_LIBTOOL=		YES
 
-PKGCONFIG_OVERRIDE=	bindings/c/taglib_c.pc.in taglib.pc.in
+PKGCONFIG_OVERRIDE=	bindings/c/taglib_c.pc.cmake taglib.pc.cmake
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/taglib/PLIST b/audio/taglib/PLIST
index 2f0091dd7b8..28ad83e065e 100644
--- a/audio/taglib/PLIST
+++ b/audio/taglib/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.11 2010/07/10 07:56:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2011/05/21 15:13:20 wiz Exp $
 bin/taglib-config
 include/taglib/aifffile.h
 include/taglib/aiffproperties.h
+include/taglib/apefile.h
 include/taglib/apefooter.h
 include/taglib/apeitem.h
+include/taglib/apeproperties.h
 include/taglib/apetag.h
 include/taglib/asfattribute.h
 include/taglib/asffile.h
+include/taglib/asfpicture.h
 include/taglib/asfproperties.h
 include/taglib/asftag.h
 include/taglib/attachedpictureframe.h
@@ -14,6 +17,8 @@ include/taglib/audioproperties.h
 include/taglib/commentsframe.h
 include/taglib/fileref.h
 include/taglib/flacfile.h
+include/taglib/flacmetadatablock.h
+include/taglib/flacpicture.h
 include/taglib/flacproperties.h
 include/taglib/generalencapsulatedobjectframe.h
 include/taglib/id3v1genres.h
@@ -75,7 +80,11 @@ include/taglib/wavpackproperties.h
 include/taglib/wavproperties.h
 include/taglib/xingheader.h
 include/taglib/xiphcomment.h
-lib/libtag.la
-lib/libtag_c.la
+lib/libtag.so
+lib/libtag.so.1
+lib/libtag.so.1.10.0
+lib/libtag_c.so
+lib/libtag_c.so.0
+lib/libtag_c.so.0.0.0
 lib/pkgconfig/taglib.pc
 lib/pkgconfig/taglib_c.pc
diff --git a/audio/taglib/distinfo b/audio/taglib/distinfo
index 641fdeb92e7..9ecac357d48 100644
--- a/audio/taglib/distinfo
+++ b/audio/taglib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2010/05/02 14:11:23 wiz Exp $
+$NetBSD: distinfo,v 1.13 2011/05/21 15:13:20 wiz Exp $
 
-SHA1 (taglib-1.6.3.tar.gz) = ee54f10c63f236ef1c29c82e39c227a75a7e3785
-RMD160 (taglib-1.6.3.tar.gz) = f5cd42cfa47102e92e70f0c4912563bffa829349
-Size (taglib-1.6.3.tar.gz) = 1127286 bytes
-SHA1 (patch-aa) = f1b1dd6686140cf64e59badc4601488b94c9f290
+SHA1 (taglib-1.7.tar.gz) = 5138e1665182bc2171e298ff31518c9ad72ddf23
+RMD160 (taglib-1.7.tar.gz) = 2030af5f61b1dcdeabfc86347c107d13a308a800
+Size (taglib-1.7.tar.gz) = 533974 bytes
+SHA1 (patch-CMakeLists.txt) = 677c262cd69b9643c328e59e3ede94a483a680bb
diff --git a/audio/taglib/patches/patch-CMakeLists.txt b/audio/taglib/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..344ae86f3bd
--- /dev/null
+++ b/audio/taglib/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2011/05/21 15:13:21 wiz Exp $
+
+Increase taglib minor version to be bigger than in the last automake
+release.
+
+--- CMakeLists.txt.orig	2011-03-11 13:15:38.000000000 +0000
++++ CMakeLists.txt
+@@ -39,7 +39,7 @@ if (WIN32)
+ endif (WIN32)
+ 
+ SET(TAGLIB_LIB_MAJOR_VERSION "1")
+-SET(TAGLIB_LIB_MINOR_VERSION "7")
++SET(TAGLIB_LIB_MINOR_VERSION "10")
+ SET(TAGLIB_LIB_PATCH_VERSION "0")
+ 
+ SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")