| 1 |
commit: 98abfbe6ffbde5878926bc0b366c5f15e40d02da |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 30 20:30:45 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 30 21:44:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98abfbe6 |
| 7 |
|
| 8 |
media-libs/mlt: Fix configure with opencv-4 |
| 9 |
|
| 10 |
Upstream commit f4329c7e8f4704d3f8e8f2a96bd774e6d966194b |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 +++++++++++++++++++++++++++ |
| 16 |
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 + |
| 17 |
2 files changed, 46 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..e3e27904d5a |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch |
| 24 |
@@ -0,0 +1,45 @@ |
| 25 |
+From f4329c7e8f4704d3f8e8f2a96bd774e6d966194b Mon Sep 17 00:00:00 2001 |
| 26 |
+From: martin <martin.sandsmark@×××.org> |
| 27 |
+Date: Tue, 7 Apr 2020 19:48:01 +0000 |
| 28 |
+Subject: [PATCH] fix opencv4 support (#545) |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ src/modules/opencv/configure | 17 +++++++++++++---- |
| 32 |
+ 1 file changed, 13 insertions(+), 4 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure |
| 35 |
+index 36851f678..4e7fdcf4a 100755 |
| 36 |
+--- a/src/modules/opencv/configure |
| 37 |
++++ b/src/modules/opencv/configure |
| 38 |
+@@ -26,18 +26,27 @@ else |
| 39 |
+ exit 0 |
| 40 |
+ fi |
| 41 |
+ |
| 42 |
+- pkg-config --atleast-version=3.1.0 'opencv' |
| 43 |
++ opencvname=opencv |
| 44 |
++ pkg-config "$opencvname" |
| 45 |
++ if [ $? -ne 0 ] |
| 46 |
++ then |
| 47 |
++ # Try v4, they renamed |
| 48 |
++ opencvname=opencv4 |
| 49 |
++ fi |
| 50 |
++ |
| 51 |
++ pkg-config --atleast-version=3.1.0 "$opencvname" |
| 52 |
++ |
| 53 |
+ if [ $? -eq 0 ] |
| 54 |
+ then |
| 55 |
+- result=`pkg-config --libs opencv | grep "opencv_tracking"` |
| 56 |
++ result=`pkg-config --libs "$opencvname" | grep "opencv_tracking"` |
| 57 |
+ if [ -z "$result" ] |
| 58 |
+ then |
| 59 |
+ echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules" |
| 60 |
+ touch ../disable-opencv |
| 61 |
+ exit 0 |
| 62 |
+ else |
| 63 |
+- echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak |
| 64 |
+- echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak |
| 65 |
++ echo "CFLAGS += $(pkg-config --cflags "$opencvname")" >> config.mak |
| 66 |
++ echo "LDFLAGS += $(pkg-config --libs "$opencvname")" >> config.mak |
| 67 |
+ fi |
| 68 |
+ else |
| 69 |
+ echo "- OpenCV >= 3.1.0 NOT found: disabling" |
| 70 |
|
| 71 |
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 72 |
index d12698082a8..6edc6c8f9cb 100644 |
| 73 |
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 74 |
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 75 |
@@ -86,6 +86,7 @@ PATCHES=( |
| 76 |
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch |
| 77 |
"${FILESDIR}"/${P}-qt-5.15.patch |
| 78 |
"${FILESDIR}"/${P}-no-gtk2.patch |
| 79 |
+ "${FILESDIR}"/${P}-opencv4.patch |
| 80 |
) |
| 81 |
|
| 82 |
pkg_setup() { |
Archives