pool/qmmp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=82

Browse Source
This commit is contained in:
Alexei Sorokin 2016-06-29 19:48:47 +00:00 committed by Git OBS Bridge
parent 11e89f69c8
commit afde14d8b6
3 changed files with 158 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
qmmp-taglib-1.9.patch Normal file
View File

@ -0,0 +1,149 @@
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
SET(USE_ENCA TRUE CACHE BOOL "enable/disable libenca support")
include(FindPkgConfig)
pkg_search_module(ENCA enca>=1.9)
-pkg_search_module(TAGLIB taglib>=1.10)
+pkg_search_module(TAGLIB taglib>=1.9)
add_subdirectory(Input)
add_subdirectory(Output)
add_subdirectory(Visual)
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -33,6 +33,11 @@
#include <taglib/mpegfile.h>
#include "converter.h"
+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
+#undef QStringToTString
+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
+#endif
+
Converter::Converter(QObject *parent) : QObject(parent), QRunnable()
{
m_user_stop = false;
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -42,6 +42,11 @@
#define FILE_SKIPPED (Qt::UserRole + 1)
+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
+#undef QStringToTString
+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
+#endif
+
struct ReplayGainInfoItem
{
QMap<Qmmp::ReplayGainKey, double> info;
@@ -75,8 +80,12 @@ RGScanDialog::RGScanDialog(QList <PlayLi
ext == "flac" || //native flac
ext == "oga" || //ogg flac
ext == "ogg" || //ogg vorbis
+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
ext == "wv" || //wavpack
ext == "m4a") //aac (mp4 container)
+#else
+ ext == "wv") //wavpack
+#endif
{
paths.append(track->url());
QString name = formatter.format(track);
@@ -368,6 +377,7 @@ void RGScanDialog::writeVorbisComment(Ta
}
}
+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item)
{
if(m_ui.trackCheckBox->isChecked())
@@ -385,6 +395,7 @@ void RGScanDialog::writeMP4Tag(TagLib::M
gainToStringList(item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK]));
}
}
+#endif
void RGScanDialog::on_writeButton_clicked()
{
@@ -428,11 +439,13 @@ void RGScanDialog::on_writeButton_clicke
writeAPETag(file.APETag(true), item);
file.save();
}
+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
else if(ext == "m4a") //MPEG-4 Part 14
{
TagLib::MP4::File file(qPrintable(item->url));
writeMP4Tag(file.tag(), item);
file.save();
}
+#endif
}
}
--- a/src/plugins/General/rgscan/rgscandialog.h
+++ b/src/plugins/General/rgscan/rgscandialog.h
@@ -48,10 +48,12 @@ namespace TagLib
{
class XiphComment;
}
+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
namespace MP4
{
class Tag;
}
+#endif
}
/**
@@ -81,7 +83,9 @@ private:
void writeAPETag(TagLib::APE::Tag *tag, ReplayGainInfoItem *item);
void writeID3v2Tag(TagLib::ID3v2::Tag *tag, ReplayGainInfoItem *item);
void writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainInfoItem *item);
+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
void writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item);
+#endif
Ui::RGScanDialog m_ui;
QList<RGScanner *> m_scanners;
QList<ReplayGainInfoItem*> m_replayGainItemList;
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -26,6 +26,11 @@
#include <qmmp/metadatamanager.h>
#include "flacmetadatamodel.h"
+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
+#undef QStringToTString
+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
+#endif
+
FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
{
m_file = 0;
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -26,6 +26,11 @@
#include <taglib/tmap.h>
#include "opusmetadatamodel.h"
+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
+#undef QStringToTString
+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
+#endif
+
OpusMetaDataModel::OpusMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
{
m_path = path;
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -26,6 +26,11 @@
#include <taglib/tmap.h>
#include "vorbismetadatamodel.h"
+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
+#undef QStringToTString
+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
+#endif
+
VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
{
m_path = path;

5
qmmp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 29 19:29:12 UTC 2016 - sor.alexei@meowr.ru
- Add qmmp-taglib-1.9.patch: extend TagLib support to 1.9.
-------------------------------------------------------------------
Tue Jun 21 22:12:43 UTC 2016 - sor.alexei@meowr.ru

5
qmmp.spec
View File

@ -31,6 +31,8 @@ Source1: baselibs.conf
Patch0: %{name}-fix_cdda_version.patch
# PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default.
Patch1: %{name}-default-pulse.patch
# PATCH-FIX-OPENSUSE qmmp-taglib-1.9.patch -- Extend TagLib support to 1.9.
Patch2: %{name}-taglib-1.9.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@ -69,7 +71,7 @@ BuildRequires: pkgconfig(opus) >= 1.0.2
BuildRequires: pkgconfig(opusfile) >= 0.2
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(taglib) >= 1.9
BuildRequires: pkgconfig(vorbisfile)
BuildRequires: pkgconfig(wavpack)
Requires: %{name}(%{sover})(Input)
@ -137,6 +139,7 @@ Development files for libqmmp.
%setup -q
%patch0
%patch1 -p1
%patch2 -p1
%build
%cmake \