public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/mlt] epel9-next: Update mlt to 7.4.0
Date: Mon, 20 Jul 2026 18:17:38 GMT	[thread overview]
Message-ID: <178457145852.1.3020422705545308849.rpms-mlt-0c1c6757562f@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/mlt
            Branch : epel9-next
            Commit : 0c1c6757562f9b133fb46b345049efacd379aca6
            Author : Sérgio M. Basto <sergio@serjux.com>
            Date   : 2022-01-12T16:43:13+00:00
            Stats  : +58/-126 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/mlt/c/0c1c6757562f9b133fb46b345049efacd379aca6?branch=epel9-next

            Log:
            Update mlt to 7.4.0

On epel8 disable php and ruby plugins and not BR SDL_images

---
diff --git a/.gitignore b/.gitignore
index 5ea2a32..60bedec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /mlt-6.22.1.tar.gz
 /mlt-6.24.0.tar.gz
 /mlt-6.26.1.tar.gz
+/mlt-7.4.0.tar.gz

diff --git a/mlt.spec b/mlt.spec
index 5e9adb2..64e90f2 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -1,19 +1,14 @@
-%bcond_without ruby
-%bcond_without php
-%bcond_with    freeworld
-
-%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 31)
-%bcond_without python2
+%if 0%{?rhel} >= 8
+%bcond_with     ruby
+%bcond_with     php
+%bcond_with     opencv
 %else
-%bcond_with python2
-%endif
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
-%bcond_without python3
-%else
-%bcond_with    python3
+%bcond_without  ruby
+%bcond_without  php
+%bcond_without  opencv
 %endif
 
+%bcond_with     freeworld
 
 #globals for https://github.com/mltframework/mlt/commit/ea973eb65c8ca79a859028a9e008360836ca4941
 %global gitdate 20171213
@@ -22,8 +17,8 @@
 #global gver .%%{gitdate}git%%{shortcommit}
 
 Name:           mlt
-Version:        6.26.1
-Release:        5%{?dist}
+Version:        7.4.0
+Release:        1%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -32,7 +27,8 @@ License:        GPLv3 and LGPLv2+
 URL:            http://www.mltframework.org/
 Source0:        https://github.com/mltframework/mlt/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  make
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
 BuildRequires:  sed
 BuildRequires:  frei0r-devel
 BuildRequires:  opencv-devel
@@ -40,11 +36,9 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtsvg-devel
 BuildRequires:  qt5-qt3d-devel
 BuildRequires:  SDL-devel
-%if ! (0%{?rhel} >= 8)
-BuildRequires:  SDL_image-devel
-%endif
 BuildRequires:  SDL2-devel
 %if ! (0%{?rhel} >= 8)
+BuildRequires:  SDL_image-devel
 BuildRequires:  SDL2_image-devel
 %endif
 BuildRequires:  gtk2-devel
@@ -61,12 +55,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  sox-devel
 # verion 3.0.11 needed for php7 IIRC
 BuildRequires:  swig >= 3.0.11
-%if %{with python2}
-BuildRequires:  python2-devel
-%endif
-%if %{with python3}
 BuildRequires:  python3-devel
-%endif
 BuildRequires:  freetype-devel
 BuildRequires:  libexif-devel
 BuildRequires:  fftw-devel
@@ -82,9 +71,8 @@ BuildRequires:  xine-lib-devel
 Provides: mlt-freeworld = %{version}-%{release}
 Obsoletes:mlt-freeworld < %{version}-%{release}
 %endif
-
-%if !%{with python2}
-Obsoletes: python2-mlt < %{version}-%{release}
+%if %{with opencv}
+BuildRequires:  opencv-devel
 %endif
 
 %if %{with ruby}
@@ -99,7 +87,6 @@ BuildRequires: php-devel
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
 %endif
 
-Requires:  opencv-core
 
 %description
 MLT is an open source multimedia framework, designed and developed for
