[arch-commits] Commit in mlt/trunk (4 files)
Antonio Rojas
arojas at archlinux.org
Fri Jul 31 09:53:38 UTC 2020
Date: Friday, July 31, 2020 @ 09:53:38
Author: arojas
Revision: 392771
Update to 6.22.0, switch to cmake, build rtaudio plugin
Added:
mlt/trunk/mlt-cmake-fix-build.patch
mlt/trunk/mlt-cmake-fix-python-bindings.patch
Modified:
mlt/trunk/PKGBUILD
Deleted:
mlt/trunk/mlt-opencv4.patch
-------------------------------------+
PKGBUILD | 45 +++++++++++++++-------------------
mlt-cmake-fix-build.patch | 17 ++++++++++++
mlt-cmake-fix-python-bindings.patch | 13 +++++++++
mlt-opencv4.patch | 27 --------------------
4 files changed, 50 insertions(+), 52 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-31 09:11:37 UTC (rev 392770)
+++ PKGBUILD 2020-07-31 09:53:38 UTC (rev 392771)
@@ -7,8 +7,8 @@
# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
pkgname=mlt
-pkgver=6.20.0
-pkgrel=5
+pkgver=6.22.0
+pkgrel=1
pkgdesc="An open source multimedia framework"
arch=(x86_64)
url="https://www.mltframework.org"
@@ -20,7 +20,6 @@
'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'
@@ -29,47 +28,43 @@
'movit: opengl plugin'
'opencv: openCV plugin'
'rubberband: rubberband plugin'
+ 'gdk-pixbuf2: gdk plugin'
+ 'pango: gdk plugin'
+ 'rtaudio: rtaudio 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)
+makedepends=(cmake ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg
+ jack libexif python swig movit eigen opencv rubberband gdk-pixbuf2 pango rtaudio)
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
- mlt-qt5.15.patch::"https://github.com/mltframework/mlt/commit/f58b44d7.patch")
-sha256sums=('ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd'
- 'e770eaa39337cbbeb7d03357c11013e62ea355696023d1bd2d0fca6d1812b627'
- '7bb659b08c776d81bc88a9aff3ed78553df23ea847ba31d7fbf7e0090f1f6dc3')
+ mlt-cmake-fix-build.patch
+ mlt-cmake-fix-python-bindings.patch)
+sha256sums=('3392d70c528d7f32e78329232b1b93a5a36b058215f664953090315132b797e5'
+ '5871dee1c2153cf70d2a27782eba38eb694421dd089d83636b2a7f1d60938264'
+ 'db0430533324ad65c1846e5391d012b97f856025ce661241f5584b681dfe0075')
prepare() {
- cd $pkgname-$pkgver
- patch -p1 -i ../mlt-opencv4.patch # Fix build with openCV 4
- patch -p1 -i ../mlt-qt5.15.patch # Fix build with Qt 5.15
+ patch -d $pkgname-$pkgver -p1 -i ../mlt-cmake-fix-build.patch # Fix build with cmake
+ patch -d $pkgname-$pkgver -p1 -i ../mlt-cmake-fix-python-bindings.patch # Fix python bindings build with cmake
}
build() {
- cd mlt-$pkgver
+ cmake -B build -S $pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cmake --build build
- ./configure --prefix=/usr \
- --avformat-swscale \
- --enable-gpl \
- --enable-gpl3 \
- --enable-opencv
- make
-
# python bindings
- cd src/swig/python
+ cd $pkgname-$pkgver/src/swig/python
./build
}
package() {
- cd mlt-$pkgver
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
# Install python bindings
_pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
- cd "$srcdir/mlt-$pkgver/src/swig/python"
+ cd $pkgname-$pkgver/src/swig/python
mkdir -p "$pkgdir/$_pythonpath"
install -m755 mlt.py "$pkgdir/$_pythonpath"
install -m755 _mlt.so "$pkgdir/$_pythonpath"
Added: mlt-cmake-fix-build.patch
===================================================================
--- mlt-cmake-fix-build.patch (rev 0)
+++ mlt-cmake-fix-build.patch 2020-07-31 09:53:38 UTC (rev 392771)
@@ -0,0 +1,17 @@
+diff --git a/src/melt/CMakeLists.txt b/src/melt/CMakeLists.txt
+index b79afaf8..e8402276 100644
+--- a/src/melt/CMakeLists.txt
++++ b/src/melt/CMakeLists.txt
+@@ -1,11 +1,7 @@
+ set(melt_lib mlt Threads::Threads)
+ find_package(SDL2 QUIET)
+ if(SDL2_FOUND)
+- add_library(sdl2 SHARED IMPORTED GLOBAL)
+- set_target_properties(sdl2 PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIRS}
+- IMPORTED_LOCATION ${libdir}/libSDL2.so
+- )
++ add_library(sdl2 ALIAS SDL2::SDL2)
+ else()
+ pkg_check_modules(sdl2 IMPORTED_TARGET GLOBAL sdl2)
+ if(TARGET PkgConfig::sdl2)
Added: mlt-cmake-fix-python-bindings.patch
===================================================================
--- mlt-cmake-fix-python-bindings.patch (rev 0)
+++ mlt-cmake-fix-python-bindings.patch 2020-07-31 09:53:38 UTC (rev 392771)
@@ -0,0 +1,13 @@
+diff --git a/src/swig/python/build b/src/swig/python/build
+index 9b86703c..1c51399f 100755
+--- a/src/swig/python/build
++++ b/src/swig/python/build
+@@ -25,7 +25,7 @@ then
+ ${CXX} -fPIC -D_GNU_SOURCE ${CXXFLAGS} -c -I../.. $PYTHON_INCLUDE mlt_wrap.cxx || exit $?
+
+ # Create the module
+- ${CXX} ${CXXFLAGS} -shared mlt_wrap.o -L../../mlt++ -lmlt++ -L../../framework -lmlt $("${PYTHON}-config" --ldflags) -o _mlt.so || exit $?
++ ${CXX} ${CXXFLAGS} -shared mlt_wrap.o -L../../../../build/src/mlt++ -lmlt++ -L../../../../build/src/framework -lmlt ${LDFLAGS} $("${PYTHON}-config" --ldflags) -o _mlt.so || exit $?
+ else
+ echo Python not installed.
+ exit 1
Deleted: mlt-opencv4.patch
===================================================================
--- mlt-opencv4.patch 2020-07-31 09:11:37 UTC (rev 392770)
+++ mlt-opencv4.patch 2020-07-31 09:53:38 UTC (rev 392771)
@@ -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"
More information about the arch-commits
mailing list