commit 2d4420649903c24839c063ed282ad080f4201b18 Author: Julian Sikorski <belegdol(a)fedoraproject.org&gt; Date: Sat Jul 30 09:59:13 2016 +0200 Updated to 3.1.1 - Dropped included patch - Added $RPM_LD_FLAGS to %configure - Switched to openjpeg2 - Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani) .gitignore | 1 + ...nfigure-add-direct-detection-of-libopencv.patch | 39 ---------------------- ffmpeg.spec | 18 +++++++--- ffmpeg_opj2.patch | 36 ++++++++++++++++++++ sources | 2 +- 5 files changed, 51 insertions(+), 45 deletions(-) --- diff --git a/.gitignore b/.gitignore index 2dbc12b..2565935 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ffmpeg-2.8.7.tar.xz +/ffmpeg-3.1.1.tar.xz diff --git a/ffmpeg.spec b/ffmpeg.spec index e27142c..8da881d 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -12,8 +12,8 @@ Summary: Digital VCR and streaming server Name: ffmpeg -Version: 3.0.2 -Release: 5%{?date}%{?date:git}%{?rel}%{?dist} +Version: 3.1.1 +Release: 1%{?date}%{?date:git}%{?rel}%{?dist} %if 0%{?_with_amr} || 0%{?_with_gmp} License: GPLv3+ %else @@ -25,7 +25,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 %else Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif -Patch0: 0001-configure-add-direct-detection-of-libopencv.patch +Patch0: %{name}_opj2.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: bzip2-devel %{?_with_faac:BuildRequires: faac-devel} @@ -79,7 +79,7 @@ BuildRequires: opencl-headers ocl-icd-devel Recommends: opencl-icd %endif %{!?_without_opencv:BuildRequires: opencv-devel} -BuildRequires: openjpeg-devel +BuildRequires: openjpeg2-devel BuildRequires: opus-devel %{!?_without_pulse:BuildRequires: pulseaudio-libs-devel} BuildRequires: perl(Pod::Man) @@ -152,6 +152,7 @@ This package contains development files for %{name} --mandir=%{_mandir} \\\ --arch=%{_target_cpu} \\\ --optflags="$RPM_OPT_FLAGS" \\\ + --extra-ldflags="$RPM_LD_FLAGS" \\\ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ --enable-bzlib \\\ %{?_with_chromaprint:--enable-chromaprint} \\\ @@ -227,7 +228,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION %else %setup -q -n ffmpeg-%{version} %endif -%patch0 -p1 +%patch0 -p1 -b .opj2 # fix -O3 -g in host_cflags sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure mkdir -p _doc/examples @@ -322,6 +323,13 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} %changelog +* Wed Jul 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 3.1.1-1 +- Updated to 3.1.1 +- Dropped included patch +- Added $RPM_LD_FLAGS to %%configure +- Switched to openjpeg2 +- Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani) + * Sat Jul 23 2016 Igor Gnatenko <ignatenko(a)redhat.com&gt; - 3.0.2-5 - Rebuild for libvpx soname bump diff --git a/ffmpeg_opj2.patch b/ffmpeg_opj2.patch new file mode 100644 index 0000000..11e66b4 --- /dev/null +++ b/ffmpeg_opj2.patch @@ -0,0 +1,36 @@ +diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure +--- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200 ++++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200 +@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea + require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || + require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } + enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion +-enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || ++enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || + check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || + check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || + check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || +diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c +--- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000 +0200 ++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27 22:25:45.509327071 +0200 +@@ -24,8 +24,6 @@ + * JPEG 2000 decoder using libopenjpeg + */ + +-#define OPJ_STATIC +- + #include "libavutil/common.h" + #include "libavutil/imgutils.h" + #include "libavutil/intreadwrite.h" +diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c +--- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000 +0200 ++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27 22:25:40.298218807 +0200 +@@ -24,8 +24,6 @@ + * JPEG 2000 encoder using libopenjpeg + */ + +-#define OPJ_STATIC +- + #include "libavutil/avassert.h" + #include "libavutil/common.h" + #include "libavutil/imgutils.h" diff --git a/sources b/sources index 6d37bd9..0247300 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -beb5c69c671aba1386e7156fc2af1ab6 ffmpeg-3.0.2.tar.xz +4ba7033da5d9ac4d0391516c7e5d97e4 ffmpeg-3.1.1.tar.xz