Remove internal taglib

FlowPlayer.pro

@@ -4,23 +4,9 @@ QT += core network sql xml
 
 
 CONFIG += link_pkgconfig
-PKGCONFIG += gstreamer-1.0 libresource libresource-glib
+PKGCONFIG += gstreamer-1.0 libresource libresource-glib taglib
 
-LIBS += -L"$$_PRO_FILE_PWD_/lib" -lmytaglib
-
-INCLUDEPATH += src/taglib \
-               src/taglib/taglib \
-               src/taglib/taglib/toolkit \
-               src/taglib/taglib/ogg \
-               src/taglib/taglib/riff \
-               src/taglib/taglib/mpeg/id3v1 \
-               src/taglib/taglib/mpeg/id3v2 \
-               src/taglib/taglib/mpeg/id3v2/frames \
-               src/taglib/taglib/flac \
-               src/taglib/taglib/mod \
-               src/taglib/taglib/xm \
-
-CONFIG += sailfishapp #taglib
+CONFIG += sailfishapp
 
 SOURCES += src/FlowPlayer.cpp \
     src/utils.cpp \
@@ -130,8 +116,3 @@ HEADERS += \
     src/player.h \
     src/audioresource.h \
     src/audioresourceqt.h
-
-tag.files = lib/libmytaglib.so.1
-tag.path = /usr/share/flowplayer/lib
-
-INSTALLS += tag

rpm/flowplayer.spec

@@ -45,6 +45,7 @@ BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(libresource)
+BuildRequires:  pkgconfig(taglib)
 BuildRequires:  desktop-file-utils
 
 # This description section includes metadata for SailfishOS:Chum, see

src/datareader.cpp

@@ -1,21 +1,21 @@
 #include "datareader.h"
 
-#include "taglib/mpeg/mpegfile.h"
-#include "taglib/flac/flacfile.h"
-#include "taglib/toolkit/tlist.h"
-#include "taglib/ogg/vorbis/vorbisfile.h"
-#include "taglib/mp4/mp4file.h"
-#include "taglib/riff/wav/wavfile.h"
-#include "taglib/ogg/speex/speexfile.h"
-#include "taglib/ogg/flac/oggflacfile.h"
-#include "taglib/riff/aiff/aifffile.h"
-#include "taglib/wavpack/wavpackfile.h"
-#include "taglib/trueaudio/trueaudiofile.h"
-#include "taglib/asf/asffile.h"
-#include "taglib/ape/apefile.h"
-#include "taglib/mpc/mpcfile.h"
-#include "taglib/mod/modfile.h"
-#include "taglib/xm/xmfile.h"
+#include <mpegfile.h>
+#include <flacfile.h>
+#include <tlist.h>
+#include <vorbisfile.h>
+#include <mp4file.h>
+#include <wavfile.h>
+#include <speexfile.h>
+#include <oggflacfile.h>
+#include <aifffile.h>
+#include <wavpackfile.h>
+#include <trueaudiofile.h>
+#include <asffile.h>
+#include <apefile.h>
+#include <mpcfile.h>
+#include <modfile.h>
+#include <xmfile.h>
 
 
 #include <QDir>

src/meta.cpp

@@ -1,22 +1,22 @@
 #include "meta.h"
 #include <QFileInfo>
 
-#include "taglib/mpeg/mpegfile.h"
-#include "taglib/flac/flacfile.h"
-#include "taglib/toolkit/tlist.h"
-#include "taglib/ogg/vorbis/vorbisfile.h"
-#include "taglib/mp4/mp4file.h"
-#include "taglib/riff/wav/wavfile.h"
-#include "taglib/ogg/speex/speexfile.h"
-#include "taglib/ogg/flac/oggflacfile.h"
-#include "taglib/riff/aiff/aifffile.h"
-#include "taglib/wavpack/wavpackfile.h"
-#include "taglib/trueaudio/trueaudiofile.h"
-#include "taglib/asf/asffile.h"
-#include "taglib/ape/apefile.h"
-#include "taglib/mpc/mpcfile.h"
-#include "taglib/mod/modfile.h"
-#include "taglib/xm/xmfile.h"
+#include <mpegfile.h>
+#include <flacfile.h>
+#include <tlist.h>
+#include <vorbisfile.h>
+#include <mp4file.h>
+#include <wavfile.h>
+#include <speexfile.h>
+#include <oggflacfile.h>
+#include <aifffile.h>
+#include <wavpackfile.h>
+#include <trueaudiofile.h>
+#include <asffile.h>
+#include <apefile.h>
+#include <mpcfile.h>
+#include <modfile.h>
+#include <xmfile.h>
 
 Meta::Meta(QQuickItem *parent)
     : QQuickItem(parent)