[rpms/mlt] epel9-next: Update to 6.18.0

A new commit has been pushed.

Repo   : rpms/mlt
Branch : epel9-next
Commit : acc0c846407a80f0c15dcc105ff3bdcd573cca58
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2019-11-12T04:04:39+00:00
Stats  : +10/-52 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/mlt/c/acc0c846407a80f0c15dcc105ff3bdcd573cca58?branch=epel9-next

Log:
Update to 6.18.0

---
diff --git a/.gitignore b/.gitignore
index 9500f7f..8752330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /mlt-6.12.0.tar.gz
 /mlt-6.14.0.tar.gz
 /mlt-6.16.0.tar.gz
+/mlt-6.18.0.tar.gz

diff --git a/434dbcf62048cc1220c425c2adc77697b4d40ffb.diff b/434dbcf62048cc1220c425c2adc77697b4d40ffb.diff
deleted file mode 100644
index 8630e7b..0000000
--- a/434dbcf62048cc1220c425c2adc77697b4d40ffb.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
-index 4bb16ddf5..d9b5fbc0f 100644
---- a/src/modules/core/consumer_multi.c
-+++ b/src/modules/core/consumer_multi.c
-@@ -304,7 +304,7 @@ static void foreach_consumer_start( mlt_consumer consumer )
- 		if ( nested )
- 		{
- 			mlt_properties nested_props = MLT_CONSUMER_PROPERTIES(nested);
--			mlt_properties_set_position( nested_props, "_multi_position", 0 );
-+			mlt_properties_set_position( nested_props, "_multi_position", mlt_properties_get_position( properties, "in" ) );
- 			mlt_properties_set_data( nested_props, "_multi_audio", NULL, 0, NULL, NULL );
- 			mlt_properties_set_int( nested_props, "_multi_samples", 0 );
- 			mlt_consumer_start( nested );

diff --git a/690d3ed55f98d8e31affb1b5dbc84c6948248099.diff b/690d3ed55f98d8e31affb1b5dbc84c6948248099.diff
deleted file mode 100644
index 3b9e416..0000000
--- a/690d3ed55f98d8e31affb1b5dbc84c6948248099.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c
-index afab3cd33..68262063c 100644
---- a/src/modules/xml/producer_xml.c
-+++ b/src/modules/xml/producer_xml.c
-@@ -1130,6 +1130,9 @@ static void on_end_consumer( deserialise_context context, const xmlChar *name )
- 					mlt_properties_set_data( consumer_properties, key, properties, 0,
- 						(mlt_destructor) mlt_properties_close, NULL );
- 
-+					// Pass in / out if provided
-+					mlt_properties_pass_list( consumer_properties, properties, "in, out" );
-+
- 					// Pass along quality and performance properties to the multi consumer and its render thread(s).
- 					if ( !context->qglsl )
- 					{

diff --git a/mlt-python_includes.patch b/mlt-python_includes.patch
deleted file mode 100644
index 8d0ce83..0000000
--- a/mlt-python_includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/swig/python/build.orig	2019-11-03 21:51:29.151089755 +0000
-+++ ./src/swig/python/build	2019-11-03 21:51:22.859014218 +0000
-@@ -13,7 +13,7 @@ path=`which python 2> /dev/null`
- if [ $? = 0 ]
- then
- 	# Change this as needed
--	export PYTHON_INCLUDE=`python -c "import sys;print(\"{}/include/python{}.{}\".format(sys.prefix,*sys.version_info))"`
-+	export PYTHON_INCLUDE=`python -c "from sysconfig import get_paths; print(get_paths()['include'])"`
- 
- 	[ ! -d "$PYTHON_INCLUDE" ] && echo python development missing && exit 1
- 

diff --git a/mlt.spec b/mlt.spec
index 07e9ccd..24b1e08 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -22,8 +22,8 @@
 #global gver .%%{gitdate}git%%{shortcommit}
 
 Name:           mlt
-Version:        6.16.0
-Release:        4%{?dist}
+Version:        6.18.0
+Release:        1%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -31,9 +31,6 @@ Summary:        Toolkit for broadcasters, video editors, media players, transcod
 License:        GPLv3 and LGPLv2+
 URL:            http://www.mltframework.org/
 Source0:        https://github.com/mltframework/mlt/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/mltframework/mlt/commit/434dbcf62048cc1220c425c2adc77697b4d40ffb.diff
-Patch1:         https://github.com/mltframework/mlt/commit/690d3ed55f98d8e31affb1b5dbc84c6948248099.diff
-Patch2:         mlt-python_includes.patch
 
 BuildRequires:  frei0r-devel
 BuildRequires:  opencv-devel
@@ -172,16 +169,11 @@ sed -i 's|mlt_wrap.cpp|mlt_wrap.cxx|g' src/swig/php/build
 
 %if %{with python3}
 cp -a src/swig/python src/swig/python3
-find src/swig/python3 -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|'
-sed -i -e 's|which python|which python3|' src/swig/python3/build
-sed -i -e 's|python -c|python3 -c|' src/swig/python3/build
-sed -i -e 's|python-config|python3-config|' src/swig/python3/build
+find src/swig/python3 -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python3|#!%{__python3}|'
 %endif
 %if %{with python2}
-find src/swig/python -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|'
-sed -i -e 's|which python|which python2|' src/swig/python/build
-sed -i -e 's|python -c|python2 -c|' src/swig/python/build
-sed -i -e 's|python-config|python2-config|' src/swig/python/build
+find src/swig/python -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python3|#!%{__python2}|'
+sed -i -e 's|-python3|-python2|' src/swig/python/build
 %else
 rm -rf src/swig/python
 %endif
@@ -288,6 +280,9 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 
 
 %changelog
+* Tue Nov 12 2019 Sérgio Basto <sergio@serjux.com> - 6.18.0-1
+- Update to 6.18.0
+
 * Sun Nov 03 2019 Sérgio Basto <sergio@serjux.com> - 6.16.0-4
 - Fix build on rawhide with Python 3.8
 

diff --git a/sources b/sources
index 49e44a8..a0a186c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-6.16.0.tar.gz) = baefdebb54db924a31b39f4e514ea483c409f2ac70590a77457cdd2db517b648b3f010aa18892602d736e95c583f6e487ffd5bbbf87c6335a92913b0c494d3ad
+SHA512 (mlt-6.18.0.tar.gz) = cbd2dc15864d4e64aaead433c5873cbe4039c77416536809c7281f31b2468159e35e2cfe1aac3b87acb2ee728c1bacb9a0ba2650af1de343f7487ca93d9d36d2