@@ -120,15 +107,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains the header files and static libraries for
 building applications which use %{name}.
 
-%package -n python2-mlt
-%{?python_provide:%python_provide python2-mlt}
-Obsoletes: %{name}-python < %{version}-%{release}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Summary: Python 2 package to work with MLT
-
-%description -n python2-mlt
-This module allows to work with MLT using python 2.
-
 %package -n python3-mlt
 %{?python_provide:%python_provide python3-mlt}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -157,75 +135,29 @@ This module allows to work with MLT using PHP.
 %prep
 %autosetup -p1 -n %{name}-%{version}
 
-chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
-chmod 644 src/modules/kdenlive/filter_freeze.c
-chmod -x demo/demo
-
-# Don't overoptimize (breaks debugging)
-sed -i -e '/fomit-frame-pointer/d' configure
-sed -i -e '/ffast-math/d' configure
-
-sed -i -e 's|qmake|qmake-qt5|' src/modules/qt/configure
+#chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
+#chmod 644 src/modules/kdenlive/filter_freeze.c
+#chmod -x demo/demo
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
 # be sure that aren't used
 rm -r src/win32/
 
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
-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 %{with python3}
-cp -a src/swig/python src/swig/python3
-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 python3|#!%{__python2}|'
-sed -i -e 's|-python3|-python2|' src/swig/python/build
-%else
-rm -rf src/swig/python
-%endif
-
 %build
-#export STRIP=/bin/true
-%configure \
-        --enable-gpl                            \
-        --enable-gpl3                            \
-        --enable-motion-est                     \
-        --enable-vorbis                     \
-%ifnarch %{ix86} x86_64
-        --disable-mmx                           \
-        --disable-sse                           \
-%endif
-        --disable-xine                          \
-        --rename-melt=%{name}-melt              \
-        --swig-languages="%{?with_python2: python}%{?with_python3: python3}%{?with_php: php}%{?with_ruby: ruby}"
-
-%make_build
+%cmake -DCMAKE_SKIP_RPATH:BOOL=ON           \
+       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON   \
+       %{?with_php: -DSWIG_PHP:BOOL=ON}     \
+       -DSWIG_PYTHON:BOOL=ON                \
+       %{?with_ruby: -DSWIG_RUBY:BOOL=ON}   \
+       %{!?with_freeworld: -DMOD_XINE:BOOL=OFF}  \
+       %{?with_opencv: -DMOD_OPENCV:BOOL=ON}  \
 
+%cmake_build
 
 %install
-%make_install
-
-# manually do what 'make install' skips
-%if %{with python2}
-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 python3}
-install -D -pm 0644 src/swig/python3/mlt.py %{buildroot}%{python3_sitelib}/mlt.py
-install -D -pm 0755 src/swig/python3/_mlt.so %{buildroot}%{python3_sitearch}/_mlt.so
-%endif
-
-%if %{with ruby}
-install -D -pm 0755 src/swig/ruby/play.rb %{buildroot}%{ruby_vendorlibdir}/play.rb
-install -D -pm 0755 src/swig/ruby/thumbs.rb %{buildroot}%{ruby_vendorlibdir}/thumbs.rb
-install -D -pm 0755 src/swig/ruby/mlt.so %{buildroot}%{ruby_vendorarchdir}/mlt.so
-%endif
+%cmake_install
 
 %if %{with php}
-install -D -pm 0755 src/swig/php/mlt.so %{buildroot}%{php_extdir}/mlt.so
 install -d %{buildroot}%{_sysconfdir}/php.d
 cat > %{buildroot}%{_sysconfdir}/php.d/mlt.ini << 'EOF'
 ; Enable mlt extension module
@@ -233,15 +165,17 @@ extension=mlt.so
 EOF
 %endif
 
