[arch-commits] Commit in mlt/trunk (PKGBUILD mlt-opencv4.patch)

[Antonio Rojas]

    Date: Saturday, March 30, 2019 @ 21:55:00
  Author: arojas
Revision: 349460

Update to 6.14.0

Modified:
  mlt/trunk/PKGBUILD
  mlt/trunk/mlt-opencv4.patch

-------------------+
 PKGBUILD          |    9 ++++-----
 mlt-opencv4.patch |   13 -------------
 2 files changed, 4 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-30 21:24:58 UTC (rev 349459)
+++ PKGBUILD	2019-03-30 21:55:00 UTC (rev 349460)
@@ -8,7 +8,7 @@
 
 pkgbase=mlt
 pkgname=(mlt mlt-python-bindings)
-pkgver=6.12.0
+pkgver=6.14.0
 pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=(x86_64)
@@ -18,8 +18,8 @@
              jack libexif python2 swig movit eigen opencv libebur128 gtk2)
 source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz"
         mlt-opencv4.patch)
-sha256sums=('a4af6245f0d78f9b5d4bfdfd632d7f6a8a81e47c6eb7184fb1c040db747607ac'
-            '21e9c23079a7acfcc955b0ee1837e06b9a8f75135474a8fe903ca43b4da88364')
+sha256sums=('d387350f7bb7dd01efce3933c5ab7987b596e98bef7cc9c2349524d55a808b5e'
+            'e770eaa39337cbbeb7d03357c11013e62ea355696023d1bd2d0fca6d1812b627')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -27,7 +27,6 @@
 }
 
 build() {
-  # mlt
   cd mlt-$pkgver
 
   ./configure --prefix=/usr \
@@ -38,7 +37,7 @@
 	--qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
   make
 
-  # mlt python bindings
+# python bindings
   cd src/swig/python
   sed -i 's_path=`which python_path=`which python2_' build
   sed -i 's_`python -c_`python2 -c_' build

Modified: mlt-opencv4.patch
===================================================================
--- mlt-opencv4.patch	2019-03-30 21:24:58 UTC (rev 349459)
+++ mlt-opencv4.patch	2019-03-30 21:55:00 UTC (rev 349460)
@@ -25,16 +25,3 @@
                  fi
  	else
  	    echo "- OpenCV >= 3.1.0 NOT found: disabling"
-diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
-index d49862fc..2a176ef8 100644
---- a/src/modules/opencv/filter_opencv_tracker.cpp
-+++ b/src/modules/opencv/filter_opencv_tracker.cpp
-@@ -110,7 +110,7 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
-         {
- 		// Build tracker
- 		data->algo = mlt_properties_get( filter_properties, "algo" );
--#if CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 3
-+#if (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 3) || CV_VERSION_MAJOR >= 4
- 		if ( !data->algo || *data->algo == '\0' || !strcmp(data->algo, "KCF" ) )
- 		{
- 			data->tracker = cv::TrackerKCF::create();