Changelog

https://bugs.kde.org/show_bug.cgi?id=278773

.astylerc

@@ -1,18 +0,0 @@
---suffix=none
---style=kr
---indent=spaces=2
---indent-col1-comments
---min-conditional-indent=0
---attach-extern-c
---attach-namespaces
---indent-namespaces
---pad-oper
---unpad-paren
---align-pointer=name
---align-reference=name
---max-instatement-indent=40
---break-closing-brackets
---remove-brackets
---convert-tabs
---max-code-length=100
---break-after-logical

.editorconfig

@@ -1,21 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Non-specified newlines with a newline ending every file
-[*]
-insert_final_newline = true
-
-# 2 space indentation
-[*.{h,cpp,tcc,cmake,yml}]
-indent_style = space
-indent_size = 2
-
-# Trim traling whitespaces
-[*.{h,cpp,tcc,cmake,yml}]
-trim_trailing_whitespace = true
-
-# UTF-8 without BOM
-[*]
-charset = utf-8

.gitignore

@@ -1,46 +0,0 @@
-cmake_install.cmake
-cmake_uninstall.cmake
-Makefile
-CTestTestfile.cmake
-CMakeFiles/
-*.so
-*.so.*
-*.dylib
-*.vcproj
-*.ncb
-*.sln
-*.suo
-*.user
-.*
-*~
-/CMakeCache.txt
-/Doxyfile
-/config.h
-/taglib.pc
-/tests/test_runner
-/tests/Testing
-/taglib_config.h
-/taglib-config
-/bindings/c/taglib_c.pc
-/bindings/c/Debug
-/bindings/c/MinSizeRel
-/bindings/c/Release
-/bindings/c/tag_c.dir/Debug
-/bindings/c/tag_c.dir/MinSizeRel
-/bindings/c/tag_c.dir/Release
-/examples/framelist
-/examples/strip-id3v1
-/examples/tagreader
-/examples/tagreader_c
-/examples/tagwriter
-/doc/html
-/taglib/Debug
-/taglib/MinSizeRel
-/taglib/Release
-/taglib/tag.dir/Debug
-/taglib/tag.dir/MinSizeRel
-/taglib/tag.dir/Release
-/ALL_BUILD.dir
-/ZERO_CHECK.dir
-taglib.xcodeproj
-CMakeScripts

.travis.yml

@@ -1,28 +0,0 @@
-language: cpp
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
-
-addons:
-  apt:
-    packages:
-      - libcppunit-dev
-      - zlib1g-dev
-
-matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
-
-install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cppunit; fi
-
-script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON . && make && make check
-

AUTHORS

@@ -1,17 +1,11 @@
 Scott Wheeler <wheeler@kde.org>
  Author, maintainer
-Lukas Lalinsky <lalinsky@gmail.com>
- Implementation of multiple new file formats, many bug fixes, maintainer
-Tsuda Kageyu <tsuda.kageyu@gmail.com>
- A lot of bug fixes and performance improvements, maintainer.
 Ismael Orenstein <orenstein@kde.org>
  Xing header implementation
 Allan Sandfeld Jensen <kde@carewolf.org>
  FLAC metadata implementation
 Teemu Tervo <teemu.tervo@gmx.net>
  Numerous bug reports and fixes
-Mathias Panzenböck <grosser.meister.morti@gmx.net>
- Mod, S3M, IT and XM metadata implementations
 
 Please send all patches and questions to taglib-devel@kde.org rather than to
 individual developers!

CMakeLists.txt

@@ -1,164 +1,82 @@
-cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
-
 project(taglib)
 
-if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.12)
-  cmake_policy(SET CMP0022 OLD)
-endif()
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+OPTION(ENABLE_STATIC "Make static version of libtag"  OFF)
 
-if(DEFINED ENABLE_STATIC)
-  message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
-endif()
+OPTION(BUILD_TESTS "Build the test suite"  OFF)
+OPTION(BUILD_EXAMPLES "Build the examples"  OFF)
 
-option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-if(NOT BUILD_SHARED_LIBS)
-  add_definitions(-DTAGLIB_STATIC)
-endif()
-option(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically" OFF)
-
-option(ENABLE_CCACHE "Use ccache when building libtag" OFF)
-if(ENABLE_CCACHE)
-  find_program(CCACHE_FOUND ccache)
-  if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-  endif()
-endif()
-
-option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
-if(VISIBILITY_HIDDEN)
-  add_definitions(-fvisibility=hidden)
-endif()
-
-option(BUILD_TESTS "Build the test suite" OFF)
-option(BUILD_EXAMPLES "Build the examples" OFF)
-option(BUILD_BINDINGS "Build the bindings" ON)
-
-option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF)
+OPTION(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
+OPTION(WITH_ASF "Enable ASF tag reading/writing code"  OFF)
+OPTION(WITH_MP4 "Enable MP4 tag reading/writing code"  OFF)
 
 add_definitions(-DHAVE_CONFIG_H)
-set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
 
+#add some KDE specific stuff
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directory for executables and libraries" FORCE)
+#
 ## the following are directories where stuff will be installed to
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
-set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Base directory for executables and libraries")
-set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)")
-set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})")
-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix")
+set(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"    CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)" FORCE)
+set(LIB_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"             CACHE PATH "The subdirectory to the header prefix" FORCE)
 
-if(APPLE)
-  option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
-  set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.")
-endif()
+if (CMAKE_COMPILER_IS_GNUCXX)
+   if (CMAKE_SYSTEM_NAME MATCHES Linux)
+     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
+   endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+endif (CMAKE_COMPILER_IS_GNUCXX)
+if(MSVC)
+  if (MSVC_VERSION GREATER 1399)
+    # If using Visual C++ 2005 (MSVC80) and greater (MSVC_VERSION=1400)
+    add_definitions(/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /Zc:wchar_t-)
+  endif (MSVC_VERSION GREATER 1399)
+endif(MSVC)
+if (WIN32)
+  set(CMAKE_DEBUG_POSTFIX "d")
+endif (WIN32)
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif()
+SET(TAGLIB_LIB_MAJOR_VERSION "1")
+SET(TAGLIB_LIB_MINOR_VERSION "7")
+SET(TAGLIB_LIB_PATCH_VERSION "2")
 
-if(MSVC AND ENABLE_STATIC_RUNTIME)
-  foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-  endforeach(flag_var)
-endif()
+SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
 
-# Read version information from file taglib/toolkit/taglib.h into variables
-# TAGLIB_LIB_MAJOR_VERSION, TAGLIB_LIB_MINOR_VERSION, TAGLIB_LIB_PATCH_VERSION.
-foreach(version_part MAJOR MINOR PATCH)
-  set(version_var_name "TAGLIB_${version_part}_VERSION")
-  file(STRINGS taglib/toolkit/taglib.h version_line
-       REGEX "^#define +${version_var_name}")
-  if(NOT version_line)
-    message(FATAL_ERROR "${version_var_name} not found in taglib.h")
-  endif()
-  string(REGEX MATCH "${version_var_name} +([^ ]+)" result ${version_line})
-  set(TAGLIB_LIB_${version_part}_VERSION ${CMAKE_MATCH_1})
-endforeach(version_part)
-
-# Only used to force cmake rerun when taglib.h changes.
-configure_file(taglib/toolkit/taglib.h ${CMAKE_CURRENT_BINARY_DIR}/taglib.h.stamp)
-
-if("${TAGLIB_LIB_PATCH_VERSION}" EQUAL "0")
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}")
-else()
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
-endif()
-
-# 1. If the library source code has changed at all since the last update, then increment revision.
-# 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
-# 3. If any interfaces have been added since the last public release, then increment age.
-# 4. If any interfaces have been removed since the last public release, then set age to 0.
-set(TAGLIB_SOVERSION_CURRENT  18)
-set(TAGLIB_SOVERSION_REVISION 0)
-set(TAGLIB_SOVERSION_AGE      17)
-
-math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
 
 include(ConfigureChecks.cmake)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config )
