Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/, media-libs/mlt/files/
Date: Sat, 28 Oct 2017 12:17:52
Message-Id: 1509193035.f24748fc142e1a02eea3423e22c239133f909deb.asturm@gentoo
1 commit: f24748fc142e1a02eea3423e22c239133f909deb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 28 11:56:32 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 28 12:17:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24748fc
7
8 media-libs/mlt: Fix build w/ opencv-3.3
9
10 Thanks-to: Serge Gavrilov <serge <AT> pdmi.ras.ru>
11 Gentoo-bug: https://bugs.gentoo.org/631714
12 Package-Manager: Portage-2.3.13, Repoman-2.3.4
13
14 media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch | 33 +++++++++++++++++++++++++
15 media-libs/mlt/mlt-6.4.1-r3.ebuild | 1 +
16 2 files changed, 34 insertions(+)
17
18 diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
19 new file mode 100644
20 index 00000000000..0a3732da2e3
21 --- /dev/null
22 +++ b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
23 @@ -0,0 +1,33 @@
24 +From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001
25 +From: BoboopTeam <BoboopTeam@××××××××××××××××××××.com>
26 +Date: Thu, 7 Sep 2017 22:14:48 +0200
27 +Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create()
28 +
29 +This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer
30 +---
31 + src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++---
32 + 1 file changed, 7 insertions(+), 3 deletions(-)
33 +
34 +diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
35 +index 48ffb56b..3cfc07d2 100644
36 +--- a/src/modules/opencv/filter_opencv_tracker.cpp
37 ++++ b/src/modules/opencv/filter_opencv_tracker.cpp
38 +@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
39 + data->algo = mlt_properties_get( filter_properties, "algo" );
40 + if ( data->algo == NULL || !strcmp(data->algo, "" ) )
41 + {
42 +- data->tracker = cv::Tracker::create( "KCF" );
43 ++ data->tracker = cv::TrackerKCF::create();
44 ++ }
45 ++ else if (!strcmp(data->algo, "MIL" ))
46 ++ {
47 ++ data->tracker = cv::TrackerMIL::create();
48 + }
49 + else
50 +- {
51 +- data->tracker = cv::Tracker::create( data->algo );
52 ++ {
53 ++ data->tracker = cv::TrackerBoosting::create();
54 + }
55 +
56 + // Discard previous results
57
58 diff --git a/media-libs/mlt/mlt-6.4.1-r3.ebuild b/media-libs/mlt/mlt-6.4.1-r3.ebuild
59 index 0e847602b09..68c20792d6f 100644
60 --- a/media-libs/mlt/mlt-6.4.1-r3.ebuild
61 +++ b/media-libs/mlt/mlt-6.4.1-r3.ebuild
62 @@ -86,6 +86,7 @@ RDEPEND="${COMMON_DEPEND}
63 PATCHES=(
64 "${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
65 "${FILESDIR}"/${P}-libebur128-unbundle.patch
66 + "${FILESDIR}"/${P}-opencv-3.3.patch
67 )
68
69 pkg_setup() {