diff --git a/ffmpeg1.spec b/ffmpeg1.spec index 11da7a6..4b93d30 100644 --- a/ffmpeg1.spec +++ b/ffmpeg1.spec @@ -10,7 +10,7 @@ Name: ffmpeg1 Epoch: 1 Version: 1.2.1 -Release: 3mamba +Release: 4mamba Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Group: System/Libraries Vendor: openmamba @@ -254,13 +254,14 @@ export CFLAGS="%{optflags} -fno-unit-at-a-time -D__LINUX_USER__" --disable-stripping \ --enable-libopenjpeg \ --enable-libspeex \ - --enable-swscale \ + --disable-swscale \ + --disable-swresample \ --enable-x11grab \ %if %enable_gpl --enable-gpl \ --enable-version3 \ --enable-libxvid \ - --enable-postproc \ + --disable-postproc \ --enable-libx264 \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ @@ -360,13 +361,13 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %files %defattr(-,root,root) -%{_bindir}/ffmpeg -%{_bindir}/ffplay +#%{_bindir}/ffmpeg +#%{_bindir}/ffplay %{_bindir}/ffprobe %{_bindir}/ffserver %{_datadir}/ffmpeg/ffprobe.xsd -%{_mandir}/man1/ffmpeg.1.gz -%{_mandir}/man1/ffplay.1.gz +#%{_mandir}/man1/ffmpeg.1.gz +#%{_mandir}/man1/ffplay.1.gz %{_mandir}/man1/ffprobe.1.gz %{_mandir}/man1/ffserver.1.gz %{_mandir}/man1/ffmpeg-bitstream-filters.1.gz @@ -375,9 +376,10 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_mandir}/man1/ffmpeg-filters.1.gz %{_mandir}/man1/ffmpeg-formats.1.gz %{_mandir}/man1/ffmpeg-protocols.1.gz -%{_mandir}/man1/ffmpeg-resampler.1.gz -%{_mandir}/man1/ffmpeg-scaler.1.gz +#%{_mandir}/man1/ffmpeg-resampler.1.gz +#%{_mandir}/man1/ffmpeg-scaler.1.gz %{_mandir}/man1/ffmpeg-utils.1.gz +%{_datadir}/ffmpeg/examples/README %doc CREDITS README %files examples @@ -460,50 +462,53 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_libdir}/pkgconfig/libavutil.pc %{_mandir}/man1/libavutil.3.gz -%files -n libpostproc-ffmpeg1 -%defattr(-,root,root) -%{_libdir}/libpostproc.so.* +#%files -n libpostproc-ffmpeg1 +#%defattr(-,root,root) +#%{_libdir}/libpostproc.so.* -%files -n libpostproc-ffmpeg1-devel -%defattr(-,root,root) -%dir %{_includedir}/libpostproc -%{_includedir}/libpostproc/postprocess.h -%{_includedir}/libpostproc/version.h -%{_libdir}/libpostproc.a -%{_libdir}/libpostproc.so -%{_libdir}/pkgconfig/libpostproc.pc -%{_datadir}/ffmpeg/examples/README +#%files -n libpostproc-ffmpeg1-devel +#%defattr(-,root,root) +#%dir %{_includedir}/libpostproc +#%{_includedir}/libpostproc/postprocess.h +#%{_includedir}/libpostproc/version.h +#%{_libdir}/libpostproc.a +#%{_libdir}/libpostproc.so +#%{_libdir}/pkgconfig/libpostproc.pc +#%{_datadir}/ffmpeg/examples/README -%files -n libswscale-ffmpeg1 -%defattr(-,root,root) -%{_libdir}/libswscale.so.* +#%files -n libswscale-ffmpeg1 +#%defattr(-,root,root) +#%{_libdir}/libswscale.so.* -%files -n libswscale-ffmpeg1-devel -%defattr(-,root,root) -%dir %{_includedir}/libswscale -%{_includedir}/libswscale/*.h -%{_libdir}/libswscale.a -%{_libdir}/libswscale.so -%{_libdir}/pkgconfig/libswscale.pc -%{_mandir}/man1/libswscale.3.gz +#%files -n libswscale-ffmpeg1-devel +#%defattr(-,root,root) +#%dir %{_includedir}/libswscale +#%{_includedir}/libswscale/*.h +#%{_libdir}/libswscale.a +#%{_libdir}/libswscale.so +#%{_libdir}/pkgconfig/libswscale.pc +#%{_mandir}/man1/libswscale.3.gz -%files -n libswresample-ffmpeg1 -%defattr(-,root,root) -%{_libdir}/libswresample.so.* +#%files -n libswresample-ffmpeg1 +#%defattr(-,root,root) +#%{_libdir}/libswresample.so.* -%files -n libswresample-ffmpeg1-devel -%defattr(-,root,root) -%dir %{_includedir}/libswresample -%{_includedir}/libswresample/*.h -%{_libdir}/libswresample.a -%{_libdir}/libswresample.so -%{_libdir}/pkgconfig/libswresample.pc -%{_mandir}/man1/libswresample.3.gz +#%files -n libswresample-ffmpeg1-devel +#%defattr(-,root,root) +#%dir %{_includedir}/libswresample +#%{_includedir}/libswresample/*.h +#%{_libdir}/libswresample.a +#%{_libdir}/libswresample.so +#%{_libdir}/pkgconfig/libswresample.pc +#%{_mandir}/man1/libswresample.3.gz -%files devel -%defattr(-,root,root) +#%files devel +#%defattr(-,root,root) %changelog +* Wed May 14 2014 Silvan Calarco 1.2.1-4mamba +- disable postproc, swresample, swscale for now to avoid conflicting with ffmpeg 2.2 + * Fri Feb 28 2014 Silvan Calarco 1.2.1-3mamba - rebuilt as legacy package