From 04246a90919c43ff76e2cea213452b7801b0e021 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 19 Jan 2020 22:18:38 +0100 Subject: [PATCH 1/4] 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 00000000000..9487c215e3f --- /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 00000000000..73068f2ec1d --- /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 78556d8df23..1579a5b21dd 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}" +} From 3669ad1cac7c39bdfb5e49348b23483b00e937a6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 19 Jan 2020 22:19:06 +0100 Subject: [PATCH 2/4] kdenlive: update to 19.12.3 --- srcpkgs/kdenlive/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template index 69f53c77cf9..7a3413b41e1 100644 --- a/srcpkgs/kdenlive/template +++ b/srcpkgs/kdenlive/template @@ -1,11 +1,11 @@ # Template file for 'kdenlive' pkgname=kdenlive -version=19.08.2 +version=19.12.3 revision=1 build_style=cmake hostmakedepends=" extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config python3 - qt5-host-tools qt5-qmake" + qt5-host-tools qt5-qmake gettext" makedepends=" kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel kplotting-devel mlt-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel @@ -16,8 +16,8 @@ short_desc="Non-linear video editor" maintainer="johannes " license="GPL-3.0-or-later" homepage="https://kdenlive.org" -distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78 +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=cebcb8f019bc0fc719ef54d00507dc1281758e3c8c69ea2f93f99feda777bc64 # needed for mlt to work on musl CXXFLAGS="-DHAVE_LOCALE_H=1" From 57dcb68f28c30dc143822cd219b7eda63dc2194c Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 24 Jan 2020 22:45:02 +0100 Subject: [PATCH 3/4] shotcut: switch to mlt-python3 --- srcpkgs/shotcut/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template index 71378cb0d75..eb6fe9c930a 100644 --- a/srcpkgs/shotcut/template +++ b/srcpkgs/shotcut/template @@ -5,7 +5,7 @@ revision=1 build_style=qmake configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE" hostmakedepends="pkg-config qt5-tools" -makedepends="gstreamer1-devel lame-devel libvpx-devel mlt-devel mlt-python +makedepends="gstreamer1-devel lame-devel libvpx-devel mlt-devel mlt-python3 qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel qt5-quickcontrols qt5-webkit-devel qt5-websockets-devel qt5-x11extras-devel x264-devel" From ff1f1e207aa54eb2efedfb61334897746f8b708e Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 15 Apr 2020 20:19:25 +0200 Subject: [PATCH 4/4] flowblade: switch to python3 --- srcpkgs/flowblade/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template index d2e2fea2404..c011d7dc115 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,15 +1,15 @@ # Template file for 'flowblade' pkgname=flowblade version=2.4 -revision=1 +revision=2 archs=noarch build_wrksrc=flowblade-trunk -build_style=python2-module +build_style=python3-module make_install_args="--install-lib=${DESTDIR}/usr/share/pyshared" -hostmakedepends="python-setuptools" +hostmakedepends="python3-setuptools" # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md -depends="frei0r-plugins gmic mlt-python python-Pillow python-dbus gtk+3 - python-gobject python-numpy swh-plugins" +depends="frei0r-plugins gmic mlt-python3 python3-Pillow python3-dbus gtk+3 + python3-gobject python3-numpy swh-plugins" short_desc="Non-linear video editor for Linux" maintainer="Orphaned " license="GPL-3.0-or-later"