Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 5

qmmp.changes Changed

@@ -1,4 +1,579 @@
 -------------------------------------------------------------------
+Fri Mar  8 08:43:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add qmmp-taglib2.patch: Fix build against taglib 2.0. Patch taken
+  from https://sourceforge.net/p/qmmp-dev/code/11255/
+
+-------------------------------------------------------------------
+Sun Oct 29 09:29:18 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1.5:
+  * added waveform seekbar optimization (Linearithmik)
+  * fixed visualization initialization in the simple user
+    interface
+  * fixed playlist geometry issues in the simple user interface
+  * fixed playlist settings in the skinned user interface
+  * fixed possible crash
+  * fixed http version
+  * fixed file type determination by content in the waveform
+    seekbar
+
+-------------------------------------------------------------------
+Fri May 26 19:23:13 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.1.4:
+  * Add projectM 4.0 support (experimental).
+  * Rebuild skin cache if missing
+  * Fix removing of the current playing file in the file operations
+    plugin.
+  * Fix crash on streams in the lyrics plugin.
+  * Fix issues with tabbar in the simple ui plugin.
+  * Fix issues with visualisation windows on application startup.
+
+-------------------------------------------------------------------
+Fri Mar 31 10:11:20 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.1.3:
+  * Fix latest cURL API support.
+  * Fix crash in the ladspa plugin (Linearithmik).
+  * Fix memory leak in the wavpack plugin.
+  * Fix ADTS header detection in the aac plugin.
+  * Fix error handling in the ffmpeg plugin.
+  * Fix text scroller geometry in the skinned plugin.
+  * Hide empty plugin categories.
+  * Update translations.
+
+-------------------------------------------------------------------
+Mon Sep 26 17:48:07 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.1.2:
+  * Add FFmpeg 5.1 support.
+  * Add recursive search for presets in the projectm plugin.
+  * Add application icon in the pulseaudio plugin.
+  * Improve visualisation synchronisation.
+  * Fix title formatting in the KDE notification plugin.
+  * Fix "fact" chunks support in the sndfile plugin.
+  * Fix embedded cover art support in the flac plugin.
+  * Fix tag editor behaviour.
+  * Update translations.
+
+-------------------------------------------------------------------
+Fri Jun 10 22:32:18 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.1.1:
+  * Fix skin selection setting.
+  * Fix API documentation.
+  * Fix udisks plugin build.
+  * Fix build with Qt 6.4.
+  * Fix AppStream metadata.
+  * Remove hal plugin.
+  * Update translations.
+
+-------------------------------------------------------------------
+Tue May 17 19:43:28 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.1.0:
+  * Add feature to extract lyrics from tags (id3v2 tag and
+    Xiph Comment).
+  * Add queue display in the "jump to track" dialogue.
+  * Add a feature to skip already existing tracks.
+  * Add volume change notification in the KDE notification plugin.
+  * Add XDG Base Directory Specification support.
+  * Replace modplug plugin by xmp plugin.
+  * Improve the qsui plugin:
+    + add a feature to hide playlist name filter;
+    + add a feature to hide menu panel.
+  - Add an application menu
+    + enable clear button for some search filters;
+    + improve file system browser context menu.
+  * improved history plugin:
+    + add a feature to remove tracks from history;
+    + add a feature to show track details.
+  * Improved the "about..." dialogue.
+  * Improve file name filter configuration in the ffmpeg plugin.
+  * Increase the minimal required Qt version to 5.5.
+  * Optimise search for duplicated tracks.
+  * Optimise track queue.
+  * Resolve conflict between the 1.x and 2.x versions.
+  * Update translations.
+- Drop qmmp-fix-openmpt.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Wed Apr 13 14:28:28 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.0.4:
+  * Fix drag-and-dropped tracks order.
+  * Fix an issue with empty content type.
+  * Disable waveform seekbar for the tracks with unknown duration.
+  * Fix the taskbar plugin.
+  * Update translations.
+
+-------------------------------------------------------------------
+Mon Mar  7 08:18:07 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Use the Qt6 cmake macros to fix the 15.4 build.
+
+-------------------------------------------------------------------
+Sun Jan 23 16:38:24 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 2.0.3 (changes since 1.5.1):
+  * Switch to Qt6.
+  * Use libiconv for charset conversion.
+  * Fix default settings in the ffmpeg plugin.
+  * Fix transition between http tracks.
+  * Improve qsui plugin:
+    + fix toolbar renaming;
+    + fix Wayland support;
+    + fix tab bar context menu.
+  * Enable QtMultimedia support under Qt 6.2 or higher.
+  * Remove private API usage Qt 6.2 or higher.
+  * Fix transport plugins loading.
+  * Fix volume bar draw in the double size mode.
+  * Fix symlinks support.
+  * Fix some issues in the two-panel file dialogue.
+  * Remove KDE 4 notifications support
+  * Disable unsupported plugins: taskbar, qtmultimedia.
+- Rebase qmmp-fix-openmpt.patch.
+- Drop qmmp-fix_cdda_version.patch: no longer applicable.
+- Add requirements for libarchive, libshout, Musepack, WildMIDI
+  and PipeWire support.
+- Switch from libmpg123 to MAD.
+- Drop baselibs.conf.
+
+-------------------------------------------------------------------
+Mon Jul 12 10:28:10 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 1.5.1
+  * added application startup optimization
+  * added Korean translation
+  * enabled Matroska container by default in the ffmpeg plugin
+  * removed mp3lyrics.org lyrics provider
+  * improved qsui plugin:
+    + added waveform seekbar optimization
+    + fixed waveform generation for 16-bit samples
+  * fixed plugin cache cleanup
+  * fixed build without mpg123
+  * fixed ladspa plugin regression
+
+-------------------------------------------------------------------
+Mon May 24 06:49:39 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 1.5.0
+  * added media library plugin (experimental)
+  * added PipeWire plugin (experimental)
+  * added built-in CUE editor
+  * added m4b support in the ffmpeg plugin
+  * added option to enable CRC checking in the mpeg plugin
+  * added ID3v1/ID3v2 charset detection using librcd library in
+    the mpeg plugin
+  * added WebP format support for cover image
+  * added groups rebuilding after playlist updating
+  * added metadata formatter optimization
+  * added "%dir()" function in the metadata formatter
+  * added feature to integrate widgets to the main interface
+    from plugins
+  * added feature to execute external command in the fileops
+    plugin
+  * improved visualization synchronization
+  * improved lyrics plugin:
+    + added widget mode
+    + show text of the current playing song (in the widget mode
+      only)
+    + changed user interface
+  * improved qsui plugin:
+    + added feature to add dock widgets from plugins
+    + added feature to change tab bar position
+    + added icons to the file system browser menu
+    + added feature to place dock widgets in the multiple lines
+    + removed "Actions" submenu, using "Tools" menu instead
+  * improved skinned plugin:
+    + added playlist color settings
+    + moved "Show playlists" option to "Playlist" submenu
+    + moved "group tracks" and "show header" options to
+      "Playlist" submenu
+  * removed some deprecated API usage
+  * removed obsolete code
+  * changed minimal FFmpeg version to 3.4
+  * updated Portuguese, Dutch, Polish, Galician, Spanish,
+    Russian, Ukrainian, French, Indonesian, Greek, Italian,
+    German and Finnish translations

