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}/