[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     98abfbe6ffbde5878926bc0b366c5f15e40d02da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 20:30:45 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 21:44:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98abfbe6

media-libs/mlt: Fix configure with opencv-4

Upstream commit f4329c7e8f4704d3f8e8f2a96bd774e6d966194b

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 +++++++++++++++++++++++++++
 media-libs/mlt/mlt-6.20.0-r2.ebuild           |  1 +
 2 files changed, 46 insertions(+)

diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch
new file mode 100644
index 00000000000..e3e27904d5a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch
@@ -0,0 +1,45 @@
+From f4329c7e8f4704d3f8e8f2a96bd774e6d966194b Mon Sep 17 00:00:00 2001
+From: martin <martin.sandsmark@kde.org>
+Date: Tue, 7 Apr 2020 19:48:01 +0000
+Subject: [PATCH] fix opencv4 support (#545)
+
+---
+ src/modules/opencv/configure | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure
+index 36851f678..4e7fdcf4a 100755
+--- a/src/modules/opencv/configure
++++ b/src/modules/opencv/configure
+@@ -26,18 +26,27 @@ else
+ 		exit 0
+ 	fi
+ 
+-    pkg-config --atleast-version=3.1.0 'opencv'
++	opencvname=opencv
++	pkg-config "$opencvname"
++	if [ $? -ne 0 ]
++	then
++		# Try v4, they renamed
++		opencvname=opencv4
++	fi
++
++	pkg-config --atleast-version=3.1.0 "$opencvname"
++
+ 	if [ $? -eq 0 ]
+ 	then
+-                result=`pkg-config --libs opencv | grep "opencv_tracking"`
++                result=`pkg-config --libs "$opencvname" | grep "opencv_tracking"`
+                 if [ -z "$result" ]
+                 then
+                         echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules"
+                         touch ../disable-opencv
+                         exit 0
+                 else
+-                        echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak
+-                        echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak
++                        echo "CFLAGS += $(pkg-config --cflags "$opencvname")" >> config.mak
++                        echo "LDFLAGS += $(pkg-config --libs "$opencvname")" >> config.mak
+                 fi
+ 	else
+ 	    echo "- OpenCV >= 3.1.0 NOT found: disabling"

diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index d12698082a8..6edc6c8f9cb 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
 	"${FILESDIR}"/${P}-qt-5.15.patch
 	"${FILESDIR}"/${P}-no-gtk2.patch
+	"${FILESDIR}"/${P}-opencv4.patch
 )
 
 pkg_setup() {