qmmp.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qmmp
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,48 +12,46 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define sover   1
+%global __provides_exclude_from ^%{_libdir}/qmmp-0-9\.*/
+%define sover   2
+%define mver    2.1
 %bcond_with faad
 %bcond_with restricted
 Name:           qmmp
-Version:        1.2.1
+Version:        2.1.5
 Release:        0
 Summary:        Qt-based Multimedia Player
 License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
-Url:            http://qmmp.ylsoftware.com/
-Source:         http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2
-Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h.
-Patch0:         %{name}-fix_cdda_version.patch
+URL:            https://qmmp.ylsoftware.com/
+Source:         https://qmmp.ylsoftware.com/files/%{name}/%{mver}/%{name}-%{version}.tar.bz2
 # 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-fix-openmpt.patch -- Fix OpenMPT compatibility.
-Patch2:         %{name}-fix-openmpt.patch
-# PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5
-Patch3:         %{name}-projectM-qt5.patch
+Patch0:         %{name}-default-pulse.patch
+# PATCH-FIX-UPSTREAM qmmp-taglib2.patch -- Fix build with taglib 2.0 (https://sourceforge.net/p/qmmp-dev/code/11255/)
+Patch1:         qmmp-taglib2.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libmpcdec-devel
-BuildRequires:  libqt5-qttools-devel >= 5.4
+BuildRequires:  musepack-devel
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(Qt5Core) >= 5.4
-BuildRequires:  pkgconfig(Qt5DBus) >= 5.4
-BuildRequires:  pkgconfig(Qt5Multimedia) >= 5.4
-BuildRequires:  pkgconfig(Qt5Network) >= 5.4
-BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.4
-BuildRequires:  pkgconfig(Qt5Widgets) >= 5.4
-BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.4
-BuildRequires:  pkgconfig(Qt5Xml) >= 5.4
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Multimedia)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6OpenGLWidgets)
+BuildRequires:  cmake(Qt6Sql)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(Qt6Xml)
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(enca) >= 1.9
+BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
@@ -64,25 +62,27 @@
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libgme)
 BuildRequires:  pkgconfig(libmms)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libprojectM-qt5)
