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)
9 years ago · 2d44206499
parent ef5695bc98
commit 2d44206499
5 changed files with 51 additions and 45 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 ffmpeg-2.8.7.tar.xz
+/ffmpeg-3.1.1.tar.xz
--- a/0001-configure-add-direct-detection-of-libopencv.patch
+++ b/0001-configure-add-direct-detection-of-libopencv.patch
@ -1,39 +0,0 @@
-From 15708f13477aaf2effdc0d7fc727507bc468335a Mon Sep 17 00:00:00 2001
-From: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
-Date: Sun, 7 Feb 2016 23:25:53 +0100
-Subject: [PATCH] configure: add direct detection of libopencv
-
-The pkg-config file contains all opencv libraries, not only the
-neccessary ones.
-
-This change makes it possible to use the libopencv-imgproc-dev Debian
-package instead of libopencv-dev, saving about 200 MB of useless
-build-dependencies.
-
-In particular one doesn't need to install the parts of opencv that
-depend on ffmpeg libraries.
-
-Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Reviewed-by: James Almer <jamrial@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
- configure | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index f4b821a..f28aa8f 100755
--- a/configure
-+++ b/configure
-@@ -5566,7 +5566,8 @@ enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- enabled libopencv         && { check_header opencv2/core/core_c.h &&
-                               require_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
-+                               { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
-+                                 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 ||
-- 
-2.7.4
-
--- 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@fedoraproject.org> - 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@redhat.com> - 3.0.2-5
 - Rebuild for libvpx soname bump

--- a/ffmpeg_opj2.patch
+++ 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"
--- a/2
+++ b/2
@ -1 +1 @@
-beb5c69c671aba1386e7156fc2af1ab6  ffmpeg-3.0.2.tar.xz
+4ba7033da5d9ac4d0391516c7e5d97e4  ffmpeg-3.1.1.tar.xz