From 4425cad0d62fba1c2f6f4c1994cb0714dbef1a4265a4f9e80418079c430edca1 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 27 Oct 2022 11:01:43 +0000 Subject: [PATCH] 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}/