+BuildRequires:  pkgconfig(libpipewire-0.3)
+BuildRequires:  pkgconfig(libprojectM)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libpulse-simple)
 BuildRequires:  pkgconfig(libsidplayfp)
+BuildRequires:  pkgconfig(libspa-0.2)
+BuildRequires:  pkgconfig(libxmp)
 BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(opus) >= 1.0.2
-BuildRequires:  pkgconfig(opusfile) >= 0.2
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(opusfile)
+BuildRequires:  pkgconfig(shout)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(soxr)
-BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(vorbisfile)
 BuildRequires:  pkgconfig(wavpack)
+BuildRequires:  pkgconfig(wildmidi)
 Requires:       %{name}(%{sover})(Input)
 Requires:       %{name}(%{sover})(Output)
 Requires:       %{name}(%{sover})(Ui)
-%if 0%{?suse_version} <= 1320
-BuildRequires:  desktop-file-utils
-%endif
+ExclusiveArch:  %ix86 x86_64
 %if %{with faad}
 BuildRequires:  libfaad-devel
 %endif
@@ -102,8 +102,8 @@
 
 %package -n lib%{name}-plugins
 Summary:        Plugins for libqmmp
-# Suggests instead of Recommends since MPlayer is too big of a dependency.
 Group:          System/Libraries
+# Suggests instead of Recommends since MPlayer is too big of a dependency.
 Suggests:       lib%{name}-plugin-mplayer
 Provides:       %{name}(%{sover})(Input)
 Provides:       %{name}(%{sover})(Output)
@@ -111,7 +111,7 @@
 # libqmmp0-plugins & qmmp-plugin-pack-simple-ui were last used in openSUSE 13.2 (in PMBS).
 Provides:       %{name}-plugin-pack-simple-ui = %{version}
 Obsoletes:      %{name}-plugin-pack-simple-ui < %{version}
-Obsoletes:      lib%{name}0-plugins
+Obsoletes:      lib%{name}0-plugins < %{version}
 
 %description -n lib%{name}-plugins
 This program is an audio-player, written with help of Qt library.
@@ -141,67 +141,56 @@
 Development files for libqmmp.
 
 %prep
-%setup -q
-%patch0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autosetup -p1
 
 %build
-%cmake \
+%cmake_qt6 \
   -DCMAKE_MODULE_LINKER_FLAGS="" \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
   -DLIB_DIR=%{_lib}              \
+  -DPLUGIN_DIR=%{_lib}/%{name}-%{mver} \
 %if %{without restricted}
   -DUSE_MPLAYER=OFF              \
 %endif
   -DUSE_HAL=OFF                  \
   -DUSE_OSS=OFF                  \
   -DUSE_OSS4=OFF
-make %{?_smp_mflags} V=1
+%qt6_build
 
 %install
-%cmake_install
+%qt6_install
+
+# Do not install weirdly-sized icons.
+rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56
 
 %post -n lib%{name}%{sover} -p /sbin/ldconfig
 
 %postun -n lib%{name}%{sover} -p /sbin/ldconfig
 
-%if 0%{?suse_version} <= 1320
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
-%post -n lib%{name}-plugins
-%desktop_database_post
-
-%postun -n lib%{name}-plugins
-%desktop_database_postun
-%endif
-
 %files
-%doc AUTHORS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}*.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}*
+%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/solid/

