Updated to 3.2

- Dropped openjpeg2 patch
- Updated BuildRequires to SDL2-devel
- Incorporated some cleanups from RF #4243
el8
Julian Sikorski 8 years ago
parent dff2eef58d
commit 9a2383b519

1
.gitignore vendored

@ -6,3 +6,4 @@ ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.4.tar.xz /ffmpeg-3.1.4.tar.xz
/ffmpeg-3.1.5.tar.bz2 /ffmpeg-3.1.5.tar.bz2
/ffmpeg-3.1.5.tar.xz /ffmpeg-3.1.5.tar.xz
/ffmpeg-3.2.tar.xz

@ -19,7 +19,7 @@
Summary: Digital VCR and streaming server Summary: Digital VCR and streaming server
Name: ffmpeg Name: ffmpeg
Version: 3.1.5 Version: 3.2
Release: 1%{?date}%{?date:git}%{?rel}%{?dist} Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp} %if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+ License: GPLv3+
@ -28,9 +28,9 @@ License: GPLv2+
%endif %endif
URL: http://ffmpeg.org/ URL: http://ffmpeg.org/
%if 0%{?date} %if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2 Source0: %{name}-%{?branch}%{date}.tar.bz2
%else %else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
%endif %endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
@ -93,7 +93,7 @@ BuildRequires: opus-devel
BuildRequires: perl(Pod::Man) BuildRequires: perl(Pod::Man)
%{?_with_rubberband:BuildRequires: rubberband-devel} %{?_with_rubberband:BuildRequires: rubberband-devel}
BuildRequires: schroedinger-devel BuildRequires: schroedinger-devel
BuildRequires: SDL-devel BuildRequires: SDL2-devel
%{?_with_snappy:BuildRequires: snappy-devel} %{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel BuildRequires: soxr-devel
BuildRequires: speex-devel BuildRequires: speex-devel
@ -152,12 +152,13 @@ This package contains development files for %{name}
--prefix=%{_prefix} \\\ --prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\ --bindir=%{_bindir} \\\
--datadir=%{_datadir}/%{name} \\\ --datadir=%{_datadir}/%{name} \\\
--docdir=%{_docdir}/%{name} \\\
--incdir=%{_includedir}/%{name} \\\ --incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\ --libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\ --mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\ --arch=%{_target_cpu} \\\
--optflags="$RPM_OPT_FLAGS" \\\ --optflags="%{optflags}" \\\
--extra-ldflags="$RPM_LD_FLAGS" \\\ --extra-ldflags="%{?__global_ldflags}" \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\ --enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\ %{?_with_chromaprint:--enable-chromaprint} \\\
@ -175,7 +176,7 @@ This package contains development files for %{name}
%{!?_without_cdio:--enable-libcdio} \\\ %{!?_without_cdio:--enable-libcdio} \\\
%{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\ %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\ %{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk-aac:--enable-libfdk-aac --enable-nonfree} \\\ %{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\
%{?_with_flite:--enable-libflite} \\\ %{?_with_flite:--enable-libflite} \\\
%{!?_without_jack:--enable-indev=jack} \\\ %{!?_without_jack:--enable-indev=jack} \\\
--enable-libfreetype \\\ --enable-libfreetype \\\
@ -227,13 +228,13 @@ This package contains development files for %{name}
%prep %prep
%if 0%{?date} %if 0%{?date}
%setup -q -n ffmpeg-%{?branch}%{date} %setup -q -n %{name}-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else %else
%setup -q -n ffmpeg-%{version} %setup -q
%endif %endif
# fix -O3 -g in host_cflags # fix -O3 -g in host_cflags
sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples mkdir -p _doc/examples
cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
@ -275,15 +276,15 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%endif %endif
%endif %endif
make %{?_smp_mflags} V=1 %make_build V=1
make documentation V=1 make documentation V=1
make alltools V=1 make alltools V=1
%install %install
make install DESTDIR=$RPM_BUILD_ROOT V=1 %make_install V=1
rm -r $RPM_BUILD_ROOT%{_datadir}/ffmpeg/examples rm -r %{buildroot}%{_datadir}/%{name}/examples
%if 0%{!?ffmpegsuffix:1} %if 0%{!?ffmpegsuffix:1}
install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif %endif
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
@ -306,7 +307,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%{_mandir}/man1/ffplay*.1* %{_mandir}/man1/ffplay*.1*
%{_mandir}/man1/ffprobe*.1* %{_mandir}/man1/ffprobe*.1*
%{_mandir}/man1/ffserver*.1* %{_mandir}/man1/ffserver*.1*
%{_datadir}/ffmpeg %{_datadir}/%{name}
%endif %endif
%files libs %files libs
@ -322,13 +323,19 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%files devel %files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt %doc MAINTAINERS doc/APIchanges doc/*.txt
%doc _doc/examples %doc _doc/examples
%doc %{_docdir}/ffmpeg/*.html %doc %{_docdir}/%{name}/*.html
%{_includedir}/ffmpeg %{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc %{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so %{_libdir}/lib*.so
%changelog %changelog
* Sat Oct 29 2016 Julian Sikorski <belegdol@fedoraproject.org> - 3.2-1
- Updated to 3.2
- Dropped openjpeg2 patch
- Updated BuildRequires to SDL2-devel
- Incorporated some cleanups from RF #4243
* Tue Oct 25 2016 Julian Sikorski <belegdol@fedoraproject.org> - 3.1.5-1 * Tue Oct 25 2016 Julian Sikorski <belegdol@fedoraproject.org> - 3.1.5-1
- Updated to 3.1.5 - Updated to 3.1.5

@ -1 +1 @@
a09f7730ceeb665c6f7da0b884dd00f9 ffmpeg-3.1.5.tar.xz 3c065fb5baae1aeb1494a09ac984b2de ffmpeg-3.2.tar.xz

Loading…
Cancel
Save