-mv src/modules/motion_est/README README.motion_est
-sed -i -e "s#melt#mlt-melt#g" docs/melt.1
-install -D -pm 0644 docs/melt.1 %{buildroot}%{_mandir}/man1/mlt-melt.1
+# maintain binary /usr/bin/mlt-melt
+mv %{buildroot}%{_bindir}/melt %{buildroot}%{_bindir}/mlt-melt
+
+# Remove rpath file '/usr/bin/melt-7' contains an invalid rpath '/home/martin/rpmbuild/BUILD/mlt-7.0.1/x86_64-redhat-linux-gnu/out/lib' in [/home/martin/rpmbuild/BUILD/mlt-7.0.1/x86_64-redhat-linux-gnu/out/lib]
+#chrpath --delete %{buildroot}%{_bindir}/melt-7
 
 %check
 # verify pkg-config version sanity
-export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
-test "$(pkg-config --modversion mlt-framework)" = "%{version}"
-test "$(pkg-config --modversion mlt++)" = "%{version}"
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion mlt-framework-7)" = "%{version}"
+test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 
 %ldconfig_scriptlets
 
@@ -250,29 +184,20 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 %doc docs/*txt demo/
 %license COPYING GPL
 %{_bindir}/mlt-melt
-%{_libdir}/mlt/
-%{_libdir}/libmlt++.so.*
-%{_libdir}/libmlt.so.*
-%{_datadir}/mlt/
-%{_mandir}/man1/mlt-melt.1*
-
-%if %{with python2}
-%files -n python2-mlt
-%{python2_sitelib}/mlt.py*
-%{python2_sitearch}/_mlt.so
-%endif
+%{_bindir}/melt-7
+%{_libdir}/mlt-7/
+%{_libdir}/libmlt++-7.so.*
+%{_libdir}/libmlt-7.so.*
+%{_datadir}/mlt-7/
+%{_mandir}/man1/melt-7.1*
 
-%if %{with python3}
 %files -n python3-mlt
-%{python3_sitelib}/mlt.py*
-%{python3_sitearch}/_mlt.so
-%{python3_sitelib}/__pycache__/mlt.*
-%endif
+%{python3_sitearch}/mlt7.py*
+%{python3_sitearch}/_mlt7.so
+%{python3_sitearch}/__pycache__/mlt7.*
 
 %if %{with ruby}
 %files ruby
-%{ruby_vendorlibdir}/play.rb
-%{ruby_vendorlibdir}/thumbs.rb
 %{ruby_vendorarchdir}/mlt.so
 %endif
 
@@ -280,18 +205,24 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 %files php
 %config(noreplace) %{_sysconfdir}/php.d/mlt.ini
 %{php_extdir}/mlt.so
+%{_libdir}/php/modules/mlt.php
 %endif
 
 %files devel
-%{_libdir}/pkgconfig/mlt-framework.pc
-%{_libdir}/pkgconfig/mlt++.pc
-%{_libdir}/libmlt.so
-%{_libdir}/libmlt++.so
-%{_includedir}/mlt/
-%{_includedir}/mlt++/
+%{_libdir}/pkgconfig/mlt-framework-7.pc
+%{_libdir}/pkgconfig/mlt++-7.pc
+%{_libdir}/libmlt-7.so
+%{_libdir}/libmlt++-7.so
+%{_libdir}/cmake/Mlt7/Mlt7*.cmake
+%{_includedir}/mlt-7/
+#{_includedir}/mlt++-7/
 
 
 %changelog
+* Fri Jan 07 2022 Sérgio Basto <sergio@serjux.com> - 7.4.0-1
+- Update mlt to 7.4.0
+- On epel8 disable php and ruby plugins and not BR SDL_images
+
 * Wed Dec 15 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.26.1-5
 - rebuild for new vid.stab
 

diff --git a/sources b/sources
index b287ed4..6185e9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-6.26.1.tar.gz) = 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
+SHA512 (mlt-7.4.0.tar.gz) = e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4

                 reply	other threads:[~2026-07-20 18:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178457145852.1.3020422705545308849.rpms-mlt-0c1c6757562f@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox