[arch-commits] Commit in mlt/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Mar 30 21:55:30 UTC 2019
Date: Saturday, March 30, 2019 @ 21:55:30
Author: arojas
Revision: 349461
archrelease: copy trunk to extra-x86_64
Added:
mlt/repos/extra-x86_64/PKGBUILD
(from rev 349460, mlt/trunk/PKGBUILD)
mlt/repos/extra-x86_64/mlt-opencv4.patch
(from rev 349460, mlt/trunk/mlt-opencv4.patch)
Deleted:
mlt/repos/extra-x86_64/PKGBUILD
mlt/repos/extra-x86_64/mlt-opencv4.patch
-------------------+
PKGBUILD | 155 +++++++++++++++++++++++++---------------------------
mlt-opencv4.patch | 67 +++++++++-------------
2 files changed, 104 insertions(+), 118 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-30 21:55:00 UTC (rev 349460)
+++ PKGBUILD 2019-03-30 21:55:30 UTC (rev 349461)
@@ -1,78 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
-# Contributor: funkyou <spamopfer at nickname.berlin.de>
-# Contributor: tardo <tardo at nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=6.12.0
-pkgrel=1
-pkgdesc="An open source multimedia framework"
-arch=(x86_64)
-url="http://www.mltframework.org"
-license=(GPL)
-makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg
- 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')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 -i ../mlt-opencv4.patch # Fix build with openCV 4
-}
-
-build() {
- # mlt
- cd mlt-$pkgver
-
- ./configure --prefix=/usr \
- --avformat-swscale \
- --enable-gpl \
- --enable-gpl3 \
- --enable-opencv \
- --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
- make
-
- # mlt python bindings
- cd src/swig/python
- sed -i 's_path=`which python_path=`which python2_' build
- sed -i 's_`python -c_`python2 -c_' build
- sed -i 's#python-config#python2-config#' build
- ./build
-}
-
-package_mlt() {
- depends=(libebur128)
- optdepends=('sdl_image: SDL1 plugin'
- 'sdl2: SDL2 plugin'
- 'libsamplerate: libavresample plugin'
- 'sox: SOX (Audio Swiss Army Knife) plugin'
- 'ffmpeg: ffmpeg plugin'
- 'vid.stab: video stabilize plugin'
- 'gtk2: Gtk plugin'
- 'qt5-svg: Qt5 plugins'
- 'jack: JACK sound output plugin'
- 'ladspa: LADSPA plugins'
- 'libexif: auto rotate plugin'
- 'frei0r-plugins: for additional effects'
- 'movit: opengl plugin'
- 'opencv: openCV plugin')
-
- cd mlt-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
- depends=(python2 mlt)
-
- cd "$srcdir/mlt-$pkgver/src/swig/python"
- mkdir -p "$pkgdir/usr/lib/python2.7/"
- install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
- install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
- install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}
Copied: mlt/repos/extra-x86_64/PKGBUILD (from rev 349460, mlt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-30 21:55:30 UTC (rev 349461)
@@ -0,0 +1,77 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
+# Contributor: funkyou <spamopfer at nickname.berlin.de>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgbase=mlt
+pkgname=(mlt mlt-python-bindings)
+pkgver=6.14.0
+pkgrel=1
+pkgdesc="An open source multimedia framework"
+arch=(x86_64)
+url="https://www.mltframework.org"
+license=(GPL)
+makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg
+ 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=('d387350f7bb7dd01efce3933c5ab7987b596e98bef7cc9c2349524d55a808b5e'
+ 'e770eaa39337cbbeb7d03357c11013e62ea355696023d1bd2d0fca6d1812b627')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../mlt-opencv4.patch # Fix build with openCV 4
+}
+
+build() {
+ cd mlt-$pkgver
+
+ ./configure --prefix=/usr \
+ --avformat-swscale \
+ --enable-gpl \
+ --enable-gpl3 \
+ --enable-opencv \
+ --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
+ make
+
+# python bindings
+ cd src/swig/python
+ sed -i 's_path=`which python_path=`which python2_' build
+ sed -i 's_`python -c_`python2 -c_' build
+ sed -i 's#python-config#python2-config#' build
+ ./build
+}
+
+package_mlt() {
+ depends=(libebur128)
+ optdepends=('sdl_image: SDL1 plugin'
+ 'sdl2: SDL2 plugin'
+ 'libsamplerate: libavresample plugin'
+ 'sox: SOX (Audio Swiss Army Knife) plugin'
+ 'ffmpeg: ffmpeg plugin'
+ 'vid.stab: video stabilize plugin'
+ 'gtk2: Gtk plugin'
+ 'qt5-svg: Qt5 plugins'
+ 'jack: JACK sound output plugin'
+ 'ladspa: LADSPA plugins'
+ 'libexif: auto rotate plugin'
+ 'frei0r-plugins: for additional effects'
+ 'movit: opengl plugin'
+ 'opencv: openCV plugin')
+
+ cd mlt-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+package_mlt-python-bindings() {
+ depends=(python2 mlt)
+
+ cd "$srcdir/mlt-$pkgver/src/swig/python"
+ mkdir -p "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
+ install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
+}
Deleted: mlt-opencv4.patch
===================================================================
--- mlt-opencv4.patch 2019-03-30 21:55:00 UTC (rev 349460)
+++ mlt-opencv4.patch 2019-03-30 21:55:30 UTC (rev 349461)
@@ -1,40 +0,0 @@
-diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure
-index 36851f67..f8084301 100755
---- a/src/modules/opencv/configure
-+++ b/src/modules/opencv/configure
-@@ -26,18 +26,18 @@ else
- exit 0
- fi
-
-- 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"`
-+ result=`pkg-config --libs opencv4 | grep "opencv_tracking"`
- if [ -z "$result" ]
- then
- echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules"
- touch ../disable-opencv
- exit 0
- else
-- echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak
-- echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak
-+ echo "CFLAGS += $(pkg-config --cflags opencv4)" >> config.mak
-+ echo "LDFLAGS += $(pkg-config --libs opencv4)" >> config.mak
- 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();
Copied: mlt/repos/extra-x86_64/mlt-opencv4.patch (from rev 349460, mlt/trunk/mlt-opencv4.patch)
===================================================================
--- mlt-opencv4.patch (rev 0)
+++ mlt-opencv4.patch 2019-03-30 21:55:30 UTC (rev 349461)
@@ -0,0 +1,27 @@
+diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure
+index 36851f67..f8084301 100755
+--- a/src/modules/opencv/configure
++++ b/src/modules/opencv/configure
+@@ -26,18 +26,18 @@ else
+ exit 0
+ fi
+
+- 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"`
++ result=`pkg-config --libs opencv4 | grep "opencv_tracking"`
+ if [ -z "$result" ]
+ then
+ echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules"
+ touch ../disable-opencv
+ exit 0
+ else
+- echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak
+- echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak
++ echo "CFLAGS += $(pkg-config --cflags opencv4)" >> config.mak
++ echo "LDFLAGS += $(pkg-config --libs opencv4)" >> config.mak
+ fi
+ else
+ echo "- OpenCV >= 3.1.0 NOT found: disabling"
More information about the arch-commits
mailing list