From 4425cad0d62fba1c2f6f4c1994cb0714dbef1a4265a4f9e80418079c430edca1 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 27 Oct 2022 11:01:43 +0000 Subject: [PATCH 1/4] Accepting request 1031522 from home:plater - Fix qmmp build to include mpeg support for Leap:15.4 OBS-URL: https://build.opensuse.org/request/show/1031522 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=175 --- qmmp.changes | 5 +++++ qmmp.spec | 28 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/qmmp.changes b/qmmp.changes index 88e3857..dbcc7a8 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 27 09:29:44 UTC 2022 - Dave Plater + +- Fix qmmp build to include mpeg support for Leap:15.4 + ------------------------------------------------------------------- Mon Sep 26 17:48:07 UTC 2022 - Alexei Sorokin diff --git a/qmmp.spec b/qmmp.spec index bf808f2..7756538 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -77,6 +77,12 @@ BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) BuildRequires: pkgconfig(wildmidi) +# This is a workaround to enable Leap to play mpeg encoded tracks +%if 0%{suse_version} <= 1500 +BuildRequires: qt6-base-private-devel +BuildRequires: pkgconfig(id3tag) +BuildRequires: pkgconfig(librcd) +%endif Requires: %{name}(%{sover})(Input) Requires: %{name}(%{sover})(Output) Requires: %{name}(%{sover})(Ui) @@ -91,7 +97,12 @@ This program is an audio-player, written with help of Qt library. %package -n lib%{name}%{sover} Summary: Qmmp library Group: System/Libraries +%if 0%{suse_version} > 1500 Recommends: lib%{name}-plugins +%else +# qmmp is useless without these plugins and there's no large mplayer plugin +Requires: lib%{name}-plugins +%endif %description -n lib%{name}%{sover} This program is an audio-player, written with help of Qt library. @@ -101,8 +112,10 @@ This package provides the Qmmp library. %package -n lib%{name}-plugins Summary: Plugins for libqmmp Group: System/Libraries +%if 0%{suse_version} > 1500 # Suggests instead of Recommends since MPlayer is too big of a dependency. Suggests: lib%{name}-plugin-mplayer +%endif Provides: %{name}(%{sover})(Input) Provides: %{name}(%{sover})(Output) Provides: %{name}(%{sover})(Ui) @@ -116,6 +129,7 @@ This program is an audio-player, written with help of Qt library. This package provides plugins for libqmmp. +%if 0%{suse_version} > 1500 %if %{with restricted} %package -n lib%{name}-plugin-mplayer Summary: MPlayer plugin for libqmmp @@ -127,6 +141,7 @@ This program is an audio-player, written with help of Qt library. This package provides MPlayer plugin for libqmmp. %endif +%endif %package -n lib%{name}-devel Summary: Development files for libqmmp @@ -148,12 +163,21 @@ Development files for libqmmp. -DLIB_DIR=%{_lib} \ -DPLUGIN_DIR=%{_lib}/%{name}-%{mver} \ %if %{without restricted} +%if 0%{suse_version} > 1500 + -DUSE_MPLAYER=OFF \ +%endif +%endif + -DUSE_MAD:BOOL=TRUE \ + -DUSE_MPG123:BOOL=TRUE \ + -DUSE_FFMPEG:BOOL=TRUE \ +%if 0%{suse_version} <= 1500 + -DUSE_PROJECTM:BOOL=FALSE \ -DUSE_MPLAYER=OFF \ %endif -DUSE_HAL=OFF \ -DUSE_OSS=OFF \ -DUSE_OSS4=OFF -%qt6_build + %qt6_build %install %qt6_install @@ -185,11 +209,13 @@ rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56 %endif %if %{with restricted} +%if 0%{suse_version} > 1500 %files -n lib%{name}-plugin-mplayer %dir %{_libdir}/%{name}-%{mver}/ %dir %{_libdir}/%{name}-%{mver}/Engines/ %{_libdir}/%{name}-%{mver}/Engines/libmplayer.so %endif +%endif %files -n lib%{name}-devel %{_includedir}/%{name}/ From 8d28864d8703c776765979cab66c50bda9fd704a083d51383d83de985321a00c Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 27 Oct 2022 14:37:46 +0000 Subject: [PATCH 2/4] Accepting request 1031567 from home:plater Fix build to make Leap:15.4 qmmp play mpeg tracks again OBS-URL: https://build.opensuse.org/request/show/1031567 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=176 --- qmmp.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qmmp.spec b/qmmp.spec index 7756538..6b31d2a 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavcodec) >= 58 BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbs2b) @@ -204,9 +204,11 @@ rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56 %files -n lib%{name}-plugins %{_libdir}/%{name}-%{mver}/ +%if 0%{suse_version} > 1500 %if %{with restricted} %exclude %{_libdir}/%{name}-%{mver}/Engines/libmplayer.so %endif +%endif %if %{with restricted} %if 0%{suse_version} > 1500 From 9d3c9024d68bb3dac3ca1367896e36cb2ef08d30092308342788fc42dc794904 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 29 Oct 2022 05:00:48 +0000 Subject: [PATCH 3/4] Accepting request 1032096 from home:plater Restore qmmp to original OBS-URL: https://build.opensuse.org/request/show/1032096 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=177 --- qmmp.changes | 5 ----- qmmp.spec | 32 ++------------------------------ 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/qmmp.changes b/qmmp.changes index dbcc7a8..88e3857 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 27 09:29:44 UTC 2022 - Dave Plater - -- Fix qmmp build to include mpeg support for Leap:15.4 - ------------------------------------------------------------------- Mon Sep 26 17:48:07 UTC 2022 - Alexei Sorokin diff --git a/qmmp.spec b/qmmp.spec index 6b31d2a..bf808f2 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(libavcodec) >= 58 +BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbs2b) @@ -77,12 +77,6 @@ BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) BuildRequires: pkgconfig(wildmidi) -# This is a workaround to enable Leap to play mpeg encoded tracks -%if 0%{suse_version} <= 1500 -BuildRequires: qt6-base-private-devel -BuildRequires: pkgconfig(id3tag) -BuildRequires: pkgconfig(librcd) -%endif Requires: %{name}(%{sover})(Input) Requires: %{name}(%{sover})(Output) Requires: %{name}(%{sover})(Ui) @@ -97,12 +91,7 @@ This program is an audio-player, written with help of Qt library. %package -n lib%{name}%{sover} Summary: Qmmp library Group: System/Libraries -%if 0%{suse_version} > 1500 Recommends: lib%{name}-plugins -%else -# qmmp is useless without these plugins and there's no large mplayer plugin -Requires: lib%{name}-plugins -%endif %description -n lib%{name}%{sover} This program is an audio-player, written with help of Qt library. @@ -112,10 +101,8 @@ This package provides the Qmmp library. %package -n lib%{name}-plugins Summary: Plugins for libqmmp Group: System/Libraries -%if 0%{suse_version} > 1500 # Suggests instead of Recommends since MPlayer is too big of a dependency. Suggests: lib%{name}-plugin-mplayer -%endif Provides: %{name}(%{sover})(Input) Provides: %{name}(%{sover})(Output) Provides: %{name}(%{sover})(Ui) @@ -129,7 +116,6 @@ This program is an audio-player, written with help of Qt library. This package provides plugins for libqmmp. -%if 0%{suse_version} > 1500 %if %{with restricted} %package -n lib%{name}-plugin-mplayer Summary: MPlayer plugin for libqmmp @@ -141,7 +127,6 @@ This program is an audio-player, written with help of Qt library. This package provides MPlayer plugin for libqmmp. %endif -%endif %package -n lib%{name}-devel Summary: Development files for libqmmp @@ -163,21 +148,12 @@ Development files for libqmmp. -DLIB_DIR=%{_lib} \ -DPLUGIN_DIR=%{_lib}/%{name}-%{mver} \ %if %{without restricted} -%if 0%{suse_version} > 1500 - -DUSE_MPLAYER=OFF \ -%endif -%endif - -DUSE_MAD:BOOL=TRUE \ - -DUSE_MPG123:BOOL=TRUE \ - -DUSE_FFMPEG:BOOL=TRUE \ -%if 0%{suse_version} <= 1500 - -DUSE_PROJECTM:BOOL=FALSE \ -DUSE_MPLAYER=OFF \ %endif -DUSE_HAL=OFF \ -DUSE_OSS=OFF \ -DUSE_OSS4=OFF - %qt6_build +%qt6_build %install %qt6_install @@ -204,20 +180,16 @@ rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56 %files -n lib%{name}-plugins %{_libdir}/%{name}-%{mver}/ -%if 0%{suse_version} > 1500 %if %{with restricted} %exclude %{_libdir}/%{name}-%{mver}/Engines/libmplayer.so %endif -%endif %if %{with restricted} -%if 0%{suse_version} > 1500 %files -n lib%{name}-plugin-mplayer %dir %{_libdir}/%{name}-%{mver}/ %dir %{_libdir}/%{name}-%{mver}/Engines/ %{_libdir}/%{name}-%{mver}/Engines/libmplayer.so %endif -%endif %files -n lib%{name}-devel %{_includedir}/%{name}/ From 70fb48c0d991a66ceca8d8f2fa432026ebf178b23bf0ca4b35f803466620f537 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 31 Mar 2023 14:11:34 +0000 Subject: [PATCH 4/4] - Update to version 2.1.3. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=178 --- qmmp-2.1.2.tar.bz2 | 3 --- qmmp-2.1.3.tar.bz2 | 3 +++ qmmp.changes | 13 +++++++++++++ qmmp.spec | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 qmmp-2.1.2.tar.bz2 create mode 100644 qmmp-2.1.3.tar.bz2 diff --git a/qmmp-2.1.2.tar.bz2 b/qmmp-2.1.2.tar.bz2 deleted file mode 100644 index fd10aff..0000000 --- a/qmmp-2.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53ce8ba00920ea604555afdc801f24a426b92b07644743cc426006bdffca017a -size 1347684 diff --git a/qmmp-2.1.3.tar.bz2 b/qmmp-2.1.3.tar.bz2 new file mode 100644 index 0000000..078dd28 --- /dev/null +++ b/qmmp-2.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9b1e7bf05d499d05b41c3b7527c9baa8bbf31981c7fa09786501c06334508d4 +size 1366171 diff --git a/qmmp.changes b/qmmp.changes index 88e3857..e43f525 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 31 10:11:20 UTC 2023 - Alexei Sorokin + +- 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 diff --git a/qmmp.spec b/qmmp.spec index bf808f2..0d6346e 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -1,7 +1,7 @@ # # spec file for package qmmp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %bcond_with faad %bcond_with restricted Name: qmmp -Version: 2.1.2 +Version: 2.1.3 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0-or-later