[rpms/mlt] epel9-next: Update to 6.14.0 and switch to python3 on F30+

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

* [rpms/mlt] epel9-next: Update to 6.14.0 and switch to python3 on F30+
@ 2026-07-20 18:17 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-07-20 18:17 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mlt
Branch : epel9-next
Commit : 7f1ed93e2d0ecd9e42836973644ddc05596b51f4
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2019-04-28T16:55:34+01:00
Stats  : +64/-39 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/mlt/c/7f1ed93e2d0ecd9e42836973644ddc05596b51f4?branch=epel9-next

Log:
Update to 6.14.0 and switch to python3 on F30+

---
diff --git a/.gitignore b/.gitignore
index 126279e..c2d4887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /mlt-6.8.0.tar.gz
 /mlt-6.10.0.tar.gz
 /mlt-6.12.0.tar.gz
+/mlt-6.14.0.tar.gz

diff --git a/mlt-null-pointer-crash.patch b/mlt-null-pointer-crash.patch
deleted file mode 100644
index f9852ba..0000000
--- a/mlt-null-pointer-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/modules/opengl/filter_movit_convert.cpp.orig	2019-02-02 12:18:50.717478538 +0100
-+++ src/modules/opengl/filter_movit_convert.cpp	2019-02-02 12:20:46.476448239 +0100
-@@ -346,7 +346,8 @@
- 	if ( service == (mlt_service) -1 ) {
- 		mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) );
- 		MltInput* input = chain->inputs[ producer ];
--		input->set_pixel_data( GlslManager::get_input_pixel_pointer( producer, frame ) );
-+ 		if (input)
-+			input->set_pixel_data( GlslManager::get_input_pixel_pointer( producer, frame ) );
- 		return;
- 	}
- 

diff --git a/mlt.spec b/mlt.spec
index e184006..d5d8336 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -1,6 +1,11 @@
 %bcond_without ruby
 %bcond_without php
 %bcond_with    freeworld
+%if 0%{?fedora} >= 30
+%bcond_without python3
+%else
+%bcond_with    python3
+%endif
 
 
 #globals for https://github.com/mltframework/mlt/commit/ea973eb65c8ca79a859028a9e008360836ca4941
@@ -9,12 +14,9 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 #global gver .%%{gitdate}git%%{shortcommit}
 
-# bytecompile with Python 2
-%global __python %{__python2}
-
 Name:           mlt
-Version:        6.12.0
-Release:        7%{?gver}%{?dist}
+Version:        6.14.0
+Release:        1%{?gver}%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -23,8 +25,6 @@ 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/compare/v6.4.1...%%{commit}.diff
-# https://github.com/mltframework/mlt/issues/404
-Patch0:         %{name}-null-pointer-crash.patch
 
 BuildRequires:  frei0r-devel
 BuildRequires:  opencv-devel
@@ -48,7 +48,11 @@ BuildRequires:  libxml2-devel
 BuildRequires:  sox-devel
 # verion 3.0.11 needed for php7 IIRC
 BuildRequires:  swig >= 3.0.11
+%if %{with python3}
+BuildRequires:  python3-devel
+%else
 BuildRequires:  python2-devel
+%endif
 BuildRequires:  freetype-devel
 BuildRequires:  libexif-devel
 BuildRequires:  fftw-devel
@@ -63,16 +67,22 @@ BuildRequires:  ffmpeg-devel
 BuildRequires:  xine-lib-devel
 %endif
 
+%if %{with python3}
+Obsoletes: python2-mlt < %{version}-%{release}
+%endif
+
 %if %{with ruby}
-BuildRequires:  ruby-devel ruby
+BuildRequires:  ruby-devel
+BuildRequires:  ruby
 %else
-Obsoletes: mlt-ruby < 0.8.8-5
+Obsoletes: mlt-ruby < %{version}-%{release}
 %endif
 
 %if %{with php}
 BuildRequires: php-devel
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
 %endif
+
 Requires:  opencv-core
 
 %description
@@ -84,7 +94,6 @@ transcoders, web streamers and many more types of applications. The
 functionality of the system is provided via an assortment of ready to use
 tools, xml authoring components, and an extendible plug-in based API.
 
-
 %package devel
 Summary:        Libraries, includes to develop applications with %{name}
 License:        LGPLv2+
@@ -92,43 +101,49 @@ Group:          Development/Libraries
 Requires:       pkgconfig
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
+%description devel
+The %{name}-devel package contains the header files and static libraries for
+building applications which use %{name}.
+
+%package -n python3-mlt
+%{?python_provide:%python_provide python3-mlt}
+Requires: python3
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Python package to work with MLT
+
+%description -n python3-mlt
+This module allows to work with MLT using python.
+
 %package -n python2-mlt
 %{?python_provide:%python_provide python2-mlt}
-# Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 Requires: python2
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Python package to work with MLT
 
+%description -n python2-mlt
+This module allows to work with MLT using python.
+
+
 %package ruby
 Requires: %{name}%{_isa} = %{version}-%{release}
 Summary: Ruby package to work with MLT
 
+%description ruby
+This module allows to work with MLT using ruby.
+
 %package php
 Requires: php(zend-abi) = %{php_zend_api}
 Requires: php(api) = %{php_core_api}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: PHP package to work with MLT
 
-%description devel
-The %{name}-devel package contains the header files and static libraries for
-building applications which use %{name}.
-
-%description -n python2-mlt
-This module allows to work with MLT using python.
-
-%description ruby
-This module allows to work with MLT using ruby.
-
 %description php
 This module allows to work with MLT using PHP.
 
 
 %prep
 %setup -qn %{name}-%{version}
-%patch0 -p0
 
 chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
 chmod 644 src/modules/kdenlive/filter_freeze.c
@@ -149,7 +164,13 @@ sed -i 's|-php5|-php7|g' src/swig/php/build
 sed -i 's|mlt_wrap.cpp|mlt_wrap.cxx|g' src/swig/php/build
 %endif
 
-%if 0%{?fedora} >= 29
+%if %{with python3}
+find src/swig/python -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|'
+sed -i -e 's|which python|which python3|' src/swig/python/build
+sed -i -e 's|python -c|python3 -c|' src/swig/python/build
+sed -i -e 's|python-config|python3-config|' src/swig/python/build
+sed -i -e 's|python{}.{}|python{}.{}m|' src/swig/python/build
+%else
 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
@@ -177,8 +198,13 @@ sed -i -e 's|python-config|python2-config|' src/swig/python/build
 %make_install
 
 # manually do what 'make install' skips
+%if %{with python3}
+install -D -pm 0644 src/swig/python/mlt.py %{buildroot}%{python3_sitelib}/mlt.py
+install -D -pm 0755 src/swig/python/_mlt.so %{buildroot}%{python3_sitearch}/_mlt.so
+%else
 install -D -pm 0644 src/swig/python/mlt.py %{buildroot}%{python2_sitelib}/mlt.py
 install -D -pm 0755 src/swig/python/_mlt.so %{buildroot}%{python2_sitearch}/_mlt.so
+%endif
 
 %if %{with ruby}
 install -D -pm 0755 src/swig/ruby/play.rb %{buildroot}%{ruby_vendorlibdir}/play.rb
@@ -215,9 +241,16 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 %{_libdir}/libmlt.so.*
 %{_datadir}/mlt/
 
+%if %{with python3}
+%files -n python3-mlt
+%{python3_sitelib}/mlt.py*
+%{python3_sitearch}/_mlt.so
+%{python3_sitelib}/__pycache__/mlt.*
+%else
 %files -n python2-mlt
 %{python2_sitelib}/mlt.py*
 %{python2_sitearch}/_mlt.so
+%endif
 
 %if %{with ruby}
 %files ruby
@@ -243,6 +276,9 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 
 
 %changelog
+* Sun Apr 28 2019 Sérgio Basto <sergio@serjux.com> - 6.14.0-1
+- Update to 6.14.0 and switch to python3 on F30+
+
 * Mon Mar 04 2019 Martin Gansser <martinkg@fedoraproject.org> - 6.12.0-7
 - Add mlt-null-pointer-crash.patch again
 
@@ -258,7 +294,7 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 * Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.12.0-3
 - F-30: rebuild against ruby26
 
-* Fri Jan 04 2019 Miro Hron�~Mok <mhroncok@redhat.com> - 6.12.0-2
+* Fri Jan 04 2019 Miro Hrončok <mhroncok@redhat.com> - 6.12.0-2
 - Remove the Python 2 subpackage (#1628684)
 
 * Thu Nov 29 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.12.0-1

diff --git a/sources b/sources
index 4fc92d9..332eba4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-6.12.0.tar.gz) = 9a8263a7d89cc0c4b448fca988e16163da745debcd743cba12d2f35abe447e53b96a5188d07649074d5f31ec1f4110669c136807a7fe7e98c4dc3d3194108501
+SHA512 (mlt-6.14.0.tar.gz) = c6a8e8f81d8c1445c5bdb8fd22a025a4382b4bb2cd7b3a8583722a1795801d18699e6162ec7541f4597580d04d5dea3fa7c9ffa6a52f1cdb4366afd1ba815abf

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-20 18:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-20 18:17 [rpms/mlt] epel9-next: Update to 6.14.0 and switch to python3 on F30+

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox