diff --git a/ffmpeg.spec b/ffmpeg.spec index 2ef8ac5..5f92474 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -4,8 +4,8 @@ Name: ffmpeg Epoch: 2 -Version: 6.1.1 -Release: 1mamba +Version: 7.0.1 +Release: 4mamba Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Group: System/Libraries Vendor: openmamba @@ -94,215 +94,221 @@ Provides: ffmpegpresets %description presets Preset configuration files used by libavcodec. -%package -n libswscale-ffmpeg +%package -n libswscale Summary: ffmpeg video scaling library Group: System/Libraries -Provides: libswscale -Obsoletes: libswscale < 1:5.0 +Provides: libswscale-ffmpeg +Obsoletes: libswscale-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libswscale-ffmpeg1 < 1:5.0 Obsoletes: libswscale-libav < 1:5.0 -%description -n libswscale-ffmpeg +%description -n libswscale ffmpeg video scaling library. -%package -n libswscale-ffmpeg-devel +%package -n libswscale-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libswscale-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libswscale-devel -Obsoletes: libswscale-devel < 1:5.0 +Requires: libswscale = %{?epoch:%epoch:}%{version}-%{release} +Provides: libswscale-ffmpeg-devel +Obsoletes: libswscale-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libswscale-libav-devel < 1:5.0 -%description -n libswscale-ffmpeg-devel +%description -n libswscale-devel ffmpeg video scaling library. This package contains the header files and static libraries needed to compile applications or shared objects that use libswscale -%package -n libswresample-ffmpeg +%package -n libswresample Summary: ffmpeg resampling library Group: System/Libraries -Provides: libswresample +Provides: libswresample-ffmpeg +Obsoletes: libswresample-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libswresample-ffmpeg1 < 1:5.0 Obsoletes: libswresample-libav < 1:5.0 -%description -n libswresample-ffmpeg +%description -n libswresample ffmpeg resampling library. -%package -n libswresample-ffmpeg-devel +%package -n libswresample-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libswresample-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libresample-devel +Requires: libswresample = %{?epoch:%epoch:}%{version}-%{release} +Provides: libswresample-ffmpeg-devel +Obsoletes: libswresample-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libswresample-libav-devel < 1:5.0 -%description -n libswresample-ffmpeg-devel +%description -n libswresample-devel ffmpeg resampling library. This package contains the header files and static libraries needed to compile applications or shared objects that use libswscale -%package -n libavcodec-ffmpeg +%package -n libavcodec Summary: ffmpeg library implementing various Audio/Video codecs Group: System/Libraries Requires: ffmpegpresets -Provides: libavcodec -Obsoletes: libavcodec < 1:5.0 +Provides: libavcodec-ffmpeg +Obsoletes: libavcodec-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavcodec-libav < 1:5.0 -%description -n libavcodec-ffmpeg +%description -n libavcodec ffmpeg library implementing various Audio/Video codecs. -%package -n libavcodec-ffmpeg-devel +%package -n libavcodec-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libavcodec-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libavcodec-devel -Obsoletes: libavcodec-devel < 1:5.0 +Requires: libavcodec = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavcodec-ffmpeg-devel +Obsoletes: libavcodec-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavcodec-libav-devel < 1:5.0 -%description -n libavcodec-ffmpeg-devel +%description -n libavcodec-devel ffmpeg library implementing various Audio/Video codecs. This package contains the header files and static libraries needed to compile applications or shared objects that use libavcodec -%package -n libavdevice-ffmpeg +%package -n libavdevice Summary: ffmpeg device handling library Group: System/Libraries -Provides: libavdevice -Obsoletes: libavdevice < 1:5.0 +Provides: libavcodec-ffmpeg +Obsoletes: libavcodec-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavdevice-libav-devel < 1:5.0 -%description -n libavdevice-ffmpeg +%description -n libavdevice ffmpeg device handling library. -%package -n libavdevice-ffmpeg-devel +%package -n libavdevice-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libavdevice-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libavdevice-devel -Obsoletes: libavdevice-devel < 1:5.0 +Requires: libavdevice = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavdevice-ffmpeg-devel +Obsoletes: libavdevice-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavdevice-libav-devel < 1:5.0 -%description -n libavdevice-ffmpeg-devel +%description -n libavdevice-devel ffmpeg device handling library. This package contains the header files and static libraries needed to compile applications or shared objects that use libavdevice. -%package -n libavfilter-ffmpeg +%package -n libavfilter Summary: ffmpeg filtering library Group: System/Libraries -Provides: libavfilter -Obsoletes: libavfilter < 1:5.0 +Provides: libavfilter-ffmpeg +Obsoletes: libavfilter-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavfilter-libav < 1:5.0 -%description -n libavfilter-ffmpeg +%description -n libavfilter ffmpeg filtering library. -%package -n libavfilter-ffmpeg-devel +%package -n libavfilter-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libavfilter-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libavfilter-devel -Obsoletes: libavfilter-devel < 1:5.0 +Requires: libavfilter = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavfilter-ffmpeg-devel +Obsoletes: libavfilter-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavfilter-libav-devel < 1:5.0 -%description -n libavfilter-ffmpeg-devel +%description -n libavfilter-devel ffmpeg filtering library. This package contains the header files and static libraries needed to compile applications or shared objects that use libavformat -%package -n libavformat-ffmpeg +%package -n libavformat Summary: ffmpeg format library Group: System/Libraries -Provides: libavformat -Obsoletes: libavformat < 1:5.0 +Provides: libavformat-ffmpeg +Obsoletes: libavformat-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavformat-libav < 1:5.0 -%description -n libavformat-ffmpeg +%description -n libavformat ffmpeg format library. -%package -n libavformat-ffmpeg-devel +%package -n libavformat-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libavformat-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libavformat-devel -Obsoletes: libavformat-devel < 1:5.0 +Requires: libavformat = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavformat-ffmpeg-devel +Obsoletes: libavformat-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavformat-libav-devel < 1:5.0 -%description -n libavformat-ffmpeg-devel +%description -n libavformat-devel ffmpeg format library. This package contains the header files and static libraries needed to compile applications or shared objects that use libavformat -%package -n libavutil-ffmpeg +%package -n libavutil Summary: Shared library part of ffmpeg Group: System/Libraries -Provides: libavutil -Obsoletes: libavutil < 1:5.0 +Provides: libavutil-ffmpeg +Obsoletes: libavutil-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavutil-libav < 1:5.0 -%description -n libavutil-ffmpeg -Shared library part of ffmpeg +%description -n libavutil +Shared library part of ffmpeg. -%package -n libavutil-ffmpeg-devel +%package -n libavutil-devel Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries -Requires: libavutil-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libavutil-devel -Obsoletes: libavutil-devel < 1:5.0 +Requires: libavutil = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavutil-ffmpeg-devel +Obsoletes: libavutil-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavutil-libav-devel < 1:5.0 -%description -n libavutil-ffmpeg-devel +%description -n libavutil-devel This is the common utility library from the ffmpeg project. It is required by all other ffmpeg libraries. This package contains the header files and static libraries needed to compile applications or shared objects that use libavutil -%package -n libpostproc-ffmpeg +%package -n libpostproc Summary: Video postprocessing library from ffmpeg Group: System/Libraries -Provides: libpostproc -Obsoletes: libpostproc < 1:5.0 +Provides: libpostproc-ffmpeg +Obsoletes: libpostproc-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libpostproc-ffmpeg1 < 1:5.0 Obsoletes: libpostproc-libav < 1:5.0 -%description -n libpostproc-ffmpeg +%description -n libpostproc FFmpeg is a very fast video and audio converter. It can also grab from a live audio/video source. This package contains only ffmpeg's postproc post-processing library which other projects such as transcode may use. Install this package if you intend to use MPlayer, transcode or other similar programs. -%package -n libpostproc-ffmpeg-devel +%package -n libpostproc-devel Summary: Video postprocessing library from ffmpeg Group: Development/Libraries -Requires: libpostproc-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} -Provides: libpostproc-devel -Obsoletes: libpostproc-devel < 1:5.0 +Requires: libpostproc = %{?epoch:%epoch:}%{version}-%{release} +Provides: libpostproc-ffmpeg-devel +Obsoletes: libpostproc-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libpostproc-libav-devel < 1:5.0 -%description -n libpostproc-ffmpeg-devel +%description -n libpostproc-devel FFmpeg is a very fast video and audio converter. It can also grab from a live audio/video source. This package contains only ffmpeg's postproc post-processing headers and static libraries which other projects such as transcode may use. Install this package if you intend to use MPlayer, transcode or other similar programs. -%package -n libavresample-ffmpeg +%package -n libavresample Summary: ffmpeg resample library Group: System/Libraries +Provides: libavresample-ffmpeg +Obsoletes: libavresample-ffmpeg <= 2:7.0.1-1mamba Obsoletes: libavresample-libav < 1:5.0 -%description -n libavresample-ffmpeg +%description -n libavresample FFmpeg resample library. -%package -n libavresample-ffmpeg-devel +%package -n libavresample-devel Summary: Shared header files and static libraries part of ffmpeg libavresample Group: System/Libraries -Requires: libavresample-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} +Requires: libavresample = %{?epoch:%epoch:}%{version}-%{release} +Provides: libavresample-ffmpeg-devel +Obsoletes: libavresample-ffmpeg-devel <= 2:7.0.1-1mamba Obsoletes: libavresample-libav-devel < 1:5.0 -%description -n libavresample-ffmpeg-devel +%description -n libavresample-devel FFmpeg resample library. This package contains the header files and static libraries needed to compile applications or shared objects that use libavutil %package devel Summary: Virtual package that installs all the FFmpeg development packages Group: Development/Libraries -Requires: libavcodec-ffmpeg-devel -Requires: libavdevice-ffmpeg-devel -Requires: libavfilter-ffmpeg-devel -Requires: libavformat-ffmpeg-devel -Requires: libavutil-ffmpeg-devel -Requires: libpostproc-ffmpeg-devel -Requires: libswscale-ffmpeg-devel -Requires: libswresample-ffmpeg-devel +Requires: libavcodec-devel +Requires: libavdevice-devel +Requires: libavfilter-devel +Requires: libavformat-devel +Requires: libavutil-devel +Requires: libpostproc-devel +Requires: libswscale-devel +Requires: libswresample-devel Obsoletes: libav-devel < 1:5.0 %description devel @@ -313,13 +319,17 @@ This is a virtual package that contains the dependencies necessary for installin %prep %setup -q -n ffmpeg-%{buildver} %define _default_patch_fuzz 2 -#%patch4 -p1 %patch 5 -p1 -b .add-av_stream_get_first_dts-for-chromium %build # configure not generated by autoconf # -D__LINUX_USER__ is required by crystalhd export CFLAGS="%{optflags} -fno-unit-at-a-time -D__LINUX_USER__" + +%ifarch %{ix86} +export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" +%endif + ./configure \ --prefix="%{_prefix}" \ --libdir="%{_libdir}" \ @@ -382,32 +392,32 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -n libavcodec-ffmpeg -p /sbin/ldconfig -%postun -n libavcodec-ffmpeg -p /sbin/ldconfig +%post -n libavcodec -p /sbin/ldconfig +%postun -n libavcodec -p /sbin/ldconfig -%post -n libavdevice-ffmpeg -p /sbin/ldconfig -%postun -n libavdevice-ffmpeg -p /sbin/ldconfig +%post -n libavdevice -p /sbin/ldconfig +%postun -n libavdevice -p /sbin/ldconfig -%post -n libavfilter-ffmpeg -p /sbin/ldconfig -%postun -n libavfilter-ffmpeg -p /sbin/ldconfig +%post -n libavfilter -p /sbin/ldconfig +%postun -n libavfilter -p /sbin/ldconfig -%post -n libavformat-ffmpeg -p /sbin/ldconfig -%postun -n libavformat-ffmpeg -p /sbin/ldconfig +%post -n libavformat -p /sbin/ldconfig +%postun -n libavformat -p /sbin/ldconfig -%post -n libavresample-ffmpeg -p /sbin/ldconfig -%postun -n libavresample-ffmpeg -p /sbin/ldconfig +%post -n libavresample -p /sbin/ldconfig +%postun -n libavresample -p /sbin/ldconfig -%post -n libavutil-ffmpeg -p /sbin/ldconfig -%postun -n libavutil-ffmpeg -p /sbin/ldconfig +%post -n libavutil -p /sbin/ldconfig +%postun -n libavutil -p /sbin/ldconfig -%post -n libpostproc-ffmpeg -p /sbin/ldconfig -%postun -n libpostproc-ffmpeg -p /sbin/ldconfig +%post -n libpostproc -p /sbin/ldconfig +%postun -n libpostproc -p /sbin/ldconfig -%post -n libswscale-ffmpeg -p /sbin/ldconfig -%postun -n libswscale-ffmpeg -p /sbin/ldconfig +%post -n libswscale -p /sbin/ldconfig +%postun -n libswscale -p /sbin/ldconfig -%post -n libswresample-ffmpeg -p /sbin/ldconfig -%postun -n libswresample-ffmpeg -p /sbin/ldconfig +%post -n libswresample -p /sbin/ldconfig +%postun -n libswresample -p /sbin/ldconfig %files %defattr(-,root,root) @@ -419,11 +429,9 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_mandir}/man1/ffmpeg.1* %{_mandir}/man1/ffplay.1* %{_mandir}/man1/ffprobe.1* -#%{_mandir}/man1/ffserver.1* %{_mandir}/man1/ffmpeg-all.1* %{_mandir}/man1/ffplay-all.1* %{_mandir}/man1/ffprobe-all.1* -#%{_mandir}/man1/ffserver-all.1* %{_mandir}/man1/ffmpeg-bitstream-filters.1* %{_mandir}/man1/ffmpeg-codecs.1* %{_mandir}/man1/ffmpeg-devices.1* @@ -438,20 +446,20 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %files examples %defattr(-,root,root) %dir %{_datadir}/ffmpeg/examples -%{_datadir}/ffmpeg/examples/Makefile %{_datadir}/ffmpeg/examples/*.c +%{_datadir}/ffmpeg/examples/Makefile +%{_datadir}/ffmpeg/examples/README %files presets %defattr(-,root,root) %dir %{_datadir}/ffmpeg -#%{_datadir}/ffmpeg/libx264-*.ffpreset %{_datadir}/ffmpeg/libvpx-*.ffpreset -%files -n libavcodec-ffmpeg +%files -n libavcodec %defattr(-,root,root) %{_libdir}/libavcodec.so.* -%files -n libavcodec-ffmpeg-devel +%files -n libavcodec-devel %defattr(-,root,root) %dir %{_includedir}/libavcodec %{_includedir}/libavcodec/* @@ -460,91 +468,77 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_libdir}/libavcodec.a %{_libdir}/libavcodec.so %{_libdir}/pkgconfig/libavcodec.pc -%{_mandir}/man3/libavcodec.3.gz +%{_mandir}/man3/libavcodec.3* -%files -n libavdevice-ffmpeg +%files -n libavdevice %defattr(-,root,root) %{_libdir}/libavdevice.so.* -%files -n libavdevice-ffmpeg-devel +%files -n libavdevice-devel %defattr(-,root,root) %dir %{_includedir}/libavdevice %{_includedir}/libavdevice/*.h %{_libdir}/libavdevice.a %{_libdir}/libavdevice.so %{_libdir}/pkgconfig/libavdevice.pc -%{_mandir}/man3/libavdevice.3.gz +%{_mandir}/man3/libavdevice.3* -%files -n libavfilter-ffmpeg +%files -n libavfilter %defattr(-,root,root) %{_libdir}/libavfilter.so.* -%files -n libavfilter-ffmpeg-devel +%files -n libavfilter-devel %defattr(-,root,root) %dir %{_includedir}/libavfilter %{_includedir}/libavfilter/*.h %{_libdir}/libavfilter.a %{_libdir}/libavfilter.so %{_libdir}/pkgconfig/libavfilter.pc -%{_mandir}/man3/libavfilter.3.gz +%{_mandir}/man3/libavfilter.3* -%files -n libavformat-ffmpeg +%files -n libavformat %defattr(-,root,root) %{_libdir}/libavformat.so.* -%files -n libavformat-ffmpeg-devel +%files -n libavformat-devel %defattr(-,root,root) %dir %{_includedir}/libavformat %{_includedir}/libavformat/*.h %{_libdir}/libavformat.a %{_libdir}/libavformat.so %{_libdir}/pkgconfig/libavformat.pc -%{_mandir}/man3/libavformat.3.gz +%{_mandir}/man3/libavformat.3* -#%files -n libavresample-ffmpeg -#%defattr(-,root,root) -#%{_libdir}/libavresample.so.* - -#%files -n libavresample-ffmpeg-devel -#%defattr(-,root,root) -#%dir %{_includedir}/libavresample -#%{_includedir}/libavresample/avresample.h -#%{_includedir}/libavresample/version.h -#%{_libdir}/libavresample.a -#%{_libdir}/libavresample.so -#%{_libdir}/pkgconfig/libavresample.pc - -%files -n libavutil-ffmpeg +%files -n libavutil %defattr(-,root,root) %{_libdir}/libavutil.so.* -%files -n libavutil-ffmpeg-devel +%files -n libavutil-devel %defattr(-,root,root) %dir %{_includedir}/libavutil %{_includedir}/libavutil/*.h %{_libdir}/libavutil.a %{_libdir}/libavutil.so %{_libdir}/pkgconfig/libavutil.pc -%{_mandir}/man3/libavutil.3.gz +%{_mandir}/man3/libavutil.3* -%files -n libpostproc-ffmpeg +%files -n libpostproc %defattr(-,root,root) %{_libdir}/libpostproc.so.* -%files -n libpostproc-ffmpeg-devel +%files -n libpostproc-devel %defattr(-,root,root) %dir %{_includedir}/libpostproc %{_includedir}/libpostproc/*.h %{_libdir}/libpostproc.a %{_libdir}/libpostproc.so %{_libdir}/pkgconfig/libpostproc.pc -%{_datadir}/ffmpeg/examples/README -%files -n libswscale-ffmpeg +%files -n libswscale %defattr(-,root,root) %{_libdir}/libswscale.so.* -%files -n libswscale-ffmpeg-devel +%files -n libswscale-devel %defattr(-,root,root) %dir %{_includedir}/libswscale %{_includedir}/libswscale/*.h @@ -553,11 +547,11 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_libdir}/pkgconfig/libswscale.pc %{_mandir}/man3/libswscale.3* -%files -n libswresample-ffmpeg +%files -n libswresample %defattr(-,root,root) %{_libdir}/libswresample.so.* -%files -n libswresample-ffmpeg-devel +%files -n libswresample-devel %defattr(-,root,root) %dir %{_includedir}/libswresample %{_includedir}/libswresample/*.h @@ -572,6 +566,21 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_docdir}/ffmpeg/* %changelog +* Mon Jun 10 2024 Silvan Calarco 7.0.1-4mamba +- added legacy provides for *-ffmpeg{,-devel} + +* Sat Jun 08 2024 Silvan Calarco 7.0.1-3mamba +- libavdevice-devel: fix obsolete for libavdevice-ffmpeg-devel + +* Mon May 27 2024 Silvan Calarco 7.0.1-2mamba +- remove -ffmpeg suffix from package names + +* Sun May 26 2024 Automatic Build System 7.0.1-1mamba +- automatic version update by autodist + +* Sat Apr 06 2024 Automatic Build System 7.0-1mamba +- automatic version update by autodist + * Sun Dec 31 2023 Automatic Build System 6.1.1-1mamba - automatic version update by autodist