From c566d19d41c04639819747abb8b3d207adda8a10 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 19 Jan 2020 22:18:38 +0100 Subject: [PATCH] mlt: update to 6.20.0 --- srcpkgs/mlt-python3 | 1 + srcpkgs/mlt/patches/cdefs.patch | 12 ++++++++++++ srcpkgs/mlt/template | 27 ++++++++++++++++----------- 3 files changed, 29 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/mlt-python3 create mode 100644 srcpkgs/mlt/patches/cdefs.patch diff --git a/srcpkgs/mlt-python3 b/srcpkgs/mlt-python3 new file mode 120000 index 0000000000..9487c215e3 --- /dev/null +++ b/srcpkgs/mlt-python3 @@ -0,0 +1 @@ +mlt \ No newline at end of file diff --git a/srcpkgs/mlt/patches/cdefs.patch b/srcpkgs/mlt/patches/cdefs.patch new file mode 100644 index 0000000000..73068f2ec1 --- /dev/null +++ b/srcpkgs/mlt/patches/cdefs.patch @@ -0,0 +1,12 @@ +--- src/modules/plus/ebur128/queue/sys/queue.h.orig 2020-01-18 21:31:21.319025308 +0100 ++++ src/modules/plus/ebur128/queue/sys/queue.h 2020-01-18 21:31:40.808858531 +0100 +@@ -33,7 +33,9 @@ + #ifndef _SYS_QUEUE_H_ + #define _SYS_QUEUE_H_ + ++#ifdef __GLIBC__ + #include ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 78556d8df2..1579a5b21d 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,23 +1,23 @@ # Template file for 'mlt' pkgname=mlt -version=6.16.0 +version=6.20.0 revision=1 build_style=gnu-configure configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde --swig-languages=python" -hostmakedepends="doxygen pkg-config ladspa-sdk swig python which" +hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which" # XXX: movit vid.stab makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel - fftw-devel frei0r-plugins python-devel pulseaudio-devel movit-devel - libvidstab-devel" + fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel + libvidstab-devel libatomic-devel" depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins" short_desc="Multimedia framework, designed for television broadcasting" maintainer="Diogo Leal " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=9c28e54cd3ae1d43f8d0d4a24f9cee4f4b161255a3cd2aa29061fce5d46158e6 +checksum=ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" @@ -34,8 +34,7 @@ fi do_configure() { vsed -i src/swig/python/build \ - -e "s,PYTHON_INCLUDE=.*,PYTHON_INCLUDE=${XBPS_CROSS_BASE}/usr/include/python2.7," \ - -e "s,python-config,${XBPS_CROSS_BASE}/usr/bin/python-config," + -e "s,PYTHON_INCLUDE=.*,PYTHON_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}," # Enable or disable mmx, sse, sse2 case "${XBPS_TARGET_MACHINE}" in @@ -82,14 +81,20 @@ mlt-devel_package() { } } -mlt-python_package() { +mlt-python3_package() { lib32disabled=yes short_desc+=" - Python bindings" depends="${sourcepkg}>=${version}_${revision}" - pycompile_module="mlt.py" pkg_install() { cd src/swig/python - vinstall mlt.py 644 usr/lib/python2.7 - vinstall _mlt.so 755 usr/lib/python2.7 + vinstall mlt.py 644 "usr/lib/python${py3_ver}" + vinstall _mlt.so 755 "usr/lib/python${py3_ver}" } } + +mlt-python_package() { + build_style=meta + archs=noarch + short_desc+=" - transitional dummy pkg" + depends="mlt-python3-${version}_${revision}" +}