[rpms/mlt] epel9-next: Enable both Qt5 and Qt6 in separate subpackages

[Yaakov Selkowitz <yselkowi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/mlt
            Branch : epel9-next
            Commit : dbd4ae589ed2ff05ff4c2ec38bebdad1dc02d68e
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-04-12T17:17:06+01:00
            Stats  : +50/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/mlt/c/dbd4ae589ed2ff05ff4c2ec38bebdad1dc02d68e?branch=epel9-next

            Log:
            Enable both Qt5 and Qt6 in separate subpackages

While kdenlive has moved to Qt6 in F40, krita is still based
on Qt5, and synfigstudio is GTK+ based.  Therefore, packages
need to be able to install mlt without getting Qt version(s)
that they do not otherwise need.  The bug in kdenlive where it
would mistakenly use the wrong Qt modules has since been fixed.

---
diff --git a/mlt.spec b/mlt.spec
index e2aa48f..ad9d2b9 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -21,7 +21,7 @@
 
 Name:           mlt
 Version:        7.22.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -38,6 +38,12 @@ BuildRequires:  cmake
 BuildRequires:  sed
 BuildRequires:  frei0r-devel
 BuildRequires:  opencv-devel
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Network)
 BuildRequires:  cmake(Qt6CoreTools)
 BuildRequires:  cmake(Qt6Core)
 BuildRequires:  cmake(Qt6GuiTools)
@@ -105,6 +111,8 @@ BuildRequires: php-devel
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
 %endif
 
+Requires:      (%{name}-qt5%{?_isa} = %{version}-%{release} if qt5-qtbase%{?_isa})
+Requires:      (%{name}-qt6%{?_isa} = %{version}-%{release} if qt6-qtbase%{?_isa})
 
 %description
 MLT is an open source multimedia framework, designed and developed for
@@ -115,6 +123,18 @@ 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 qt5
+Summary:        Qt5 support for MLT
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%description qt5
+This packages includes Qt5 support modules to MLT.
+
+%package qt6
+Summary:        Qt6 support for MLT
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%description qt6
+This packages includes Qt6 support modules to MLT.
+
 %if %{with ndi}
 %package ndi
 Summary:        NDI support for MLT
@@ -175,7 +195,9 @@ rm -r src/win32/
        -DSWIG_PYTHON:BOOL=ON                \
        %{?with_ruby: -DSWIG_RUBY:BOOL=ON}   \
        %{?with_opencv: -DMOD_OPENCV:BOOL=ON}  \
+       -DMOD_GLAXNIMATE:BOOL=ON  \
        -DMOD_GLAXNIMATE_QT6:BOOL=ON  \
+       -DMOD_QT:BOOL=ON \
        -DMOD_QT6:BOOL=ON \
        %{?with_ndi: -DMOD_NDI:BOOL=ON -DNDI_SDK_INCLUDE_PATH=%{_includedir}/ndi-sdk -DNDI_SDK_LIBRARY_PATH=%{_libdir} -DNDI_INCLUDE_DIR=%{_includedir}/ndi-sdk -DNDI_LIBRARY_DIR=%{_libdir}}
 
@@ -217,6 +239,8 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 %{_libdir}/libmlt-7.so.*
 %{_datadir}/mlt-7/
 %{_mandir}/man1/melt-7.1*
+%exclude %{_libdir}/mlt-7/libmltglaxnimate*.so
+%exclude %{_libdir}/mlt-7/libmltqt*.so
 %if %{with ndi}
 %exclude %{_libdir}/mlt-7/libmltndi.so
 
@@ -224,6 +248,14 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 %{_libdir}/mlt-7/libmltndi.so
 %endif
 
+%files qt5
+%{_libdir}/mlt-7/libmltglaxnimate.so
+%{_libdir}/mlt-7/libmltqt.so
+
+%files qt6
+%{_libdir}/mlt-7/libmltglaxnimate-qt6.so
+%{_libdir}/mlt-7/libmltqt6.so
+
 %files -n python3-mlt
 %{python3_sitearch}/mlt7.py*
 %{python3_sitearch}/_mlt7.so
@@ -253,6 +285,9 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 
 
 %changelog
+* Fri Apr 12 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.22.0-7
+- Enable both Qt5 and Qt6 in separate subpackages
+
 * Fri Apr 12 2024 Remi Collet <remi@remirepo.net> - 7.22.0-6
 - disable PHP extension on 32-bit
   https://fedoraproject.org/wiki/Changes/php_no_32_bit

diff --git a/mlt.spec b/mlt.spec
index f15f635..ad9d2b9 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -4,7 +4,15 @@
 %bcond_with     opencv
 %else
 %bcond_without  ruby
+%if 0%{?fedora} >= 41
+%ifarch %{ix86}
+%bcond_with     php
+%else
 %bcond_without  php
+%endif
+%else
+%bcond_without  php
+%endif
 %bcond_without  opencv
 %endif
 
@@ -13,7 +21,7 @@
 
 Name:           mlt
 Version:        7.22.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -277,9 +285,13 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 
 
 %changelog
-* Wed Apr 10 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.22.0-6
+* Fri Apr 12 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.22.0-7
 - Enable both Qt5 and Qt6 in separate subpackages
 
+* Fri Apr 12 2024 Remi Collet <remi@remirepo.net> - 7.22.0-6
+- disable PHP extension on 32-bit
+  https://fedoraproject.org/wiki/Changes/php_no_32_bit
+
 * Fri Mar 22 2024 Sérgio Basto <sergio@serjux.com> - 7.22.0-5
 - Remove workaround