From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2114E1396D9 for ; Sat, 28 Oct 2017 12:17:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41B5C2BC0C8; Sat, 28 Oct 2017 12:17:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B08052BC0C8 for ; Sat, 28 Oct 2017 12:17:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73EC2341640 for ; Sat, 28 Oct 2017 12:17:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0AD5838 for ; Sat, 28 Oct 2017 12:17:47 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1509193035.f24748fc142e1a02eea3423e22c239133f909deb.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/, media-libs/mlt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch media-libs/mlt/mlt-6.4.1-r3.ebuild X-VCS-Directories: media-libs/mlt/ media-libs/mlt/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f24748fc142e1a02eea3423e22c239133f909deb X-VCS-Branch: master Date: Sat, 28 Oct 2017 12:17:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 421f575c-e354-4f7f-bcc5-8385ec898676 X-Archives-Hash: 08d3164cf73d8dede9c97ccccf79482c commit: f24748fc142e1a02eea3423e22c239133f909deb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 28 11:56:32 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 28 12:17:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24748fc media-libs/mlt: Fix build w/ opencv-3.3 Thanks-to: Serge Gavrilov pdmi.ras.ru> Gentoo-bug: https://bugs.gentoo.org/631714 Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch | 33 +++++++++++++++++++++++++ media-libs/mlt/mlt-6.4.1-r3.ebuild | 1 + 2 files changed, 34 insertions(+) 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 new file mode 100644 index 00000000000..0a3732da2e3 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch @@ -0,0 +1,33 @@ +From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001 +From: BoboopTeam +Date: Thu, 7 Sep 2017 22:14:48 +0200 +Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create() + +This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer +--- + src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp +index 48ffb56b..3cfc07d2 100644 +--- a/src/modules/opencv/filter_opencv_tracker.cpp ++++ b/src/modules/opencv/filter_opencv_tracker.cpp +@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int + data->algo = mlt_properties_get( filter_properties, "algo" ); + if ( data->algo == NULL || !strcmp(data->algo, "" ) ) + { +- data->tracker = cv::Tracker::create( "KCF" ); ++ data->tracker = cv::TrackerKCF::create(); ++ } ++ else if (!strcmp(data->algo, "MIL" )) ++ { ++ data->tracker = cv::TrackerMIL::create(); + } + else +- { +- data->tracker = cv::Tracker::create( data->algo ); ++ { ++ data->tracker = cv::TrackerBoosting::create(); + } + + // Discard previous results diff --git a/media-libs/mlt/mlt-6.4.1-r3.ebuild b/media-libs/mlt/mlt-6.4.1-r3.ebuild index 0e847602b09..68c20792d6f 100644 --- a/media-libs/mlt/mlt-6.4.1-r3.ebuild +++ b/media-libs/mlt/mlt-6.4.1-r3.ebuild @@ -86,6 +86,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${PN}-6.2.0-ruby-link.patch "${FILESDIR}"/${P}-libebur128-unbundle.patch + "${FILESDIR}"/${P}-opencv-3.3.patch ) pkg_setup() {