Date: Monday, February 17, 2020 @ 10:53:30
  Author: arojas
Revision: 375740

archrelease: copy trunk to extra-x86_64

Added:
  mlt/repos/extra-x86_64/PKGBUILD
    (from rev 375739, mlt/trunk/PKGBUILD)
  mlt/repos/extra-x86_64/mlt-opencv4.patch
    (from rev 375739, mlt/trunk/mlt-opencv4.patch)
Deleted:
  mlt/repos/extra-x86_64/PKGBUILD
  mlt/repos/extra-x86_64/mlt-opencv4.patch

-------------------+
 PKGBUILD          |  150 +++++++++++++++++++++++++---------------------------
 mlt-opencv4.patch |   54 +++++++++---------
 2 files changed, 100 insertions(+), 104 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2020-02-17 10:53:18 UTC (rev 375739)
+++ PKGBUILD    2020-02-17 10:53:30 UTC (rev 375740)
@@ -1,77 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Contributor: Sergej Pupykin <[email protected]>
-# Contributor: Fabian Schoelzel <[email protected]>
-# Contributor: funkyou <[email protected]>
-# Contributor: tardo <[email protected]>
-# Contributor: Stefan Husmann <[email protected]>
-# Contributor: Gustavo Alvarez <[email protected]>
-
-pkgbase=mlt
-pkgname=(mlt python-mlt)
-pkgver=6.20.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 python swig movit eigen opencv libebur128 gtk2 
rubberband)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz";
-        mlt-opencv4.patch)
-sha256sums=('ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd'
-            '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
-  make
-
-# python bindings
-  cd src/swig/python
-  ./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'
-        'rubberband: rubberband plugin')
-
-  cd mlt-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-package_python-mlt() {
-  depends=(python mlt)
-  conflicts=(mlt-python-bindings)
-  provides=(mlt-python-bindings)
-  replaces=(mlt-python-bindings)
-
-  _pythonpath=`python -c "from sysconfig import get_path; 
print(get_path('platlib'))"`
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  mkdir -p "$pkgdir/$_pythonpath"
-  install -m755 mlt.py "$pkgdir/$_pythonpath"
-  install -m755 _mlt.so "$pkgdir/$_pythonpath"
-}

Copied: mlt/repos/extra-x86_64/PKGBUILD (from rev 375739, mlt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2020-02-17 10:53:30 UTC (rev 375740)
@@ -0,0 +1,73 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Sergej Pupykin <[email protected]>
+# Contributor: Fabian Schoelzel <[email protected]>
+# Contributor: funkyou <[email protected]>
+# Contributor: tardo <[email protected]>
+# Contributor: Stefan Husmann <[email protected]>
+# Contributor: Gustavo Alvarez <[email protected]>
+
+pkgname=mlt
+pkgver=6.20.0
+pkgrel=2
+pkgdesc="An open source multimedia framework"
+arch=(x86_64)
+url="https://www.mltframework.org";
+license=(GPL)
+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'
+        'rubberband: rubberband plugin'
+        'python: python bindings')
+makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg 
vid.stab qt5-svg
+             jack libexif python swig movit eigen opencv gtk2 rubberband)
+conflicts=(python-mlt)
+provides=(python-mlt)
+replaces=(python-mlt)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz";
+        mlt-opencv4.patch)
+sha256sums=('ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd'
+            '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
+  make
+
+# python bindings
+  cd src/swig/python
+  ./build
+}
+
+package() {
+  cd mlt-$pkgver
+  make DESTDIR="$pkgdir" install
+
+# Install python bindings
+  _pythonpath=`python -c "from sysconfig import get_path; 
print(get_path('platlib'))"`
+  cd "$srcdir/mlt-$pkgver/src/swig/python"
+  mkdir -p "$pkgdir/$_pythonpath"
+  install -m755 mlt.py "$pkgdir/$_pythonpath" 
+  install -m755 _mlt.so "$pkgdir/$_pythonpath"
+}

Deleted: mlt-opencv4.patch
===================================================================
--- mlt-opencv4.patch   2020-02-17 10:53:18 UTC (rev 375739)
+++ mlt-opencv4.patch   2020-02-17 10:53:30 UTC (rev 375740)
@@ -1,27 +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"

Copied: mlt/repos/extra-x86_64/mlt-opencv4.patch (from rev 375739, 
mlt/trunk/mlt-opencv4.patch)
===================================================================
--- mlt-opencv4.patch                           (rev 0)
+++ mlt-opencv4.patch   2020-02-17 10:53:30 UTC (rev 375740)
@@ -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"

Reply via email to