Hello community, here is the log from the commit of package qmmp-plugin-pack for openSUSE:Factory checked in at 2018-11-20 22:35:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp-plugin-pack (Old) and /work/SRC/openSUSE:Factory/.qmmp-plugin-pack.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qmmp-plugin-pack" Tue Nov 20 22:35:21 2018 rev:5 rq:648574 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp-plugin-pack/qmmp-plugin-pack.changes 2018-09-24 13:13:38.341667388 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp-plugin-pack.new.19453/qmmp-plugin-pack.changes 2018-11-20 22:35:23.270484971 +0100 @@ -1,0 +2,12 @@ +Mon Nov 12 09:37:06 UTC 2018 - olaf@aepfle.de + +- Fix version for taglib and mpg123 +- Add ffvideo pkg and fix build with qmmp-libswresample.patch +- All modules depend on main package to avoid stale pkgs in the future. + +------------------------------------------------------------------- +Sun Nov 11 12:31:19 UTC 2018 - olaf@aepfle.de + +- ExclusiveArch x86 because ARM lacks projectM-Qt5 + +------------------------------------------------------------------- New: ---- qmmp-libswresample.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp-plugin-pack.spec ++++++ --- /var/tmp/diff_new_pack.ygwVaD/_old 2018-11-20 22:35:23.842484606 +0100 +++ /var/tmp/diff_new_pack.ygwVaD/_new 2018-11-20 22:35:23.846484604 +0100 @@ -27,20 +27,31 @@ Group: Productivity/Multimedia/Sound/Players URL: http://qmmp.ylsoftware.com/plugins.php Source: http://qmmp.ylsoftware.com/files/plugins/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE qmmp-libswresample.patch olaf@aepfle.de -- Fix ffvideo build. +Patch0: qmmp-libswresample.patch BuildRequires: cmake BuildRequires: libqmmp-plugins <= %{qmmp_ver_max} BuildRequires: libqmmp-plugins >= %{qmmp_ver_min} BuildRequires: libqt5-qttools-devel >= 5.4 BuildRequires: pkgconfig +BuildRequires: yasm BuildRequires: pkgconfig(Qt5Core) >= 5.4 BuildRequires: pkgconfig(Qt5Sql) >= 5.4 BuildRequires: pkgconfig(Qt5Widgets) >= 5.4 -BuildRequires: pkgconfig(libmpg123) +BuildRequires: pkgconfig(libavcodec) >= 57.48.101 +BuildRequires: pkgconfig(libavformat) >= 57.40.101 +BuildRequires: pkgconfig(libavutil) >= 55.27.100 +BuildRequires: pkgconfig(libmpg123) >= 1.13.0 +BuildRequires: pkgconfig(libswresample) +BuildRequires: pkgconfig(libswscale) >= 4.1.100 BuildRequires: pkgconfig(libxmp) BuildRequires: pkgconfig(qmmp) <= %{qmmp_ver_max} BuildRequires: pkgconfig(qmmp) >= %{qmmp_ver_min} BuildRequires: pkgconfig(samplerate) -BuildRequires: pkgconfig(taglib) >= 1.9 +BuildRequires: pkgconfig(taglib) >= 1.10 +Requires: qmmp <= %{qmmp_ver_max} +Requires: qmmp >= %{qmmp_ver_min} +ExclusiveArch: %ix86 x86_64 %description This package contains extra plugins for Qmmp. @@ -48,18 +59,24 @@ %package ffap Summary: Enhanced Monkey's Audio (APE) decoder for Qmmp Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description ffap Enhanced Monkey's Audio (APE) decoder (24-bit samples and embedded CUE support). +%package ffvideo +Summary: Video Playback Qmmp plugin +Group: Productivity/Multimedia/Sound/Players +Requires: %{name} = %{version}-%{release} + +%description ffvideo +Qmmp plugin to play videos. + %package goom Summary: Goom visualisation Qmmp plugin Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description goom Qmmp plugin which provides goom visualisation. @@ -67,8 +84,7 @@ %package history Summary: Qmpp history plugin Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description history Qmmp plugin which provides history. @@ -76,8 +92,7 @@ %package mpg123 Summary: Qmmp plugin which uses libmpg123 for decoding Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description mpg123 Qmmp plugin which uses libmpg123 for decoding of MPEG v1/2 @@ -86,8 +101,7 @@ %package samplerate Summary: Qmmp plugin which uses libsamplerate for decoding Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description samplerate Qmmp plugin which uses libsamplerate resampling library. @@ -95,52 +109,55 @@ %package xmp Summary: Qmmp plugin which uses the libxmp module library Group: Productivity/Multimedia/Sound/Players -Requires: qmmp <= %{qmmp_ver_max} -Requires: qmmp >= %{qmmp_ver_min} +Requires: %{name} = %{version}-%{release} %description xmp Qmmp plugin which uses libxmp to play module and tracker files. %prep %setup -q +%patch0 -p1 %build %cmake \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DLIB_DIR=%{_lib} -make %{?_smp_mflags} V=1 +%make_jobs %install %cmake_install -%files ffap +%files %license COPYING %doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/ + +%files ffap +%dir %{_libdir}/qmmp/Input/ %{_libdir}/qmmp/Input/libffap.so +%files ffvideo +%dir %{_libdir}/qmmp/Engines/ +%{_libdir}/qmmp/Engines/libffvideo.so + %files goom -%license COPYING -%doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/Visual/ %{_libdir}/qmmp/Visual/libgoom.so %files history -%license COPYING -%doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/General/ %{_libdir}/qmmp/General/libhistory.so %files mpg123 -%license COPYING -%doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/Input/ %{_libdir}/qmmp/Input/libmpg123.so %files samplerate -%license COPYING -%doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/Effect/ %{_libdir}/qmmp/Effect/libsrconverter.so %files xmp -%license COPYING -%doc AUTHORS ChangeLog README +%dir %{_libdir}/qmmp/Input/ %{_libdir}/qmmp/Input/libxmp.so %changelog ++++++ qmmp-libswresample.patch ++++++ --- a/src/Engines/ffvideo/CMakeLists.txt +++ b/src/Engines/ffvideo/CMakeLists.txt @@ -9,7 +9,7 @@ link_directories( ${QMMP_LIBRARY_DIRS}) # minimal supported version # ffmpeg-3.1: libavcodec-57.48.101, libavformat-57.40.101, libavutil-55.27.100, libswscale-4.1.100 -pkg_check_modules(FFMPEG libavcodec>=57.48.101 libavformat>=57.40.101 libavutil>=55.27.100 libswscale>=4.1.100) +pkg_check_modules(FFMPEG libavcodec>=57.48.101 libavformat>=57.40.101 libavutil>=55.27.100 libswscale>=4.1.100 libswresample) include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS})