diff --git a/libmlt-fixluma.patch b/libmlt-fixluma.patch new file mode 100644 index 0000000..d80e8cc --- /dev/null +++ b/libmlt-fixluma.patch @@ -0,0 +1,12 @@ +Index: mlt-6.18.0/src/modules/lumas/create_lumas +=================================================================== +--- mlt-6.18.0.orig/src/modules/lumas/create_lumas ++++ mlt-6.18.0/src/modules/lumas/create_lumas +@@ -1,5 +1,7 @@ + #!/bin/sh + ++export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../framework ++ + [ \( -d PAL \) -a \( ! $0 -nt .executed \) ] && exit 0 + + bpp=16 diff --git a/libmlt.changes b/libmlt.changes index 7700489..3ba8450 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,125 @@ +------------------------------------------------------------------- +Tue Nov 12 11:50:26 UTC 2019 - Luigi Baldoni + +- Update to version 6.18.0 + Framework: + * Fixed some data races in mlt_consumer, mlt_deque, and + mlt_property. + * Fixed the mlt_events listener incorrect owner argument. + * Added support for the LC_ALL environmant variable on Windows. + * Fixed the argument to mlt_factory_init() not working on + Windows. + * Fixed mlt_service_identify() not reliable in some use cases. + * Added some default and copy constructors and assignment + operators to mlt++ + + Filter() + + Filter( const Filter &filter ) + + Filter& operator=( const Filter &filter ) + + Producer( const Producer &producer ) + + Producer& operator=( const Producer &producer ) + + Properties( const Properties &properties ) + + Properties& operator=( const Properties &properties ) + + Service( const Service &service ) + + Service& operator=( const Service &service ) + + Transition() + + Transition( const Transition &transition ) + + Transition& operator=( const Transition &transition ) + * Added mlt_luma_map: + + mlt_luma_map_init + + mlt_luma_map_new + + mlt_luma_map_render + + mlt_luma_map_from_pgm + + mlt_luma_map_from_yuv422 + * Fixed preset overrides depend on the XML attribute order. + * Fixed serializing an animated property with a new length. + Modules: + * Fixed interpolation in rotoscoping filter. + * Fixed crop filter not working with color producer. + * Fixed some data races in the sdl and sdl2 consumers. + * Fixed some data races in the avformat producer. + * Added a movit.flip filter to the opengl module. + * Fixed using filters on frei0r producers. + * Added support for in and out attributes on the "consumer" + xml element. + * Fixed using an in point with the multi consumer. + * Fixed avfilter fails if the image size changes. + * Fixed showing superfluous decimals for seconds in the timer + filter. + * Stop serializing an invalid producer as an "INVALID" text + producer in xml. + * Fixed an access violation crash in wave filter. + * Added the meta.media.color_range property to the avformat + producer. + * Fixed full range yuv422p not converted correctly in the + avformat producer. + * Fixed the text filter not working with pango. + * Fixed a regression using dynamictext with pango. + * Added a position property to avfilter for filters that need + position info. + * Fixed avfilter.subtitles not using the source position. + * Added an analyze property to vidstab filter. When set, + analysis only starts and the results file written if true. + * Fixed crash combining affine the affine filter with the + shape filter. + * Added interlace detection from AVCodecContext.field_order. + * Changed the avformat producer to not use the rescale.interp + frame property. + Previously, when interp == nearest, it would relax seeking. + Now, seek accuracy is reduced during trick play (rewind or + fast forward). + * Fixed sws flags for auto-inserted scalers in avfilter. + * Fixed a double free crash in ladspa filter on channel count + mismatch. + * Refactored the composite and luma transitions to use + mlt_luma_map. + * Refactored the pgm producer and shape filter to use + mlt_luma_map. + * Refactored the lumas module to use mlt_luma_map. + * The lumas module is now disabled by default and must be + explicitly enabled. + * Added property animation to the threshold filter. + * Added a cairoblend_mode filter to the frei0r module to + affect a frei0r.cairoblend transition used to + composite/blend tracks. + * Added support for new vaapi options to the avformat consumer: + + connection_type: x11 or drm + + driver + + kernel_driver + * Fixed the timewarp producer with a colon in the filename. + * Fixed a relative file name with a colon in it in the xml + producer. + * Fixed defaulting to album or poster art if there is another + video stream. + * Fixed parameter animation in frei0r plugins when using frame + threads. + This change also enables frame-threading for more plugins. + * Improved the qtblend filter to not process alpha if no + transparency. + * Added a background_color property to the qtblend filter. + * Fixed the opencv.tracker incorrect behavior on cut clips. + * Changed opencv.tracker to store absolute frame numbers. + * Fixed incorrect frame offset on render in opencv.tracker. + * Add an alpha_over property to luma transition. This + addresses a behavior regression in version 6.14.0. + * Fixed noimagecache not working in the avformat producer. + Other: + * Mlt++ now requires C11 compiler support. + * Fixed closing melt SDL2 window from window manager (i.e. + close button). + * Added -repository option to the melt command. + * Added unit tests for Mlt::Event. + * Fixed returning image data for Python 3. + * Switch to python3 by default. + * Updated the prores encoding presets to set vendor ID and + colr atom. + * Added a CMake build system. This is not yet prefered over + the existing configure script and Makefiles and has less + flexibility. It is a start and has limited support. + +- Use python 3 + +- Added libmlt-fixluma.patch + ------------------------------------------------------------------- Wed May 8 07:14:37 UTC 2019 - Luigi Baldoni diff --git a/libmlt.spec b/libmlt.spec index 93eb289..8ca2df5 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -1,7 +1,7 @@ # # spec file for package libmlt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,23 +21,24 @@ %define _name mlt %define libname lib%{_name} -%define lversion 6.16.0 +%define lversion 6.18.0 %define soname 6 %define _name_pp %{_name}++ %define libname_pp lib%{_name_pp} %define soname_pp 3 Name: %{libname} -Version: 6.16.0 +Version: 6.18.0 Release: 0 Summary: Multimedia framework for television broadcasting License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: http://www.mltframework.org +URL: http://www.mltframework.org Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch reddwarf@opensuse.org -- Make VDPAU support work without the devel package Patch1: libmlt-0.8.2-vdpau.patch - +# PATCH-FIX-UPSTREAM libmlt-fixluma.patch aloisio@gmx.com -- add LD_LIBRARY_PATH so that luma can run +Patch2: libmlt-fixluma.patch BuildRequires: fdupes %if 0%{?suse_version} >= 1500 BuildRequires: gcc-c++ @@ -48,6 +49,7 @@ BuildRequires: gcc7-c++ %endif BuildRequires: ladspa-devel BuildRequires: pkg-config +BuildRequires: python3-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL) @@ -185,17 +187,16 @@ MLT is a multimedia framework for television broadcasting. It provides a toolkit for broadcasters, video editors, media players, transcoders and web streamers. -%package -n python-%{_name} +%package -n python3-%{_name} Summary: Python bindings for the MLT multimedia framework Group: Development/Languages/Python -BuildRequires: python-devel +BuildRequires: python3-devel BuildRequires: swig Requires: %{libname_pp}%{soname_pp} >= %{version} Requires: %{libname}%{soname} >= %{version} -%{py_requires} -Provides: python-%{_name}%{soname} +Provides: python3-%{_name}%{soname} -%description -n python-%{_name} +%description -n python3-%{_name} MLT is a multimedia framework for television broadcasting. It provides a toolkit for broadcasters, video editors, media players, transcoders and web streamers. @@ -204,6 +205,7 @@ This package contains python bindings. %prep %setup -q -n %{_name}-%{version} %patch1 +%patch2 -p1 # To complement libmlt-0.8.0-vdpau.patch. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. @@ -224,6 +226,7 @@ test -x "$(type -p g++-7)" && export CXX=g++-7 %endif --enable-debug \ --enable-gpl --enable-gpl3 \ +--enable-lumas \ %ifarch i586 --disable-mmx \ %endif @@ -238,8 +241,8 @@ make %{?_smp_mflags} %make_install install -Dpm 0644 docs/melt.1 %{buildroot}%{_mandir}/man1/melt%{soname}.1 ln -s melt%{soname}.1 %{buildroot}%{_mandir}/man1/melt.1 -install -Dpm 0644 src/swig/python/_%{_name}.so '%{buildroot}%{python_sitearch}/_%{_name}.so' -install -Dpm 0644 src/swig/python/%{_name}.py '%{buildroot}%{python_sitearch}/%{_name}.py' +install -Dpm 0644 src/swig/python/_%{_name}.so '%{buildroot}%{python3_sitearch}/_%{_name}.so' +install -Dpm 0644 src/swig/python/%{_name}.py '%{buildroot}%{python3_sitearch}/%{_name}.py' # Get the modules that need data for MODULE in %{buildroot}%{_libdir}/mlt-%{soname}/libmlt*.so; do @@ -316,9 +319,9 @@ rm -f %{buildroot}%{_datadir}/mlt %{_datadir}/%{_name}-%{soname}/presets/ %{_datadir}/%{_name}-%{soname}/vid.stab/ -%files -n python-%{_name} +%files -n python3-%{_name} %defattr(0644, root, root, 0755) -%{python_sitearch}/_%{_name}.so -%{python_sitearch}/%{_name}.py +%{python3_sitearch}/_%{_name}.so +%{python3_sitearch}/%{_name}.py %changelog diff --git a/mlt-6.16.0.tar.gz b/mlt-6.16.0.tar.gz deleted file mode 100644 index 9973b1c..0000000 --- a/mlt-6.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c28e54cd3ae1d43f8d0d4a24f9cee4f4b161255a3cd2aa29061fce5d46158e6 -size 1414374 diff --git a/mlt-6.18.0.tar.gz b/mlt-6.18.0.tar.gz new file mode 100644 index 0000000..6a68efa --- /dev/null +++ b/mlt-6.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ea6775300b9f997460f5d6adde1ea41e525ecfd30a70b987e13800e4c387ddb +size 1430398 diff --git a/webvfx-1.0.0.tar.gz b/webvfx-1.0.0.tar.gz deleted file mode 100644 index 748192d..0000000 --- a/webvfx-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93aac9b18d265abc5e926941544d6c41f47dd7b67e5c030eef55dbbda743792a -size 240032 diff --git a/webvfx-1.1.0.tar.gz b/webvfx-1.1.0.tar.gz new file mode 100644 index 0000000..c041af8 --- /dev/null +++ b/webvfx-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d11838228fe40248817afc75b7a8becedda4e09c20d2ba1d3c475261a276b0a +size 240518 diff --git a/webvfx-nobrowser.patch b/webvfx-nobrowser.patch index e3887f3..9d62b58 100644 --- a/webvfx-nobrowser.patch +++ b/webvfx-nobrowser.patch @@ -1,8 +1,8 @@ -Index: webvfx-1.0.0/all.pro +Index: webvfx-1.1.0/all.pro =================================================================== ---- webvfx-1.0.0/all.pro.orig 2018-11-26 02:25:07.000000000 +0200 -+++ webvfx-1.0.0/all.pro 2019-01-10 15:28:26.062060871 +0200 -@@ -14,7 +14,7 @@ CONFIG += ordered +--- webvfx-1.1.0/all.pro.orig ++++ webvfx-1.1.0/all.pro +@@ -19,7 +19,7 @@ CONFIG += ordered SUBDIRS += webvfx SUBDIRS += viewer SUBDIRS += tools/render diff --git a/webvfx-versioned-libdir.patch b/webvfx-versioned-libdir.patch index 3a84824..ed0f106 100644 --- a/webvfx-versioned-libdir.patch +++ b/webvfx-versioned-libdir.patch @@ -1,7 +1,7 @@ -Index: webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro +Index: webvfx-1.1.0/webvfx/webvfx.pro =================================================================== ---- webvfx-1.0.0/webvfx/webvfx.pro.orig 2018-02-24 21:17:19.000000000 +0200 -+++ webvfx-1.0.0/webvfx/webvfx.pro 2018-05-06 12:24:57.399644007 +0200 +--- webvfx-1.1.0/webvfx/webvfx.pro.orig 2018-02-24 21:17:19.000000000 +0200 ++++ webvfx-1.1.0/webvfx/webvfx.pro 2018-05-06 12:24:57.399644007 +0200 @@ -47,5 +47,5 @@ QT += opengl quick TARGET = webvfx diff --git a/webvfx.changes b/webvfx.changes index e308191..ea90b77 100644 --- a/webvfx.changes +++ b/webvfx.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 12 12:02:29 UTC 2019 - Luigi Baldoni + +- Update to version 1.1.0 + * Added support for alpha channels in MLT video for input and + output. + * Added a transparent property to the MLT filter. When the + property is set to 1, this gives a filter a transparent white + canvas for drawing while the MLT video image is still + available through the JavaScript extension. This facilitates + using WebVfx to draw the alpha channel independently of the + MLT alpha channel. + * Added support for getting a MLT rectangle property + (mlt_rect) as a JavaScript object with properties: x, y, + width, height, and opacity. + +- Refreshed webvfx-versioned-libdir.patch and + webvfx-nobrowser.patch + ------------------------------------------------------------------- Thu Jan 10 13:33:27 UTC 2019 - davejplater@gmail.com diff --git a/webvfx.spec b/webvfx.spec index c5a5f8c..32a9159 100644 --- a/webvfx.spec +++ b/webvfx.spec @@ -1,7 +1,7 @@ # # spec file for package webvfx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,19 @@ %define _name mlt -%define mltversion 6.16.0 -%define mltsoversion 6.16.0 +%define mltversion 6.18.0 +%define mltsoversion 6.18.0 %define sover 1 %define mltmaj %(echo %{mltversion} |cut -d "." -f 1) # Find qt version used to build %define qt5version %(pkg-config --modversion Qt5Core) -%define _rev 5ef18121b8765ecbc6a90094b1d51059fc7e7f66 Name: webvfx -Version: 1.0.0 +Version: 1.1.0 Release: 0 Summary: Video effects engine based on web technologies License: BSD-3-Clause Group: Productivity/Multimedia/Video/Editors and Convertors -Url: https://github.com/mltframework/webvfx +URL: https://github.com/mltframework/webvfx Source0: %{_name}-%{mltversion}.tar.gz # This is needed by shotcut and will only build within the mlt sources. Source1: https://github.com/mltframework/webvfx/archive/%{version}.tar.gz#/webvfx-%{version}.tar.gz