[packages/ffmpeg] - fix building with opencv4 and reenable build

[baggins]

commit a9e080d9bbbdcf605ab89c9175680eca554c1778
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 7 20:05:18 2021 +0100

    - fix building with opencv4 and reenable build

 ffmpeg.spec   |  7 +++++--
 opencv4.patch | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index fa1fa5f..8185979 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -49,7 +49,7 @@
 %bcond_without	omx		# OpenMAX IL support
 %bcond_without	openal		# OpenAL 1.1 capture support
 %bcond_without	opencl		# OpenCL 1.2 code
-%bcond_with	opencv		# OpenCV video filtering
+%bcond_without	opencv		# OpenCV video filtering
 %bcond_without	opengl		# OpenGL rendering support
 %bcond_with	openh264	# OpenH264 H.264 encoder
 %bcond_without	openmpt		# OpenMPT module decoder
@@ -123,6 +123,7 @@ Source0:	https://ffmpeg.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	29529337d9b8f794a6142db10b717ec5
 Patch0:		%{name}-omx-libnames.patch
 Patch1:		%{name}-atadenoise.patch
+Patch2:		opencv4.patch
 URL:		http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK >= 10.9.5}
 %{?with_openal:BuildRequires:	OpenAL-devel >= 1.1}
@@ -514,6 +515,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -588,7 +590,8 @@ EOF
 	--libdir=%{_libdir} \
 	--shlibdir=%{_libdir} \
 	--mandir=%{_mandir} \
-	--extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}%{?with_decklink: -I/usr/include/decklink}" \
+	--extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}%{?with_decklink: -I/usr/include/decklink} -I/usr/include/opencv4" \
+	--extra-cxxflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcxxflags}%{?with_decklink: -I/usr/include/decklink} -I/usr/include/opencv4" \
 	--extra-ldflags="%{rpmcflags} %{rpmldflags}" \
 	--cc="%{__cc}" \
 	--disable-debug \
diff --git a/opencv4.patch b/opencv4.patch
new file mode 100644
index 0000000..2c6c4c1
--- /dev/null
+++ b/opencv4.patch
@@ -0,0 +1,14 @@
+--- ffmpeg-4.3.2/configure~	2021-02-20 21:27:47.000000000 +0100
++++ ffmpeg-4.3.2/configure	2021-03-06 22:46:31.336556852 +0100
+@@ -6340,9 +6340,9 @@
+ 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_headers opencv2/core/core_c.h &&
+-                               { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
++                               { check_pkg_config libopencv opencv4 opencv2/core/core_c.h cvCreateImageHeader ||
+                                  require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+-                               require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
++                               require_pkg_config libopencv opencv4 opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
+ enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
+                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a9e080d9bbbdcf605ab89c9175680eca554c1778