+
 if(NOT WIN32)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config")
-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}")
-endif()
-
-if(WIN32)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmd.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd")
-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${BIN_INSTALL_DIR}")
-endif()
-
-if(NOT BUILD_FRAMEWORK)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-endif()
-
-if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
-  set(HAVE_ZLIB 1)
-  set(HAVE_ZLIB_SOURCE 1)
-endif()
-
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
+endif(NOT WIN32)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 if(WITH_ASF)
-  set(TAGLIB_WITH_ASF TRUE)
-endif()
+    set(TAGLIB_WITH_ASF TRUE)
+endif(WITH_ASF)
 if(WITH_MP4)
-  set(TAGLIB_WITH_MP4 TRUE)
-endif()
+    set(TAGLIB_WITH_MP4 TRUE)
+endif(WITH_MP4)
+configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h )
+install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
 
-option(TRACE_IN_RELEASE "Output debug messages even in release mode" OFF)
-if(TRACE_IN_RELEASE)
-  set(TRACE_IN_RELEASE TRUE)
-endif()
+ADD_SUBDIRECTORY( taglib ) 
 
-configure_file(taglib/taglib_config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h")
+ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(examples)
 
-add_subdirectory(taglib)
+ADD_SUBDIRECTORY(bindings)
+if(NOT WIN32)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+endif(NOT WIN32)
 
-if(BUILD_BINDINGS)
-  add_subdirectory(bindings)
-endif()
+INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
 
-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
-if(BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 file(COPY doc/taglib.png DESTINATION doc)
-add_custom_target(docs doxygen)
+ADD_CUSTOM_TARGET(docs doxygen)
 
-# uninstall target
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
-
-if(NOT TARGET uninstall)
-  add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-endif()

ConfigureChecks.cmake

@@ -1,248 +1,28 @@
+# NOTE: only add something here if it is really needed by all of kdelibs.
+#     Otherwise please prefer adding to the relevant config-foo.h.cmake file,
+#     and the CMakeLists.txt that generates it (or a separate ConfigureChecks.make file if you prefer)
+#     to minimize recompilations and increase modularity.
+
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckSymbolExists)
+include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
 
-# Check if the size of numeric types are suitable.
+#check for libz using the cmake supplied FindZLIB.cmake
+FIND_PACKAGE(ZLIB)
 
-check_type_size("short" SIZEOF_SHORT)
-if(NOT ${SIZEOF_SHORT} EQUAL 2)
-  message(FATAL_ERROR "TagLib requires that short is 16-bit wide.")
-endif()
-
-check_type_size("int" SIZEOF_INT)
-if(NOT ${SIZEOF_INT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
-endif()
-
-check_type_size("long long" SIZEOF_LONGLONG)
-if(NOT ${SIZEOF_LONGLONG} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")
-endif()
-
-check_type_size("wchar_t" SIZEOF_WCHAR_T)
-if(${SIZEOF_WCHAR_T} LESS 2)
-  message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.")
-endif()
-
-check_type_size("float" SIZEOF_FLOAT)
-if(NOT ${SIZEOF_FLOAT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that float is 32-bit wide.")
-endif()
-
-check_type_size("double" SIZEOF_DOUBLE)
-if(NOT ${SIZEOF_DOUBLE} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
-endif()
-
-# Enable check_cxx_source_compiles() to work with Boost "header-only" libraries.
-
-find_package(Boost)
-if(Boost_FOUND)
-  set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${Boost_INCLUDE_DIRS}")
-endif()
-
-# Determine which kind of atomic operations your compiler supports.
-
-check_cxx_source_compiles("
-  #include <atomic>
-  int main() {
-    std::atomic<unsigned int> x;
-    x.fetch_add(1);
-    x.fetch_sub(1);
-    return 0;
-  }
-" HAVE_STD_ATOMIC)
-
-if(NOT HAVE_STD_ATOMIC)
-  find_package(Boost COMPONENTS atomic)
-  if(Boost_ATOMIC_FOUND)
-    set(HAVE_BOOST_ATOMIC 1)
-  else()
-    set(HAVE_BOOST_ATOMIC 0)
-  endif()
-
-  if(NOT HAVE_BOOST_ATOMIC)
-    check_cxx_source_compiles("
-      int main() {
-        volatile int x;
-        __sync_add_and_fetch(&x, 1);
-        int y = __sync_sub_and_fetch(&x, 1);
-        return 0;
-      }
-    " HAVE_GCC_ATOMIC)
-
-    if(NOT HAVE_GCC_ATOMIC)
-      check_cxx_source_compiles("
-        #include <libkern/OSAtomic.h>
-        int main() {
-          volatile int32_t x;
-          OSAtomicIncrement32Barrier(&x);
-          int32_t y = OSAtomicDecrement32Barrier(&x);
-          return 0;
-        }
-      " HAVE_MAC_ATOMIC)
-
-      if(NOT HAVE_MAC_ATOMIC)
-        check_cxx_source_compiles("
-          #include <windows.h>
-          int main() {
-            volatile LONG x;
-            InterlockedIncrement(&x);
-            LONG y = InterlockedDecrement(&x);
-            return 0;
-          }
-        " HAVE_WIN_ATOMIC)
-
-        if(NOT HAVE_WIN_ATOMIC)
-          check_cxx_source_compiles("
-            #include <ia64intrin.h>
-            int main() {
-              volatile int x;
-              __sync_add_and_fetch(&x, 1);
-              int y = __sync_sub_and_fetch(&x, 1);
-              return 0;
-            }
-          " HAVE_IA64_ATOMIC)
-        endif()
-      endif()
-    endif()
-  endif()
-endif()
-
-# Determine which kind of byte swap functions your compiler supports.
-
-check_cxx_source_compiles("
-  #include <boost/endian/conversion.hpp>
-  int main() {
-    boost::endian::endian_reverse(static_cast<uint16_t>(1));
-    boost::endian::endian_reverse(static_cast<uint32_t>(1));
-    boost::endian::endian_reverse(static_cast<uint64_t>(1));
-    return 0;
-  }
-" HAVE_BOOST_BYTESWAP)
-
-if(NOT HAVE_BOOST_BYTESWAP)
-  check_cxx_source_compiles("
-    int main() {
-      __builtin_bswap16(0);
-      __builtin_bswap32(0);
-      __builtin_bswap64(0);
-      return 0;
-    }
-  " HAVE_GCC_BYTESWAP)
-
-  if(NOT HAVE_GCC_BYTESWAP)
-    check_cxx_source_compiles("
-      #include <byteswap.h>
-      int main() {
-        __bswap_16(0);
-        __bswap_32(0);
-        __bswap_64(0);
-        return 0;
-      }
-    " HAVE_GLIBC_BYTESWAP)
-
-    if(NOT HAVE_GLIBC_BYTESWAP)
-      check_cxx_source_compiles("
-        #include <stdlib.h>
-        int main() {
-          _byteswap_ushort(0);
-          _byteswap_ulong(0);
-          _byteswap_uint64(0);
-          return 0;
-        }
-      " HAVE_MSC_BYTESWAP)
-
-      if(NOT HAVE_MSC_BYTESWAP)
-        check_cxx_source_compiles("
-          #include <libkern/OSByteOrder.h>
-          int main() {
-            OSSwapInt16(0);
-            OSSwapInt32(0);
-            OSSwapInt64(0);
-            return 0;
-          }
-        " HAVE_MAC_BYTESWAP)
-
-        if(NOT HAVE_MAC_BYTESWAP)
-          check_cxx_source_compiles("
-            #include <sys/endian.h>
-            int main() {
-              swap16(0);
-              swap32(0);
-              swap64(0);
-              return 0;
-            }
-          " HAVE_OPENBSD_BYTESWAP)
-        endif()
-      endif()
-    endif()
-  endif()
-endif()
-
-# Determine whether your compiler supports some safer version of vsprintf.
-
-check_cxx_source_compiles("
-  #include <cstdio>
-  #include <cstdarg>
-  int main() {
-    char buf[20];
-    va_list args;
-    vsnprintf(buf, 20, \"%d\", args);
-    return 0;
-  }
-" HAVE_VSNPRINTF)
-
-if(NOT HAVE_VSNPRINTF)
-  check_cxx_source_compiles("
-    #include <cstdio>
-    #include <cstdarg>
-    int main() {
-      char buf[20];
-      va_list args;
-      vsprintf_s(buf, \"%d\", args);
-      return 0;
-    }
-  " HAVE_VSPRINTF_S)
-endif()
-
-# Determine whether your compiler supports ISO _strdup.
-
-check_cxx_source_compiles("
-  #include <cstring>
-  int main() {
-    _strdup(0);
-    return 0;
-  }
-" HAVE_ISO_STRDUP)
-
-# Determine whether zlib is installed.
-
-if(NOT ZLIB_SOURCE)
-  find_package(ZLIB)
-  if(ZLIB_FOUND)
-    set(HAVE_ZLIB 1)
-  else()
-    set(HAVE_ZLIB 0)
-  endif()
-
-  if(NOT HAVE_ZLIB)
-    find_package(Boost COMPONENTS iostreams zlib)
-    if(Boost_IOSTREAMS_FOUND AND Boost_ZLIB_FOUND)
-      set(HAVE_BOOST_ZLIB 1)
-    else()
-      set(HAVE_BOOST_ZLIB 0)
-    endif()
-  endif()
-endif()
-
-# Determine whether CppUnit is installed.
-
-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  find_package(CppUnit)
-  if(NOT CppUnit_FOUND)
-    message(STATUS "CppUnit not found, disabling tests.")
-    set(BUILD_TESTS OFF)
-  endif()
-endif()
+IF(ZLIB_FOUND)
+	SET(HAVE_ZLIB 1)
+ELSE(ZLIB_FOUND)
+	SET(HAVE_ZLIB 0)
+ENDIF(ZLIB_FOUND)
 
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+FIND_PACKAGE(CppUnit)
+IF (NOT CppUnit_FOUND AND BUILD_TESTS)
+	MESSAGE(STATUS "CppUnit not found, disabling tests.")
+	SET(BUILD_TESTS OFF)
+ENDIF(NOT CppUnit_FOUND AND BUILD_TESTS)

INSTALL

@@ -5,155 +5,21 @@ TagLib uses the CMake build system. As a user, you will most likely want to
 build TagLib in release mode and install it into a system-wide location.
 This can be done using the following commands:
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_RELEASE_TYPE=Release .
   make
   sudo make install
 
-In order to build the included examples, use the BUILD_EXAMPLES option:
+Some file formats in TagLib are not enabled by default, you can compile
+support for MP4 and WMA using the following options:
 
-  cmake -DBUILD_EXAMPLES=ON [...]
+  cmake -DWITH_MP4=ON -DWITH_ASF=ON [...]
+
+If you want to run the test suite to make sure TagLib works properly on your
+system, you need to have cppunit installed. The test suite has a custom target
+in the build system, so you can run the tests using make:
+
+  make check
 
 See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
 running CMake.
 
-Mac OS X
---------
-
-On Mac OS X, you might want to build a framework that can be easily integrated
-into your application. If you set the BUILD_FRAMEWORK option on, it will compile
-TagLib as a framework. For example, the following command can be used to build
-an Universal Binary framework with Mac OS X 10.4 as the deployment target:
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_FRAMEWORK=ON \
-    -DCMAKE_C_COMPILER=/usr/bin/gcc-4.0 \
-    -DCMAKE_CXX_COMPILER=/usr/bin/c++-4.0 \
-    -DCMAKE_OSX_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk/ \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.4 \
-    -DCMAKE_OSX_ARCHITECTURES="ppc;i386;x86_64"
-
-For a 10.6 Snow Leopard static library with both 32-bit and 64-bit code, use:
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \
-    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DCMAKE_INSTALL_PREFIX="<folder you want to build to>"
-
-After 'make', and 'make install', add libtag.a to your XCode project, and add
-the include folder to the project's User Header Search Paths.
-
-Windows
--------
-
-It's Windows ... Systems vary!
-This means you need to adjust things to suit your system, especially paths.
-
-Tested with:
-  Microsoft Visual Studio 2010
-  Gcc by mingw-w64.sf.net v4.6.3 (Strawberry Perl 32b)
-  MinGW32-4.8.0
-
-Requirements:
-  1. Tool chain, Build Environment, Whatever ya want to call it ...
-     Installed and working.
-  2. CMake program. (Available at: www.cmake.org)
-     Installed and working.
-
-Optional:
-  1. Zlib library.
-     Available in some Tool Chains, Not all.
-     Search the web, Take your choice.
-
-Useful configuration options used with CMake (GUI and/or Command line):
-  Any of the ZLIB_ variables may be used at the command line, ZLIB_ROOT is only
-  available on the Command line.
-  ZLIB_ROOT=            Where to find ZLib's root directory.
-                        Assumes parent of: \include and \lib.
-  ZLIB_INCLUDE_DIR=     Where to find ZLib's Include directory.
-  ZLIB_LIBRARY=         Where to find ZLib's Library.
-  ZLIB_SOURCE=          Where to find ZLib's Source Code.
-                        Alternative to ZLIB_INCLUDE_DIR and ZLIB_LIBRARY.
-  CMAKE_INSTALL_PREFIX= Where to install Taglib.
-  CMAKE_BUILD_TYPE=     Release, Debug, etc ... (Not available in MSVC)
-
-The easiest way is at the Command Prompt.
-  MSVS Command Prompt for MSVS Users.
-  (Batch file and/or Shortcuts are your friends)
-
-  1. Build the Makefiles:
-       Replace "GENERATOR" with your needs.
-       For MSVS : "Visual Studio X" where X is the single or two digit version.
-       For MinGW: "MinGW Makefiles"
-
-       C:\GitRoot\taglib> cmake -G "GENERATOR" -DCMAKE_INSTALL_PREFIX=C:\Libraries\taglib
-
-     Or use the CMake GUI:
-       1. Open CMake GUI.
-       2. Set Paths.
-          "Where is the source code" and "Where to build the binaries"
-          Example, Both would be: C:\GitRoot\taglib
-       3. Tick: Advanced
-       4. Select: Configure
-       5. Select: Generator
-       6. Tick: Use default native compilers
-       7. Select: Finish
-       Wait until done.
-       5. If using ZLib, Scroll down.
-          (to the bottom of the list of options ... should go over them all)
-          1. Edit: ZLIB_INCLUDE_DIR
-          2. Edit: ZLIB_LIBRARY
-       6. Select: Generate
-
-  2. Build the project:
-       MSVS:
-         C:\GitRoot\taglib> msbuild all_build.vcxproj /p:Configuration=Release
-           OR (Depending on MSVS version or personal choice)
-         C:\GitRoot\taglib> devenv all_build.vcxproj /build Release
-       MinGW:
-         C:\GitRoot\taglib> gmake
-           OR (Depending on MinGW install)
-         C:\GitRoot\taglib> mingw32-make
-
-     Or in the MSVS GUI:
-       1. Open MSVS.
-       2. Open taglib solution.
-       3. Set build type to: Release (look in the tool bars)
-       2. Hit F7 to build the solution. (project)
-
-  3. Install the project:
-       (Change 'install' to 'uninstall' to uninstall the project)
-       MSVS:
-         C:\GitRoot\taglib> msbuild install.vcxproj
-           OR (Depending on MSVC version or personal choice)
-         C:\GitRoot\taglib> devenv install.vcxproj
-       MinGW:
-         C:\GitRoot\taglib> gmake install
-           OR (Depending on MinGW install)
-         C:\GitRoot\taglib> mingw32-make install
-
-     Or in the MSVS GUI:
-       1. Open project.
-       2. Open Solution Explorer.
-       3. Right Click: INSTALL
-       4. Select: Project Only
-       5. Select: Build Only INSTALL
-
-To build a static library, set the following two options with CMake.
-  -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
-
-Including ENABLE_STATIC_RUNTIME=ON indicates you want TagLib built using the
-static runtime library, rather than the DLL form of the runtime.
-
-Unit Tests
-----------
-
-If you want to run the test suite to make sure TagLib works properly on your
-system, you need to have cppunit installed. To build the tests, include
-the option -DBUILD_TESTS=on when running cmake.
-
-The test suite has a custom target in the build system, so you can run
-the tests using make:
-
-  make check
-

NEWS

@@ -1,177 +1,7 @@
-TagLib 1.11.1 (Oct 24, 2016)
-============================
+TagLib 1.7.3 (Jul 12, 2012)
+===========================
 
- * Fixed binary incompatible change in TagLib::String.
- * Fixed reading ID3v2 CTOC frames with a lot of entries.
- * Fixed seeking ByteVectorStream from the end.
-
-TagLib 1.11 (Apr 29, 2016)
-==========================
-
-1.11:
-
- * Fixed reading APE items with long keys.
- * Fixed reading ID3v2 SYLT frames when description is empty.
-
-1.11 BETA 2:
-
- * Better handling of PCM WAV files with a 'fact' chunk.
- * Better handling of corrupted APE tags.
- * Efficient decoding of unsynchronized ID3v2 frames.
- * Fixed text encoding when saving certain frames in ID3v2.3 tags.
- * Fixed updating the size of RIFF files when removing chunks.
- * Several smaller bug fixes and performance improvements.
-
-1.11 BETA:
-
- * New API for creating FileRef from IOStream.
- * Added support for ID3v2 PCST and WFED frames.
- * Added support for pictures in XiphComment.
- * Added String::clear().
- * Added FLAC::File::strip() for removing non-standard tags.
- * Added alternative functions to XiphComment::removeField().
- * Added BUILD_BINDINGS build option.
- * Added ENABLE_CCACHE build option.
- * Replaced ENABLE_STATIC build option with BUILD_SHARED_LIBS.
- * Better handling of duplicate ID3v2 tags in all kinds of files.
- * Better handling of duplicate tag chunks in WAV files.
- * Better handling of duplicate tag chunks in AIFF files.
- * Better handling of duplicate Vorbis comment blocks in FLAC files.
- * Better handling of broken MPEG audio frames.
- * Fixed crash when calling File::properties() after strip().
- * Fixed crash when parsing certain MPEG files.
- * Fixed crash when saving Ogg files.
- * Fixed possible file corruptions when saving ASF files.
- * Fixed possible file corruptions when saving FLAC files.
- * Fixed possible file corruptions when saving MP4 files.
- * Fixed possible file corruptions when saving MPEG files.
- * Fixed possible file corruptions when saving APE files.
- * Fixed possible file corruptions when saving Musepack files.
- * Fixed possible file corruptions when saving WavPack files.
- * Fixed updating the comment field of Vorbis comments.
- * Fixed reading date and time in ID3v2.3 tags.
- * Marked ByteVector::null and ByteVector::isNull() deprecated.
- * Marked String::null and String::isNull() deprecated.
- * Marked XiphComment::removeField() deprecated.
- * Marked Ogg::Page::getCopyWithNewPageSequenceNumber() deprecated. It returns null.
- * Marked custom integer types deprecated.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.10 (Nov 11, 2015)
-==========================
-
-1.10:
-
- * Added new options to the tagwriter example.
- * Fixed self-assignment operator in some types.
- * Fixed extraction of MP4 tag keys with an empty list.
-
-1.10 BETA:
-
- * New API for the audio length in milliseconds.
- * Added support for ID3v2 ETCO and SYLT frames.
- * Added support for album artist in PropertyMap API of MP4 files.
- * Added support for embedded frames in ID3v2 CHAP and CTOC frames.
- * Added support for AIFF-C files.
- * Better handling of duplicate ID3v2 tags in MPEG files.
- * Allowed generating taglib.pc on Windows.
- * Added ZLIB_SOURCE build option.
- * Fixed backwards-incompatible change in TagLib::String when constructing UTF16 strings.
- * Fixed crash when parsing certain FLAC files.
- * Fixed crash when encoding empty strings.
- * Fixed saving of certain XM files on OS X.
- * Changed Xiph and APE generic getters to return space-concatenated values.
- * Fixed possible file corruptions when removing tags from WAV files.
- * Added support for MP4 files with 64-bit atoms in certain 64-bit environments.
- * Prevented ID3v2 padding from being too large.
- * Fixed crash when parsing corrupted APE files.
- * Fixed crash when parsing corrupted WAV files.
- * Fixed crash when parsing corrupted Ogg FLAC files.
- * Fixed crash when parsing corrupted MPEG files.
- * Fixed saving empty tags in WAV files.
- * Fixed crash when parsing corrupted Musepack files.
- * Fixed possible memory leaks when parsing AIFF and WAV files.
- * Fixed crash when parsing corrupted MP4 files.
- * Stopped writing empty ID3v2 frames.
- * Fixed possible file corruptions when saving WMA files.
- * Added TagLib::MP4::Tag::isEmpty().
- * Added accessors to manipulate MP4 tags.
- * Fixed crash when parsing corrupted WavPack files.
- * Fixed seeking MPEG frames.
- * Fixed reading FLAC files with zero-sized padding blocks.
- * Added support for reading the encoder information of WMA files.
- * Added support for reading the codec of WAV files.
- * Added support for multi channel WavPack files.
- * Added support for reading the nominal bitrate of Ogg Speex files.
- * Added support for VBR headers in MPEG files.
- * Marked FLAC::File::streamInfoData() deprecated. It returns an empty ByteVector.
- * Marked FLAC::File::streamLength() deprecated. It returns zero.
- * Fixed possible file corruptions when adding an ID3v1 tag to FLAC files.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.9.1 (Oct 8, 2013)
-==========================
-
- * Fixed binary incompatible change in TagLib::Map and TagLib::List.
- * Fixed constructing String from ByteVector.
- * Fixed compilation on MSVC with the /Zc:wchar_t- option.
- * Fixed detecting of RIFF files with invalid chunk sizes.
- * Added TagLib::MP4::Properties::codec().
-
-TagLib 1.9 (Oct 6, 2013)
-========================
-
- * Added support for the Ogg Opus file format.
- * Added support for INFO tags in WAV files.
- * Changed FileStream to use Windows file API.
- * Included taglib-config.cmd script for Windows.
- * New ID3v1::Tag methods for working directly with genre numbers.
- * New MPEG::File methods for checking which tags are saved in the file.
- * Added support for the PropertyMap API to ASF and MP4 files.
- * Added MusicBrainz identifiers to the PropertyMap API.
- * Allowed reading of MP4 cover art without an explicitly specified format.
- * Better parsing of corrupted FLAC files.
- * Fixed saving of PropertyMap comments without description into ID3v2 tags.
- * Fixed crash when parsing certain XM files.
- * Fixed compilation of unit test with clang.
- * Better handling of files that can't be open or have read-only permissions.
- * Improved atomic reference counting.
- * New hookable API for debug messages.
- * More complete Windows install instructions.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.8 (Sep 6, 2012)
-========================
-
-1.8:
-
- * Added support for OWNE ID3 frames.
- * Changed key validation in the new PropertyMap API.
- * ID3v1::Tag::setStringHandler will no londer delete the previous handler,
-   the caller is responsible for this.
- * File objects will also no longer delete the passed IOStream objects. It
-   should be done in the caller code after the File object is no longer
-   used.
- * Added ID3v2::Tag::setLatin1StringHandler for custom handling of
-   latin1-encoded text in ID3v2 frames.
- * Fixed validation of ID3v2 frame IDs (IDs with '0' were ignored).
-
-1.8 BETA:
-
- * New API for accessing tags by name.
- * New abstract I/O stream layer to allow custom I/O handlers.
- * Support for writing ID3v2.3 tags.
- * Support for various module file formats (MOD, S3M, IT, XM).
- * Support for MP4 and ASF is now enabled by default.
- * Started using atomic int operations for reference counting.
- * Added methods for checking if WMA and MP4 files are DRM-protected.
- * Added taglib_free to the C bindings.
- * New method to allow removing pictures from FLAC files.
- * Support for reading audio properties from ALAC and Musepack SV8 files.
- * Added replay-gain information to Musepack audio properties.
- * Support for APEv2 binary tags.
- * Many AudioProperties subclasses now provide information about the total number of samples.
- * Various small bug fixes.
+ * Fixed crash when parsing ID3v2 tags from APE files (BUG:278773).
 
 TagLib 1.7.2 (Apr 20, 2012)
 ===========================

bindings/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(c) 
+ADD_SUBDIRECTORY( c ) 

bindings/README

@@ -2,5 +2,5 @@ There are a few other people that have done bindings externally that I have
 been made aware of.  I have not personally reviewed these bindings, but I'm
 listing them here so that those who find them useful are able to find them:
 
-http://developer.kde.org/~wheeler/taglib.html#bindings
-
+- Ruby - http://www.hakubi.us/ruby-taglib/
+- Python - http://namingmuse.berlios.de/

bindings/c/CMakeLists.txt

@@ -1,37 +1,37 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/asf
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/vorbis
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpc
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mp4
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/toolkit
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/asf
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/vorbis
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/flac
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/flac
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpc
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mp4
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2/frames
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
 )
 
-set(tag_c_HDRS tag_c.h)
 
-add_library(tag_c tag_c.cpp ${tag_c_HDRS})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc )
+########### next target ###############
 
-target_link_libraries(tag_c tag)
-set_target_properties(tag_c PROPERTIES PUBLIC_HEADER "${tag_c_HDRS}")
-if(BUILD_FRAMEWORK)
-  set_target_properties(tag_c PROPERTIES FRAMEWORK TRUE)
-endif()
+ADD_LIBRARY(tag_c SHARED tag_c.cpp)
+if(ENABLE_STATIC)
+    set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
+endif(ENABLE_STATIC)
+
+TARGET_LINK_LIBRARIES(tag_c  tag )
 
 # On Solaris we need to explicitly add the C++ standard and runtime
 # libraries to the libs used by the C bindings, because those C bindings
 # themselves won't pull in the C++ libs -- and if a C application is
 # using the C bindings then we get link errors.
-check_library_exists(Crun __RTTI___ "" HAVE_CRUN_LIB)
-if(HAVE_CRUN_LIB)
+CHECK_LIBRARY_EXISTS(Crun __RTTI___ "" HAVE_CRUN_LIB)
+IF(HAVE_CRUN_LIB)
   # Which libraries to link depends critically on which
   # STL version is going to be used by your application
   # and which runtime is in use. While Crun is pretty much
@@ -40,29 +40,27 @@ if(HAVE_CRUN_LIB)
   # team supports stdcxx (Apache RogueWave stdcxx 4.1.3).
   
   # According to http://bugs.kde.org/show_bug.cgi?id=215225 the library can have the following two names:
-  find_library(ROGUEWAVE_STDCXX_LIBRARY NAMES stdcxx4 stdcxx)
-  if(NOT ROGUEWAVE_STDCXX_LIBRARY)
-    message(FATAL_ERROR "Did not find supported STL library (tried stdcxx4 and stdcxx)")
-  endif()
-  target_link_libraries(tag_c ${ROGUEWAVE_STDCXX_LIBRARY} Crun)
-endif()
+  FIND_LIBRARY(ROGUEWAVE_STDCXX_LIBRARY NAMES stdcxx4 stdcxx)
+  IF(NOT ROGUEWAVE_STDCXX_LIBRARY)
+    MESSAGE(FATAL_ERROR "Did not find supported STL library (tried stdcxx4 and stdcxx)")
+  ENDIF(NOT ROGUEWAVE_STDCXX_LIBRARY)
+  TARGET_LINK_LIBRARIES(tag_c ${ROGUEWAVE_STDCXX_LIBRARY} Crun)
+ENDIF(HAVE_CRUN_LIB)
 
-set_target_properties(tag_c PROPERTIES
+SET_TARGET_PROPERTIES(tag_c PROPERTIES
   VERSION 0.0.0
   SOVERSION 0
   DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
   INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
-)
-install(TARGETS tag_c
-	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+  )
+INSTALL(TARGETS tag_c
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
+	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
 )
 
-if(NOT BUILD_FRAMEWORK)
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-endif()
 
+########### install files ###############
+
+INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL( FILES  tag_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

bindings/c/tag_c.cpp

@@ -20,9 +20,11 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include "config.h"
 #endif
 
+#include "tag_c.h"
+
 #include <stdlib.h>
 #include <fileref.h>
 #include <tfile.h>
@@ -40,50 +42,20 @@
 #include <string.h>
 #include <id3v2framefactory.h>
 
-#include "tag_c.h"
-
 using namespace TagLib;
 
-namespace
-{
-  List<char *> strings;
-  bool unicodeStrings = true;
-  bool stringManagementEnabled = true;
-
-  char *stringToCharArray(const String &s)
-  {
-    const std::string str = s.to8Bit(unicodeStrings);
-
-#ifdef HAVE_ISO_STRDUP
-
-    return ::_strdup(str.c_str());
-
-#else
-
-    return ::strdup(str.c_str());
-
-#endif
-  }
-
-  String charArrayToString(const char *s)
-  {
-    return String(s, unicodeStrings ? String::UTF8 : String::Latin1);
-  }
-}
+static List<char *> strings;
+static bool unicodeStrings = true;
+static bool stringManagementEnabled = true;
 
 void taglib_set_strings_unicode(BOOL unicode)
 {
-  unicodeStrings = (unicode != 0);
+  unicodeStrings = bool(unicode);
 }
 
 void taglib_set_string_management_enabled(BOOL management)
 {
-  stringManagementEnabled = (management != 0);
-}
-
-void taglib_free(void* pointer)
-{
-  free(pointer);
+  stringManagementEnabled = bool(management);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -114,13 +86,19 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
     return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
   case TagLib_File_TrueAudio:
     return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
+#ifdef TAGLIB_WITH_MP4
   case TagLib_File_MP4:
     return reinterpret_cast<TagLib_File *>(new MP4::File(filename));
+#endif
+#ifdef TAGLIB_WITH_ASF
   case TagLib_File_ASF:
     return reinterpret_cast<TagLib_File *>(new ASF::File(filename));
+#endif
   default:
     return 0;
   }
+
+  return 0;
 }
 
 void taglib_file_free(TagLib_File *file)
@@ -130,7 +108,7 @@ void taglib_file_free(TagLib_File *file)
 
 BOOL taglib_file_is_valid(const TagLib_File *file)
 {
-  return reinterpret_cast<const File *>(file)->isValid();
+	return reinterpret_cast<const File *>(file)->isValid();
 }
 
 TagLib_Tag *taglib_file_tag(const TagLib_File *file)
@@ -157,7 +135,7 @@ BOOL taglib_file_save(TagLib_File *file)
 char *taglib_tag_title(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->title());
+  char *s = ::strdup(t->title().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -166,7 +144,7 @@ char *taglib_tag_title(const TagLib_Tag *tag)
 char *taglib_tag_artist(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->artist());
+  char *s = ::strdup(t->artist().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -175,7 +153,7 @@ char *taglib_tag_artist(const TagLib_Tag *tag)
 char *taglib_tag_album(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->album());
+  char *s = ::strdup(t->album().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -184,7 +162,7 @@ char *taglib_tag_album(const TagLib_Tag *tag)
 char *taglib_tag_comment(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->comment());
+  char *s = ::strdup(t->comment().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -193,7 +171,7 @@ char *taglib_tag_comment(const TagLib_Tag *tag)
 char *taglib_tag_genre(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->genre());
+  char *s = ::strdup(t->genre().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -214,31 +192,31 @@ unsigned int taglib_tag_track(const TagLib_Tag *tag)
 void taglib_tag_set_title(TagLib_Tag *tag, const char *title)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setTitle(charArrayToString(title));
+  t->setTitle(String(title, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_artist(TagLib_Tag *tag, const char *artist)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setArtist(charArrayToString(artist));
+  t->setArtist(String(artist, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_album(TagLib_Tag *tag, const char *album)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setAlbum(charArrayToString(album));
+  t->setAlbum(String(album, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_comment(TagLib_Tag *tag, const char *comment)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setComment(charArrayToString(comment));
+  t->setComment(String(comment, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_genre(TagLib_Tag *tag, const char *genre)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setGenre(charArrayToString(genre));
+  t->setGenre(String(genre, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_year(TagLib_Tag *tag, unsigned int year)
@@ -258,7 +236,7 @@ void taglib_tag_free_strings()
   if(!stringManagementEnabled)
     return;
 
-  for(List<char *>::ConstIterator it = strings.begin(); it != strings.end(); ++it)
+  for(List<char *>::Iterator it = strings.begin(); it != strings.end(); ++it)
     free(*it);
   strings.clear();
 }

bindings/c/tag_c.h

@@ -29,9 +29,7 @@
 extern "C" {
 #endif
 
-#if defined(TAGLIB_STATIC)
-#define TAGLIB_C_EXPORT
-#elif defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64)
 #ifdef MAKE_TAGLIB_C_LIB
 #define TAGLIB_C_EXPORT __declspec(dllexport)
 #else
@@ -81,11 +79,6 @@ TAGLIB_C_EXPORT void taglib_set_strings_unicode(BOOL unicode);
  */
 TAGLIB_C_EXPORT void taglib_set_string_management_enabled(BOOL management);
 
-/*!
- * Explicitly free a string returned from TagLib
- */
-TAGLIB_C_EXPORT void taglib_free(void* pointer);
-
 /*******************************************************************************
  * File API
  ******************************************************************************/
@@ -106,7 +99,7 @@ typedef enum {
 /*!
  * Creates a TagLib file based on \a filename.  TagLib will try to guess the file
  * type.
- *
+ * 
  * \returns NULL if the file type cannot be determined or the file cannot
  * be opened.
  */
@@ -124,7 +117,7 @@ TAGLIB_C_EXPORT TagLib_File *taglib_file_new_type(const char *filename, TagLib_F
 TAGLIB_C_EXPORT void taglib_file_free(TagLib_File *file);
 
 /*!
- * Returns true if the file is open and readable and valid information for
+ * Returns true if the file is open and readble and valid information for
  * the Tag and / or AudioProperties was found.
  */
 
@@ -137,7 +130,7 @@ TAGLIB_C_EXPORT BOOL taglib_file_is_valid(const TagLib_File *file);
 TAGLIB_C_EXPORT TagLib_Tag *taglib_file_tag(const TagLib_File *file);
 
 /*!
- * Returns a pointer to the audio properties associated with this file.  This
+ * Returns a pointer to the the audio properties associated with this file.  This
  * will be freed automatically when the file is freed.
  */
 TAGLIB_C_EXPORT const TagLib_AudioProperties *taglib_file_audioproperties(const TagLib_File *file);

bindings/c/taglib_c.pc.cmake

@@ -7,6 +7,6 @@ includedir=${INCLUDE_INSTALL_DIR}
 Name: TagLib C Bindings
 Description: Audio meta-data library (C bindings)
 Requires: taglib
-Version: ${TAGLIB_LIB_VERSION_STRING}
+Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
 Libs: -L${LIB_INSTALL_DIR} -ltag_c
 Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 

cmake_uninstall.cmake.in

@@ -1,21 +0,0 @@
-if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-endif()
-
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach (file ${files})
-  message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-  if (EXISTS "$ENV{DESTDIR}${file}")
-    execute_process(
-      COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
-      OUTPUT_VARIABLE rm_out
-      RESULT_VARIABLE rm_retval
-    )
-    if(NOT ${rm_retval} EQUAL 0)
-      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-    endif ()
-  else ()
-    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-  endif ()
-endforeach()

config-taglib.h.cmake

@@ -0,0 +1,11 @@
+/* config-taglib.h. Generated by cmake from config-taglib.h.cmake */
+
+/* NOTE: only add something here if it is really needed by all of kdelibs.
+   Otherwise please prefer adding to the relevant config-foo.h.cmake file,
+   to minimize recompilations and increase modularity. */
+/* Define if you have libz */
+#cmakedefine   HAVE_ZLIB 1
+
+#cmakedefine   NO_ITUNES_HACKS 1
+#cmakedefine   WITH_ASF 1
+#cmakedefine   WITH_MP4 1

config.h.cmake

@@ -1,33 +0,0 @@
-/* config.h. Generated by cmake from config.h.cmake */
-
-/* Defined if your compiler supports some byte swap functions */
-#cmakedefine   HAVE_BOOST_BYTESWAP 1
-#cmakedefine   HAVE_GCC_BYTESWAP 1
-#cmakedefine   HAVE_GLIBC_BYTESWAP 1
-#cmakedefine   HAVE_MSC_BYTESWAP 1
-#cmakedefine   HAVE_MAC_BYTESWAP 1
-#cmakedefine   HAVE_OPENBSD_BYTESWAP 1
-
-/* Defined if your compiler supports some atomic operations */
-#cmakedefine   HAVE_STD_ATOMIC 1
-#cmakedefine   HAVE_BOOST_ATOMIC 1
-#cmakedefine   HAVE_GCC_ATOMIC 1
-#cmakedefine   HAVE_MAC_ATOMIC 1
-#cmakedefine   HAVE_WIN_ATOMIC 1
-#cmakedefine   HAVE_IA64_ATOMIC 1
-
-/* Defined if your compiler supports some safer version of vsprintf */
-#cmakedefine   HAVE_VSNPRINTF 1
-#cmakedefine   HAVE_VSPRINTF_S 1
-
-/* Defined if your compiler supports ISO _strdup */
-#cmakedefine   HAVE_ISO_STRDUP 1
-
-/* Defined if zlib is installed */
-#cmakedefine   HAVE_ZLIB 1
-#cmakedefine   HAVE_BOOST_ZLIB 1
-
-/* Indicates whether debug messages are shown even in release mode */
-#cmakedefine   TRACE_IN_RELEASE 1
-
-#cmakedefine TESTS_DIR "@TESTS_DIR@"

examples/CMakeLists.txt

@@ -1,39 +1,50 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/
-)
+if(BUILD_EXAMPLES)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/  )
 
-if(NOT BUILD_SHARED_LIBS)
-  add_definitions(-DTAGLIB_STATIC)
-endif()
+if(ENABLE_STATIC)
+    add_definitions(-DTAGLIB_STATIC)
+endif(ENABLE_STATIC)
 
 ########### next target ###############
 
-add_executable(tagreader tagreader.cpp)
-target_link_libraries(tagreader tag)
+ADD_EXECUTABLE(tagreader tagreader.cpp)
+
+TARGET_LINK_LIBRARIES(tagreader  tag )
+
 
 ########### next target ###############
 
-add_executable(tagreader_c tagreader_c.c)
-target_link_libraries(tagreader_c tag_c)
+ADD_EXECUTABLE(tagreader_c tagreader_c.c)
+
+TARGET_LINK_LIBRARIES(tagreader_c  tag_c )
+
 
 ########### next target ###############
 
-add_executable(tagwriter tagwriter.cpp)
-target_link_libraries(tagwriter tag)
+ADD_EXECUTABLE(tagwriter tagwriter.cpp)
+
+TARGET_LINK_LIBRARIES(tagwriter  tag )
+
 
 ########### next target ###############
 
-add_executable(framelist framelist.cpp)
-target_link_libraries(framelist tag)
+ADD_EXECUTABLE(framelist framelist.cpp)
+
+TARGET_LINK_LIBRARIES(framelist  tag )
+
 
 ########### next target ###############
 
-add_executable(strip-id3v1 strip-id3v1.cpp)
-target_link_libraries(strip-id3v1 tag)
+ADD_EXECUTABLE(strip-id3v1 strip-id3v1.cpp)
+
+TARGET_LINK_LIBRARIES(strip-id3v1  tag )
+
+
+endif(BUILD_EXAMPLES)
 

examples/framelist.cpp

@@ -95,10 +95,7 @@ int main(int argc, char *argv[])
       for(APE::ItemListMap::ConstIterator it = ape->itemListMap().begin();
           it != ape->itemListMap().end(); ++it)
       {
-        if((*it).second.type() != APE::Item::Binary)
-          cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
-        else
-          cout << (*it).first << " - Binary data (" << (*it).second.binaryData().size() << " bytes)" << endl;
+        cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
       }
     }
     else

examples/tagreader.cpp

@@ -23,15 +23,20 @@
  */
 
 #include <iostream>
-#include <iomanip>
 #include <stdio.h>
 
 #include <fileref.h>
 #include <tag.h>
-#include <tpropertymap.h>
 
 using namespace std;
 
+TagLib::String formatSeconds(int seconds)
+{
+  char secondsString[3];
+  sprintf(secondsString, "%02i", seconds);
+  return secondsString;
+}
+
 int main(int argc, char *argv[])
 {
   for(int i = 1; i < argc; i++) {
@@ -44,7 +49,7 @@ int main(int argc, char *argv[])
 
       TagLib::Tag *tag = f.tag();
 
-      cout << "-- TAG (basic) --" << endl;
+      cout << "-- TAG --" << endl;
       cout << "title   - \"" << tag->title()   << "\"" << endl;
       cout << "artist  - \"" << tag->artist()  << "\"" << endl;
       cout << "album   - \"" << tag->album()   << "\"" << endl;
@@ -52,23 +57,6 @@ int main(int argc, char *argv[])
       cout << "comment - \"" << tag->comment() << "\"" << endl;
       cout << "track   - \"" << tag->track()   << "\"" << endl;
       cout << "genre   - \"" << tag->genre()   << "\"" << endl;
-
-      TagLib::PropertyMap tags = f.file()->properties();
-
-      unsigned int longest = 0;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        if (i->first.size() > longest) {
-          longest = i->first.size();
-        }
-      }
-
-      cout << "-- TAG (properties) --" << endl;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-          cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-        }
-      }
-
     }
 
     if(!f.isNull() && f.audioProperties()) {
@@ -82,7 +70,7 @@ int main(int argc, char *argv[])
       cout << "bitrate     - " << properties->bitrate() << endl;
       cout << "sample rate - " << properties->sampleRate() << endl;
       cout << "channels    - " << properties->channels() << endl;
-      cout << "length      - " << minutes << ":" << setfill('0') << setw(2) << seconds << endl;
+      cout << "length      - " << minutes << ":" << formatSeconds(seconds) << endl;
     }
   }
   return 0;

examples/tagwriter.cpp

@@ -23,7 +23,6 @@
  */
 
 #include <iostream>
-#include <iomanip>
 #include <string.h>
 
 #include <stdio.h>
@@ -35,7 +34,6 @@
 #include <fileref.h>
 #include <tfile.h>
 #include <tag.h>
-#include <tpropertymap.h>
 
 using namespace std;
 
@@ -67,32 +65,11 @@ void usage()
   cout << "  -g <genre>"   << endl;
   cout << "  -y <year>"    << endl;
   cout << "  -T <track>"   << endl;
-  cout << "  -R <tagname> <tagvalue>"   << endl;
-  cout << "  -I <tagname> <tagvalue>"   << endl;
-  cout << "  -D <tagname>"   << endl;
   cout << endl;
 
   exit(1);
 }
 
-void checkForRejectedProperties(const TagLib::PropertyMap &tags)
-{ // stolen from tagreader.cpp
-  if(tags.size() > 0) {
-    unsigned int longest = 0;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      if(i->first.size() > longest) {
-        longest = i->first.size();
-      }
-    }
-    cout << "-- rejected TAGs (properties) --" << endl;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-        cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-      }
-    }
-  }
-}
-
 int main(int argc, char *argv[])
 {
   TagLib::List<TagLib::FileRef> fileList;
@@ -117,7 +94,7 @@ int main(int argc, char *argv[])
       char field = argv[i][1];
       TagLib::String value = argv[i + 1];
 
-      TagLib::List<TagLib::FileRef>::ConstIterator it;
+      TagLib::List<TagLib::FileRef>::Iterator it;
       for(it = fileList.begin(); it != fileList.end(); ++it) {
 
         TagLib::Tag *t = (*it).tag();
@@ -144,29 +121,6 @@ int main(int argc, char *argv[])
         case 'T':
           t->setTrack(value.toInt());
           break;
-        case 'R':
-        case 'I':
-          if(i + 2 < argc) {
-            TagLib::PropertyMap map = (*it).file()->properties ();
-            if(field == 'R') {
-              map.replace(value, TagLib::String(argv[i + 2]));
-            }
-            else {
-              map.insert(value, TagLib::String(argv[i + 2]));
-            }
-            ++i;
-            checkForRejectedProperties((*it).file()->setProperties(map));
-          }
-          else {
-            usage();
-          }
-          break;
-        case 'D': {
-          TagLib::PropertyMap map = (*it).file()->properties();
-          map.erase(value);
-          checkForRejectedProperties((*it).file()->setProperties(map));
-          break;
-        }
         default:
           usage();
           break;
@@ -177,7 +131,7 @@ int main(int argc, char *argv[])
       usage();
   }
 
-  TagLib::List<TagLib::FileRef>::ConstIterator it;
+  TagLib::List<TagLib::FileRef>::Iterator it;
   for(it = fileList.begin(); it != fileList.end(); ++it)
     (*it).file()->save();
 

include/README

@@ -0,0 +1,16 @@
+These are only necessary at build-time when building the entire kdesupport module; they do not need to be installed on a running system.
+
+It can be regenerated by using something like the following from the taglib/taglib directory:
+
+for file in `find -type f -name "*\.h"`;
+do 
+  dir=`dirname $file`
+  strippeddir=`echo $dir | cut -c 3-`
+  base=`basename $file`
+  if test -z $strippeddir
+  then
+    echo "#include \"../taglib/$base\"" > ../include/$base
+  else
+    echo "#include \"../taglib/$strippeddir/$base\"" > ../include/$base
+  fi
+done

include/aifffile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aifffile.h"

include/aiffproperties.h

@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aiffproperties.h"

include/apefooter.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apefooter.h"

include/apeitem.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apeitem.h"

include/apetag.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apetag.h"

include/asfattribute.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asfattribute.h"

include/asffile.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asffile.h"

include/asfproperties.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asfproperties.h"

include/asftag.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asftag.h"

include/attachedpictureframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"

include/audioproperties.h

@@ -0,0 +1 @@
+#include "../taglib/audioproperties.h"

include/commentsframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/commentsframe.h"

include/fileref.h

@@ -0,0 +1 @@
+#include "../taglib/fileref.h"

include/flacfile.h

@@ -0,0 +1 @@
+#include "../taglib/flac/flacfile.h"

include/flacproperties.h

@@ -0,0 +1 @@
+#include "../taglib/flac/flacproperties.h"

include/generalencapsulatedobjectframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"

include/id3v1genres.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1genres.h"

include/id3v1tag.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1tag.h"

include/id3v2extendedheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"

include/id3v2footer.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2footer.h"

include/id3v2frame.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2frame.h"

include/id3v2framefactory.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2framefactory.h"

include/id3v2header.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2header.h"

include/id3v2synchdata.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2synchdata.h"

include/id3v2tag.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2tag.h"

include/mp4atom.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4atom.h"

include/mp4coverart.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4coverart.h"

include/mp4file.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4file.h"

include/mp4item.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4item.h"

include/mp4properties.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4properties.h"

include/mp4tag.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4tag.h"

include/mpcfile.h

@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcfile.h"

include/mpcproperties.h

@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcproperties.h"

include/mpegfile.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegfile.h"

include/mpegheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegheader.h"

include/mpegproperties.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegproperties.h"

include/oggfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggfile.h"

include/oggflacfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/flac/oggflacfile.h"

include/oggpage.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpage.h"

include/oggpageheader.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpageheader.h"

include/popularimeterframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"

include/privateframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/privateframe.h"

include/relativevolumeframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"

include/rifffile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/rifffile.h"

include/speexfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexfile.h"

include/speexproperties.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexproperties.h"

include/tag.h

@@ -0,0 +1 @@
+#include "../taglib/tag.h"

include/taglib.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/taglib.h"

include/taglib_export.h

@@ -0,0 +1 @@
+#include "../taglib/taglib_export.h"

include/tagunion.h

@@ -0,0 +1 @@
+#include "../taglib/tagunion.h"

include/tbytevector.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevector.h"

include/tbytevectorlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevectorlist.h"

include/tdebug.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tdebug.h"

include/textidentificationframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"

include/tfile.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tfile.h"

include/tlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tlist.h"

include/tmap.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tmap.h"

include/trueaudiofile.h

@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudiofile.h"

include/trueaudioproperties.h

@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudioproperties.h"

include/tstring.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstring.h"

include/tstringlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstringlist.h"

include/unicode.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/unicode.h"

include/uniquefileidentifierframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"

include/unknownframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unknownframe.h"

include/unsynchronizedlyricsframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"

include/urllinkframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"

include/vorbisfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisfile.h"

include/vorbisproperties.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisproperties.h"

include/wavfile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavfile.h"

include/wavpackfile.h

@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackfile.h"

include/wavpackproperties.h

@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackproperties.h"

include/wavproperties.h

@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavproperties.h"

include/xingheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/xingheader.h"

include/xiphcomment.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/xiphcomment.h"

taglib-config.cmake

@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo ${TAGLIB_LIB_VERSION_STRING}
+	  echo ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} 
 	  ;;
     --prefix)
 	  echo $prefix

taglib-config.cmd.cmake

@@ -1,36 +0,0 @@
-@echo off
-goto beginning
-  *
-  * It is what it is, you can do with it as you please.
-  *
-  * Just don't blame me if it teaches your computer to smoke!
-  *
-  *  -Enjoy
-  *  fh :)_~
-  *
-:beginning
-if /i "%1#" == "--libs#"    goto doit
-if /i "%1#" == "--cflags#"  goto doit
-if /i "%1#" == "--version#" goto doit
-if /i "%1#" == "--prefix#"  goto doit
-
-echo "usage: %0 [OPTIONS]"
-echo	[--libs]
-echo	[--cflags]
-echo	[--version]
-echo	[--prefix]
-goto theend
-
-  *
-  * NOTE: Windows does not assume libraries are prefixed with 'lib'.
-  * NOTE: If '-llibtag' is the last element, it is easily appended in the users installation/makefile process
-  *       to allow for static, shared or debug builds.
-  * It would be preferable if the top level CMakeLists.txt provided the library name during config. ??
-:doit
-if /i "%1#" == "--libs#"    echo -L${LIB_INSTALL_DIR} -llibtag
-if /i "%1#" == "--cflags#"  echo -I${INCLUDE_INSTALL_DIR}/taglib
-if /i "%1#" == "--version#" echo ${TAGLIB_LIB_VERSION_STRING}
-if /i "%1#" == "--prefix#"  echo ${CMAKE_INSTALL_PREFIX}
-
-:theend
-

taglib.pc.cmake

@@ -1,11 +1,11 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+prefix=${CMAKE_INSTALL_PREFIX}
+exec_prefix=${CMAKE_INSTALL_PREFIX}
+libdir=${LIB_INSTALL_DIR}
+includedir=${INCLUDE_INSTALL_DIR}
 
 Name: TagLib
 Description: Audio meta-data library
 Requires: 
-Version: @TAGLIB_LIB_VERSION_STRING@
-Libs: -L${libdir} -ltag
-Cflags: -I${includedir}/taglib
+Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+Libs: -L${LIB_INSTALL_DIR} -ltag
+Cflags: -I${INCLUDE_INSTALL_DIR}/taglib