Commit 28ca884f authored by Urs Fleisch's avatar Urs Fleisch
Browse files

Support TagLib 1.10.

parent a409bcb6
......@@ -64,7 +64,7 @@ libflac_version=1.3.1
libflac_patchlevel=4
id3lib_version=3.8.3
id3lib_patchlevel=16
taglib_version=1.9.1
taglib_version=1.10beta
chromaprint_version=1.2
chromaprint_patchlevel=1
mp4v2_version=2.0.0
......@@ -2353,10 +2353,12 @@ rm -f $INSTDIR.zip
EOF
chmod +x kid3/make_package.sh
else
taglib_config_version=$taglib_version
test $taglib_config_version = "1.10beta" && taglib_config_version="1.10.0"
cat >kid3/build.sh <<EOF
BUILDPREFIX=\$(cd ..; pwd)/buildroot/usr/local
export PKG_CONFIG_PATH=\$BUILDPREFIX/lib/pkgconfig
cmake -DWITH_TAGLIB=OFF -DHAVE_TAGLIB=1 -DTAGLIB_LIBRARIES:STRING="-L\$BUILDPREFIX/lib -ltag -lz" -DTAGLIB_CFLAGS:STRING="-I\$BUILDPREFIX/include/taglib -I\$BUILDPREFIX/include -DTAGLIB_STATIC" -DTAGLIB_VERSION:STRING="${taglib_version}" -DWITH_QT5=ON -DWITH_QML=OFF -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g -DID3LIB_LINKOPTION=1 -DFLAC__NO_DLL" -DCMAKE_INCLUDE_PATH=\$BUILDPREFIX/include -DCMAKE_LIBRARY_PATH=\$BUILDPREFIX/lib -DCMAKE_PROGRAM_PATH=\$BUILDPREFIX/bin -DWITH_FFMPEG=ON -DFFMPEG_ROOT=\$BUILDPREFIX -DWITH_MP4V2=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DWITH_GCC_PCH=OFF -DWITH_APPS="Qt;CLI" -DCMAKE_INSTALL_PREFIX= -DWITH_BINDIR=. -DWITH_DATAROOTDIR=. -DWITH_DOCDIR=. -DWITH_TRANSLATIONSDIR=. ../../kid3
cmake -DWITH_TAGLIB=OFF -DHAVE_TAGLIB=1 -DTAGLIB_LIBRARIES:STRING="-L\$BUILDPREFIX/lib -ltag -lz" -DTAGLIB_CFLAGS:STRING="-I\$BUILDPREFIX/include/taglib -I\$BUILDPREFIX/include -DTAGLIB_STATIC" -DTAGLIB_VERSION:STRING="${taglib_config_version}" -DWITH_QT5=ON -DWITH_QML=OFF -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g -DID3LIB_LINKOPTION=1 -DFLAC__NO_DLL" -DCMAKE_INCLUDE_PATH=\$BUILDPREFIX/include -DCMAKE_LIBRARY_PATH=\$BUILDPREFIX/lib -DCMAKE_PROGRAM_PATH=\$BUILDPREFIX/bin -DWITH_FFMPEG=ON -DFFMPEG_ROOT=\$BUILDPREFIX -DWITH_MP4V2=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DWITH_GCC_PCH=OFF -DWITH_APPS="Qt;CLI" -DCMAKE_INSTALL_PREFIX= -DWITH_BINDIR=. -DWITH_DATAROOTDIR=. -DWITH_DOCDIR=. -DWITH_TRANSLATIONSDIR=. ../../kid3
EOF
fi
chmod +x kid3/build.sh
......
......@@ -50,10 +50,15 @@ if (TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
taglibfile.cpp
taglibext/aac/aacfiletyperesolver.cpp
taglibext/mp2/mp2filetyperesolver.cpp
taglibext/synchronizedlyricsframe.cpp
taglibext/eventtimingcodesframe.cpp
)
if (NOT ${TAGLIB_VERSION} VERSION_GREATER 1.9.1)
set(plugin_SRCS ${plugin_SRCS}
taglibext/synchronizedlyricsframe.cpp
taglibext/eventtimingcodesframe.cpp
)
endif (NOT ${TAGLIB_VERSION} VERSION_GREATER 1.9.1)
if (NOT ${TAGLIB_VERSION} VERSION_LESS 1.9.1)
set(plugin_SRCS ${plugin_SRCS}
taglibext/dsf/dsffiletyperesolver.cpp
......
......@@ -120,7 +120,7 @@
#include "taglibext/dsf/dsffile.h"
#endif
#if TAGLIB_VERSION >= 0x010902
#if TAGLIB_VERSION >= 0x011000
#include <synchronizedlyricsframe.h>
#include <eventtimingcodesframe.h>
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment