author | Antonio Rojas
<arojas@archlinux.org> 2018-11-26 21:41:48 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2018-11-26 21:41:48 UTC |
parent | 9527857e3cb0ebfd9cf37e72c290304f3c540970 |
PKGBUILD | +7 | -5 |
mlt-opencv4.patch | +7 | -7 |
diff --git a/PKGBUILD b/PKGBUILD index a0f9cf3..445eb1e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=mlt pkgname=(mlt mlt-python-bindings) -pkgver=6.10.0 -pkgrel=2 +pkgver=6.12.0 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=(x86_64) url="http://www.mltframework.org" @@ -18,8 +18,8 @@ makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid. 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=('e794f12b00d1b90009a1574237823a03ce0b3625638306d1369888375e90edff' - '71a8d05984d64cf93320ad28b9060b8689852e847d1e540632152175304ca02f') +sha256sums=('a4af6245f0d78f9b5d4bfdfd632d7f6a8a81e47c6eb7184fb1c040db747607ac' + '21e9c23079a7acfcc955b0ee1837e06b9a8f75135474a8fe903ca43b4da88364') prepare() { cd $pkgname-$pkgver @@ -32,7 +32,9 @@ build() { ./configure --prefix=/usr \ --avformat-swscale \ - --enable-gpl --enable-gpl3 \ + --enable-gpl \ + --enable-gpl3 \ + --enable-opencv \ --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt make diff --git a/mlt-opencv4.patch b/mlt-opencv4.patch index d0c9632..2601d04 100644 --- a/mlt-opencv4.patch +++ b/mlt-opencv4.patch @@ -1,13 +1,13 @@ diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure -index 3322cb58..b630424e 100755 +index 36851f67..f8084301 100755 --- a/src/modules/opencv/configure +++ b/src/modules/opencv/configure -@@ -12,18 +12,18 @@ OpenCV options: - EOF +@@ -26,18 +26,18 @@ else + exit 0 + fi - else -- pkg-config --atleast-version=3.1.0 'opencv' -+ pkg-config --atleast-version=3.1.0 'opencv4' +- pkg-config --atleast-version=3.1.0 'opencv' ++ pkg-config --atleast-version=3.1.0 'opencv4' if [ $? -eq 0 ] then - result=`pkg-config --libs opencv | grep "opencv_tracking"` @@ -24,7 +24,7 @@ index 3322cb58..b630424e 100755 + echo "LDFLAGS += $(pkg-config --libs opencv4)" >> config.mak fi else - echo "- OpenCV >= 3.1.0 NOT found, disabling OpenCV modules" + 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