qmmp-fix-openmpt.patch Deleted

@@ -1,40 +0,0 @@
---- a/src/plugins/Input/modplug/decoder_modplug.cpp
-+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
-@@ -29,7 +29,6 @@
- #include <QSettings>
- #include <math.h>
- #include <libmodplug/stdafx.h>
--#include <libmodplug/it_defs.h>
- #include <libmodplug/sndfile.h>
- #include <qmmp/buffer.h>
- #include <qmmp/output.h>
---- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
-+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
-@@ -25,7 +25,6 @@
- #include <QStringList>
- #include <QRegExp>
- #include <libmodplug/stdafx.h>
--#include <libmodplug/it_defs.h>
- #include <libmodplug/sndfile.h>
- #include "settingsdialog.h"
- #include "modplugmetadatamodel.h"
---- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp
-+++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp
-@@ -21,7 +21,6 @@
- #include <QFile>
- #include <stdint.h>
- #include <libmodplug/stdafx.h>
--#include <libmodplug/it_defs.h>
- #include <libmodplug/sndfile.h>
- #include <libmodplug/modplug.h>
- #include "archivereader.h"
---- a/src/plugins/Input/modplug/settingsdialog.cpp
-+++ b/src/plugins/Input/modplug/settingsdialog.cpp
-@@ -22,7 +22,6 @@
- #include <QDir>
- 
- #include <libmodplug/stdafx.h>
--#include <libmodplug/it_defs.h>
- #include <libmodplug/sndfile.h>
- 
- #include "decoder_modplug.h"

qmmp-fix_cdda_version.patch Deleted

qmmp-projectM-qt5.patch Deleted

@@ -1,52 +0,0 @@
---- a/src/plugins/Visual/projectm/CMakeLists.txt
-+++ b/src/plugins/Visual/projectm/CMakeLists.txt
-@@ -9,14 +9,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
- # projectM
- MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
- IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
--  pkg_search_module(PROJECTM libprojectM>=2.0.0)
-+  pkg_search_module(PROJECTM libprojectM-qt5>=2.0.0)
-   ADD_DEFINITIONS(${PROJECTM_CFLAGS})
- ELSE(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
-   MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
- ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
- 
- find_file(PROJECTM_CONFIG config.inp
--          PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
-+          PATHS "/usr/share/projectM-qt5/" "/usr/local/share/projectM/")
- 
- IF(PROJECTM_CONFIG)
- SET(libprojectm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\")
---- a/src/plugins/Visual/projectm/projectmplugin.cpp
-+++ b/src/plugins/Visual/projectm/projectmplugin.cpp
-@@ -28,7 +28,7 @@
- #include <math.h>
- #include <stdlib.h>
- #include <locale.h>
--#include <libprojectM/projectM.hpp>
-+#include <libprojectM-qt5/projectM.hpp>
- #include <qmmp/buffer.h>
- #include <qmmp/output.h>
- #include "projectmwidget.h"
---- a/src/plugins/Visual/projectm/projectmwidget.cpp
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
-@@ -35,7 +35,7 @@
- #include "projectmwidget.h"
- 
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/share/projectM-qt5/config.inp"
- #endif
- 
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
---- a/src/plugins/Visual/projectm/projectmwrapper.h
-+++ b/src/plugins/Visual/projectm/projectmwrapper.h
-@@ -22,7 +22,7 @@
- #define PROJECTMWRAPPER_H
- 
- #include <QObject>
--#include <libprojectM/projectM.hpp>
-+#include <libprojectM-qt5/projectM.hpp>
- 
- class ProjectMWrapper : public QObject, public projectM
- {

qmmp-taglib2.patch Added

@@ -0,0 +1,123 @@
+--- a/src/plugins/Input/archive/archivetagreader.cpp
++++ b/src/plugins/Input/archive/archivetagreader.cpp
+@@ -42,7 +42,11 @@
+         return m_fileName.constData();
+ #endif
+     }
++#if TAGLIB_MAJOR_VERSION >= 2
++    virtual TagLib::ByteVector readBlock(size_t length) override
++#else
+     virtual TagLib::ByteVector readBlock(unsigned long length) override
++#endif
+     {
+         char datalength;
+         qint64 l = m_input->read(data, length);
+@@ -55,10 +59,17 @@
+     }
+     virtual void writeBlock(const TagLib::ByteVector &) override
+     {}
++#if TAGLIB_MAJOR_VERSION >= 2
++    virtual void insert(const TagLib::ByteVector &, TagLib::offset_t, size_t) override
++    {}
++    virtual void removeBlock(TagLib::offset_t, size_t) override
++    {}
++#else
+     virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long) override
+     {}
+     virtual void removeBlock(unsigned long, unsigned long) override
+     {}
++#endif
+     virtual bool readOnly() const override
+     {
+         return true;
+
+--- a/src/plugins/Input/flac/decoder_flac.cpp
++++ b/src/plugins/Input/flac/decoder_flac.cpp
+@@ -295,7 +295,11 @@
+             p.remove("flac://");
+             p.remove(QRegularExpression("#\\d+$"));
+             TagLib::FileStream stream(QStringToFileName(p), true);
++#if TAGLIB_MAJOR_VERSION >= 2
++            TagLib::FLAC::File fileRef(&stream);
++#else
+             TagLib::FLAC::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
++#endif
+             //looking for cuesheet comment
+             TagLib::Ogg::XiphComment *tag = fileRef.xiphComment();
+             TagLib::FLAC::Properties *ap = fileRef.audioProperties();
+
+--- a/src/plugins/Input/flac/decoderflacfactory.cpp
++++ b/src/plugins/Input/flac/decoderflacfactory.cpp
+@@ -97,7 +97,11 @@
+ 
+     if(filePath.endsWith(".flac", Qt::CaseInsensitive))
+     {
++#if TAGLIB_MAJOR_VERSION >= 2
++        flacFile = new TagLib::FLAC::File(&stream);
++#else
+         flacFile = new TagLib::FLAC::File(&stream, TagLib::ID3v2::FrameFactory::instance());
++#endif
+         tag = flacFile->xiphComment();
+         ap = flacFile->audioProperties();
+     }
+
+
+--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
++++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
+@@ -41,7 +41,11 @@
+     if(m_path.endsWith(".flac", Qt::CaseInsensitive))
+     {
+         m_stream = new TagLib::FileStream(QStringToFileName(m_path), readOnly);
++#if TAGLIB_MAJOR_VERSION >= 2
++        TagLib::FLAC::File *f = new TagLib::FLAC::File(m_stream);
++#else
+         TagLib::FLAC::File *f = new TagLib::FLAC::File(m_stream, TagLib::ID3v2::FrameFactory::instance());
++#endif
+         m_tag = f->xiphComment();
+         m_file = f;
+         setDialogHints(dialogHints() | MetaDataModel::IsCueEditable);
+
+
+--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
++++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
+@@ -220,7 +220,11 @@
+         return QList<TrackInfo*>() << info;
+ 
+     TagLib::FileStream stream(QStringToFileName(path), true);
++#if TAGLIB_MAJOR_VERSION >= 2
++    TagLib::MPEG::File fileRef(&stream);
++#else
+     TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
++#endif
+ 
+     if (parts & TrackInfo::MetaData)
+     {
+@@ -348,6 +352,11 @@
+             break;
+         case TagLib::MPEG::Header::Version2_5:
+             info->setValue(Qmmp::FORMAT_NAME, QString("MPEG-2.5 layer %1").arg(fileRef.audioProperties()->layer()));
++            break;
++#if TAGLIB_MAJOR_VERSION >= 2
++        case TagLib::MPEG::Header::Version4:
++            info->setValue(Qmmp::FORMAT_NAME, QString("MPEG-4 layer %1").arg(fileRef.audioProperties()->layer()));
++#endif
+         }
+         info->setDuration(fileRef.audioProperties()->lengthInMilliseconds());
+     }
+
+
+
+--- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
++++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
+@@ -41,7 +41,11 @@
+     MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
+ {
+     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
++#if TAGLIB_MAJOR_VERSION >= 2
++    m_file = new TagLib::MPEG::File(m_stream);
++#else
+     m_file = new TagLib::MPEG::File(m_stream, TagLib::ID3v2::FrameFactory::instance());
++#endif
+     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v1);
+     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v2);
+     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::APE);

baselibs.conf Deleted

qmmp-1.2.1.tar.bz2 -> qmmp-2.1.5.tar.bz2 Changed