[mixxx/ffmpeg] Use FFmpeg for decoding MP3 and AAC/M4A files

commit fd38274e4e80212d41f001063da2f4fb929b43e6 Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Fri May 6 10:32:20 2022 +0200 Use FFmpeg for decoding MP3 and AAC/M4A files ffmpeg_priority.patch | 14 ++++++++++++++ mixxx.spec | 11 ++++------- 2 files changed, 18 insertions(+), 7 deletions(-) --- diff --git a/ffmpeg_priority.patch b/ffmpeg_priority.patch new file mode 100644 index 0000000..4bae405 --- /dev/null +++ b/ffmpeg_priority.patch @@ -0,0 +1,14 @@ +diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp +index 8a8223b325..41c828adb4 100644 +--- a/src/sources/soundsourceffmpeg.cpp ++++ b/src/sources/soundsourceffmpeg.cpp +@@ -459,7 +459,7 @@ SoundSourceProviderPriority SoundSourceProviderFFmpeg::getPriorityHint( + // supported and tested file extension? + // Currently it is only used as a fallback after all other + // SoundSources failed to open a file or are otherwise unavailable. +- return SoundSourceProviderPriority::Lowest; ++ return SoundSourceProviderPriority::Default; + } + + SoundSourceFFmpeg::SoundSourceFFmpeg(const QUrl& url) +-- diff --git a/mixxx.spec b/mixxx.spec index 688d162..5c540be 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -25,7 +25,7 @@ Name: mixxx Version: 2.3.2 -Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} +Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} Summary: Mixxx is open source software for DJ'ing License: GPLv2+ URL: http://www.mixxx.org @@ -35,6 +35,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{ Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder... Patch0: appstream_metainfo.patch Patch1: disable_werror_in_tests.patch +Patch2: ffmpeg_priority.patch # Build Tools BuildRequires: desktop-file-utils @@ -48,7 +49,6 @@ BuildRequires: ninja-build # Build Requirements BuildRequires: chrpath # The runtime libraries of FAAD2 are needed during the build for testing -BuildRequires: faad2 BuildRequires: ffmpeg-devel BuildRequires: flac-devel BuildRequires: hidapi-devel @@ -58,10 +58,7 @@ BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libchromaprint-devel BuildRequires: fftw-devel -BuildRequires: libid3tag-devel -BuildRequires: libmad-devel BuildRequires: libmodplug-devel -BuildRequires: libmp4v2-devel BuildRequires: libsndfile-devel BuildRequires: libusbx-devel BuildRequires: lilv-devel @@ -129,13 +126,13 @@ cp %{SOURCE1} %{__cmake_builddir}/downloads -DBATTERY=ON \ -DBROADCAST=ON \ -DBULK=ON \ - -DFAAD=ON \ + -DFAAD=OFF \ -DFFMPEG=ON \ -DHID=ON \ -DKEYFINDER=ON \ -DLOCALECOMPARE=ON \ -DLILV=ON \ - -DMAD=ON \ + -DMAD=OFF \ -DMODPLUG=ON \ -DOPUS=ON \ -DQTKEYCHAIN=ON \