*Updated Taglib to version 1.4, closing ticket 1828. The patch for 1.3 applied cleanly.

*Added some svn:ignore, so svn status is now clean
*fransman suggested some additions to CREDITS

livesupport/CREDITS

@@ -6,9 +6,11 @@ Janos Csikos
 Mark Kretschmann
 Ian Monroe
 Mugur Rus
+Tomáš Hlava
 
 Version 1.0
 -----------
 Akos Maroy
 Ferenc Gerlits
-
+Sebastian Göbel
+Tomáš Hlava

livesupport/bin/dist.sh

@@ -189,7 +189,7 @@ curl_version=curl-7.12.3
 curl_tmpdir=$tools_tmpdir/curl
 
 taglib_dir=$toolsdir/taglib
-taglib_version=taglib-1.3.1
+taglib_version=taglib-1.4
 taglib_tmpdir=$tools_tmpdir/taglib
 
 pear_dir=$toolsdir/pear

livesupport/etc/Makefile.in

@@ -123,7 +123,7 @@ ICU_VERSION       = icu-3.0
 CURL_DIR          = ${TOOLS_DIR}/curl
 CURL_VERSION      = curl-7.12.3
 TAGLIB_DIR        = ${TOOLS_DIR}/taglib
-TAGLIB_VERSION    = taglib-1.3.1
+TAGLIB_VERSION    = taglib-1.4
 PEAR_DIR          = ${TOOLS_DIR}/pear
 
 MODULES_DIR            = ${SRC_DIR}/modules

livesupport/etc/configure.ac

@@ -520,7 +520,7 @@ by LiveSupport:
     lcov 1.3                   yes
     libodbc++ 0.2.3            yes
     libxml++ 2.8.1             ${COMPILE_LIBXMLPP}
-    taglib 1.3.1               yes
+    taglib 1.4                 yes
     xmlrpc++ 2004-07-13        yes
 
 

livesupport/src/tools/taglib/taglib-1.4/bin/prepare.sh

@@ -30,7 +30,7 @@
 # For more information on taglib,
 # see http://freshmeat.net/redir/taglib/47265/url_homepage/taglib
 #-------------------------------------------------------------------------------
-product=taglib-1.3.1
+product=taglib-1.4
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
@@ -49,7 +49,8 @@ cd ${tmpdir}
 if [ ! -d $product ]; then
     tar xfz ${tar}
     cd $product
-    # see https://bugs.kde.org/show_bug.cgi?id=112728
+    # see https://bugs.kde.org/show_bug.cgi?id=112728 
+    # and http://mail.kde.org/pipermail/taglib-devel/2005-June/000149.html
     patch -p1 < $etcdir/taglib-1.3.1-length-in-microseconds.patch
 fi
 

livesupport/src/tools/taglib/taglib-1.4/etc/Makefile.in

@@ -49,7 +49,7 @@ COVERAGE_DIR = ${DOC_DIR}/coverage
 ETC_DIR      = ${BASE_DIR}/etc
 TMP_DIR      = ${BASE_DIR}/tmp
 
-TAGLIB_VERSION    = taglib-1.3.1
+TAGLIB_VERSION    = taglib-1.4
 TAGLIB_DIR        = ${TMP_DIR}/${TAGLIB_VERSION}
 
 prefix = @prefix@

livesupport/src/tools/taglib/taglib-1.4/etc/configure.ac

@@ -32,18 +32,18 @@ dnl This is due to the fact that configure spreads a lot of trash around,
 dnl like atom4te cache directories, config.* files, etc. into the directory
 dnl it is being run from. We clearly don't want these in our base directory.
 dnl-----------------------------------------------------------------------------
-AC_INIT(taglib, 1.3.1, bugs@campware.org)
+AC_INIT(taglib, 1.4, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
 AC_REVISION($Revision$)
 
-AC_CONFIG_SRCDIR(../src/taglib-1.3.1.tar.gz)
+AC_CONFIG_SRCDIR(../src/taglib-1.4.tar.gz)
 
 
 dnl untar the sources before anything happens
 ../bin/prepare.sh
 
-cd ../tmp/taglib-1.3.1
+cd ../tmp/taglib-1.4
 ./configure --prefix=$prefix
 cd -