upstream fixes for ffmpeg5

[packages/ffms2.git] / ffms2.spec

diff --git a/ffms2.spec b/ffms2.spec
index a4f70e920ae297b9b0bdbc296e2586f290f5089c..132a3d11b316050eac2a206308272b2514051c6d 100644 (file)
--- a/ffms2.spec
+++ b/ffms2.spec
@@ -6,24 +6,28 @@
 Summary:       FFmpegSource - FFmpeg wrapper library
 Summary(pl.UTF-8):     FFmpegSource - biblioteka obudowująca FFmpeg
 Name:          ffms2
-Version:       2.20
-Release:       3
+Version:       2.40
+Release:       1
 License:       MIT (ffmpegsource itself), GPL v3+ (forced by ffmpeg)
 Group:         Libraries
+#Source0Download: https://github.com/FFMS/ffms2/releases
 Source0:       https://github.com/FFMS/ffms2/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d6f2faa9e0ffed2e2d8d926592a87744
-Patch0:                ffmpegsource-ffmpeg011.patch
+# Source0-md5: 141f194432d70bbf5456a847043f332a
+Patch0:                ffmpeg5.patch
 URL:           https://github.com/FFMS/ffms2
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1:1.11
 # PKG_CHECK_MODULES(LIBAV, [libavformat >= 53.20.0 libavcodec >= 53.24.0 libswscale >= 0.7.0 libavutil >= 51.21.0 ])
 BuildRequires: ffmpeg-devel >= 0.9
-# libavresample >= 1.0.0
+# libavresample >= 1.0.0 or libswresample >= 1.0.0
 %{?with_avresample:BuildRequires:      ffmpeg-devel >= 1.1}
+%ifarch %{armv6}
+BuildRequires: libatomic-devel
+%endif
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.0
 BuildRequires: pkgconfig >= 1:0.22
-BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: rpmbuild(macros) >= 2.007
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 Obsoletes:     ffmpegsource < 2.20
@@ -84,18 +88,21 @@ Statyczna biblioteka FFmpegSource.
 
 %prep
 %setup -q
-%patch0 -p0
-%undos src/core/{indexing,lavfindexer,utils}.cpp
-%{__rm} configure
+%patch0 -p1
+
+install -d src/config
 
 %build
-CXXFLAGS="%{rpmcxxflags} -Wall -Wextra -Wno-missing-field-initializers -Werror"
+CXXFLAGS="%{rpmcxxflags} -Wall -Wextra"
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+%ifarch %{armv6}
+       LIBS=-latomic \
+%endif
        --enable-avresample%{!?with_avresample:=no} \
        --disable-silent-rules \
        --enable-shared \
@@ -105,9 +112,13 @@ CXXFLAGS="%{rpmcxxflags} -Wall -Wextra -Wno-missing-field-initializers -Werror"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libffms2.la
+
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
@@ -121,13 +132,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README.md
 %attr(755,root,root) %{_bindir}/ffmsindex
 %attr(755,root,root) %{_libdir}/libffms2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libffms2.so.3
+%attr(755,root,root) %ghost %{_libdir}/libffms2.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*.{html,css}
+%doc doc/ffms2-*.md
 %attr(755,root,root) %{_libdir}/libffms2.so
-%{_libdir}/libffms2.la
 %{_includedir}/ffms.h
 %{_includedir}/ffmscompat.h
 %{_pkgconfigdir}/ffms2.pc