- up to 1.3.2

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
deleted file mode 100644 (file)
index bff35de..0000000
--- a/ffmpeg4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qmmp-1.2.0/src/plugins/Input/ffmpeg/decoder_ffmpeg.h~      2017-11-25 11:45:02.000000000 +0100
-+++ qmmp-1.2.0/src/plugins/Input/ffmpeg/decoder_ffmpeg.h       2018-04-29 21:31:46.124815253 +0200
-@@ -61,7 +61,7 @@
-     AVPacket m_pkt;
-     AVPacket m_temp_pkt;
-     qint64 m_output_at;
--    uchar m_input_buf[INPUT_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
-+    uchar m_input_buf[INPUT_BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
-     int64_t m_seekTime;
-     qint64  m_skipBytes;
-     int m_channels;

diff --git a/qmmp.spec b/qmmp.spec
index 6601ce5b430eb6409bcdaa260a324e5b8b39083f..6f13fd4a20986fbe5acae90ae4dee817d4892102 100644 (file)
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -7,13 +7,12 @@ Summary:      XMMS like audio player based on Qt
 Summary(hu.UTF-8):     XMMS-szerű Qt alapú audio-lejátszó
 Summary(pl.UTF-8):     Odtwarzacz muzyki w stylu XMMS oparty na Qt
 Name:          qmmp
-Version:       1.2.0
-Release:       4
+Version:       1.3.2
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: cc3468fe610412e2db5113d8ce0a379e
-Patch0:                ffmpeg4.patch
+# Source0-md5: 643574bb87c2bdc7ec5e92c6cd0bbcb0
 URL:           http://qmmp.ylsoftware.com/
 BuildRequires: Qt5Core-devel >= 5.4.0
 BuildRequires: Qt5DBus-devel >= 5.4.0
@@ -39,10 +38,8 @@ BuildRequires:       libbs2b-devel >= 3.0.0
 BuildRequires: libcddb-devel >= 1.3.1
 BuildRequires: libcdio-devel >= 0.80
 BuildRequires: libcdio-paranoia-devel >= 0.90_10.2
-BuildRequires: libmad-devel
 BuildRequires: libmms-devel >= 0.4
 BuildRequires: libmodplug-devel >= 0.8.4
-BuildRequires: libmpcdec-devel >= 1.2.6
 BuildRequires: libogg-devel
 BuildRequires: libprojectM-devel >= 2.0.0
 BuildRequires: libsamplerate-devel >= 0.1.2
@@ -51,6 +48,7 @@ BuildRequires:        libsidplayfp-devel >= 1.0.3
 BuildRequires: libsndfile-devel >= 1.0.21
 BuildRequires: libstdc++-devel
 BuildRequires: libvorbis-devel
+BuildRequires: musepack-devel
 BuildRequires: opus-devel >= 1.0.2
 BuildRequires: opusfile-devel >= 0.2
 BuildRequires: pkgconfig
@@ -87,7 +85,6 @@ Requires:     libcdio >= 0.80
 Requires:      libcdio-paranoia >= 0.90_10.2
 Requires:      libmms >= 0.4
 Requires:      libmodplug >= 0.8.4
-Requires:      libmpcdec >= 1.2.6
 Requires:      libprojectM >= 2.0.0
 Requires:      libsidplayfp >= 1.0.3
 Requires:      libsndfile >= 1.0.21
@@ -153,7 +150,6 @@ Pliki nagłówkowe qmmp.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
@@ -181,115 +177,118 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %doc ChangeLog.rus README.RUS
 %lang(uk) %doc README.UKR
 %attr(755,root,root) %{_bindir}/qmmp
-%dir %{_libdir}/qmmp
-%dir %{_libdir}/qmmp/CommandLineOptions
-%attr(755,root,root) %{_libdir}/qmmp/CommandLineOptions/lib*option.so
-%dir %{_libdir}/qmmp/Effect
+%dir %{_libdir}/qmmp-1.3
+%dir %{_libdir}/qmmp-1.3/CommandLineOptions
+%attr(755,root,root) %{_libdir}/qmmp-1.3/CommandLineOptions/lib*option.so
+%dir %{_libdir}/qmmp-1.3/Effect
 # R: libbs2b
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libbs2b.so
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libcrossfade.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libbs2b.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libcrossfade.so
 # R: libogg libvorbis
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libfilewriter.so
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libladspa.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libfilewriter.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libladspa.so
 # R: soxr
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libsoxr.so
-%attr(755,root,root) %{_libdir}/qmmp/Effect/libstereo.so
-%dir %{_libdir}/qmmp/Engines
-%attr(755,root,root) %{_libdir}/qmmp/Engines/libmplayer.so
-%dir %{_libdir}/qmmp/FileDialogs
-%attr(755,root,root) %{_libdir}/qmmp/FileDialogs/lib*dialog.so
-%dir %{_libdir}/qmmp/General
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libsoxr.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libstereo.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Effect/libmonotostereo.so
+%dir %{_libdir}/qmmp-1.3/Engines
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Engines/libmplayer.so
+%dir %{_libdir}/qmmp-1.3/FileDialogs
+%attr(755,root,root) %{_libdir}/qmmp-1.3/FileDialogs/lib*dialog.so
+%dir %{_libdir}/qmmp-1.3/General
 # R: taglib
-%attr(755,root,root) %{_libdir}/qmmp/General/libconverter.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libcopypaste.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libcovermanager.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libfileops.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libgnomehotkey.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libconverter.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libcopypaste.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libcovermanager.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libfileops.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libgnomehotkey.so
 # R: Qt5DBus
-%attr(755,root,root) %{_libdir}/qmmp/General/libhal.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libhal.so
 # R: libX11
-%attr(755,root,root) %{_libdir}/qmmp/General/libhotkey.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libhotkey.so
 # R: Qt5DBus
-%attr(755,root,root) %{_libdir}/qmmp/General/libkdenotify.so
-%attr(755,root,root) %{_libdir}/qmmp/General/liblyrics.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libkdenotify.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/liblyrics.so
 # R: Qt5DBus
-%attr(755,root,root) %{_libdir}/qmmp/General/libmpris.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libmpris.so
 # R: Q5X11Extras libX11
-%attr(755,root,root) %{_libdir}/qmmp/General/libnotifier.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libnotifier.so
 # R: taglib
-%attr(755,root,root) %{_libdir}/qmmp/General/librgscan.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libscrobbler.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libstatusicon.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libstreambrowser.so
-%attr(755,root,root) %{_libdir}/qmmp/General/libtrackchange.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/librgscan.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libscrobbler.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libstatusicon.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libstreambrowser.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libtrackchange.so
 # R: Qt5DBus
-%attr(755,root,root) %{_libdir}/qmmp/General/libudisks2.so
-%dir %{_libdir}/qmmp/Input
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libudisks2.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/General/libhistory.so
+%dir %{_libdir}/qmmp-1.3/Input
 # R: faad2 taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libaac.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libaac.so
 # R: libarchive
-%attr(755,root,root) %{_libdir}/qmmp/Input/libarchive.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libarchive.so
 # R: libcddb libcdio libcdio-paranoia
-%attr(755,root,root) %{_libdir}/qmmp/Input/libcdaudio.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libcdaudio.so
 # R: enca-libs
-%attr(755,root,root) %{_libdir}/qmmp/Input/libcue.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libcue.so
 # R: ffmpeg-libs
-%attr(755,root,root) %{_libdir}/qmmp/Input/libffmpeg.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libffmpeg.so
 # R: flac taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libflac.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libflac.so
 # R: game-music-emu
-%attr(755,root,root) %{_libdir}/qmmp/Input/libgme.so
-# R: libmad taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libmad.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libgme.so
 # R: libmodplug
-%attr(755,root,root) %{_libdir}/qmmp/Input/libmodplug.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libmodplug.so
 # R: libmpcdec taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libmpc.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libmpc.so
 # R: opus opusfile taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libopus.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libopus.so
 # R: libsidplayfp
-%attr(755,root,root) %{_libdir}/qmmp/Input/libsid.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libsid.so
 # R: libsndfile
-%attr(755,root,root) %{_libdir}/qmmp/Input/libsndfile.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libsndfile.so
 # R: libvorbis taglib
-%attr(755,root,root) %{_libdir}/qmmp/Input/libvorbis.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libvorbis.so
 # R: wavpack
-%attr(755,root,root) %{_libdir}/qmmp/Input/libwavpack.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libwavpack.so
 # R: wildmidi
-%attr(755,root,root) %{_libdir}/qmmp/Input/libwildmidi.so
-%dir %{_libdir}/qmmp/Output
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libwildmidi.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Input/libmpeg.so
+%dir %{_libdir}/qmmp-1.3/Output
 # R: alsa-lib
-%attr(755,root,root) %{_libdir}/qmmp/Output/libalsa.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libalsa.so
 # R: jack-audio-connection-kit-libs soxr
-%attr(755,root,root) %{_libdir}/qmmp/Output/libjack.so
-%attr(755,root,root) %{_libdir}/qmmp/Output/libnull.so
-%attr(755,root,root) %{_libdir}/qmmp/Output/liboss.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libjack.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libnull.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/liboss.so
 # R: pulseaudio-libs
-%attr(755,root,root) %{_libdir}/qmmp/Output/libpulseaudio.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libpulseaudio.so
 # R: QtMultimedia
-%attr(755,root,root) %{_libdir}/qmmp/Output/libqtmultimedia.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libqtmultimedia.so
 # R: libogg libshout libvorbis soxr
-%attr(755,root,root) %{_libdir}/qmmp/Output/libshout.so
-%dir %{_libdir}/qmmp/PlayListFormats
-%attr(755,root,root) %{_libdir}/qmmp/PlayListFormats/lib*playlistformat.so
-%dir %{_libdir}/qmmp/Transports
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Output/libshout.so
+%dir %{_libdir}/qmmp-1.3/PlayListFormats
+%attr(755,root,root) %{_libdir}/qmmp-1.3/PlayListFormats/lib*playlistformat.so
+%dir %{_libdir}/qmmp-1.3/Transports
 # R: curl-libs enca-libs
-%attr(755,root,root) %{_libdir}/qmmp/Transports/libhttp.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Transports/libhttp.so
 # R: libmms
-%attr(755,root,root) %{_libdir}/qmmp/Transports/libmms.so
-%dir %{_libdir}/qmmp/Ui
-%attr(755,root,root) %{_libdir}/qmmp/Ui/libqsui.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Transports/libmms.so
+%dir %{_libdir}/qmmp-1.3/Ui
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Ui/libqsui.so
 # R: libX11
-%attr(755,root,root) %{_libdir}/qmmp/Ui/libskinned.so
-%dir %{_libdir}/qmmp/Visual
-%attr(755,root,root) %{_libdir}/qmmp/Visual/libanalyzer.so
-%attr(755,root,root) %{_libdir}/qmmp/Visual/libprojectm.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Ui/libskinned.so
+%dir %{_libdir}/qmmp-1.3/Visual
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Visual/libanalyzer.so
+%attr(755,root,root) %{_libdir}/qmmp-1.3/Visual/libprojectm.so
 %{_desktopdir}/qmmp.desktop
-%{_desktopdir}/qmmp_dir.desktop
-%{_desktopdir}/qmmp_enqueue.desktop
+%{_desktopdir}/qmmp-dir.desktop
+%{_desktopdir}/qmmp-enqueue.desktop
 %dir %{_datadir}/qmmp
 %dir %{_datadir}/qmmp/images
 %{_datadir}/qmmp/images/*.png
+%dir %{_datadir}/qmmp/scripts
+%attr(755,root,root) %{_datadir}/qmmp/scripts/kwin.sh
 %{_iconsdir}/hicolor/*x*/apps/qmmp.png
 %{_iconsdir}/hicolor/scalable/apps/qmmp.svgz
 %{_iconsdir}/hicolor/scalable/apps/qmmp-simple.svgz