The package rpms/mlt.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mlt.git/commit/?id=3f20c2ca316d31...
https://src.fedoraproject.org/cgit/rpms/mlt.git/commit/?id=64e0df2328858b...
https://src.fedoraproject.org/cgit/rpms/mlt.git/commit/?id=9b4915e3657b45....
Change:
+%ifarch %{ix86}
-%ifarch x86_64
+%ifarch x86_64
Thanks.
Full change:
============
commit ce2d2e3ee0dfda15075cbe80c5a5758c50766ecf
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon May 20 12:15:49 2024 +0100
Update mlt to 7.24.0 (#2277642)
diff --git a/.gitignore b/.gitignore
index 13bb648..afbc868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/mlt-7.18.0.tar.gz
/mlt-7.20.0.tar.gz
/mlt-7.22.0.tar.gz
+/mlt-7.24.0.tar.gz
diff --git a/mlt-pr963-libxml2_2_12.patch b/mlt-pr963-libxml2_2_12.patch
deleted file mode 100644
index 9c31555..0000000
--- a/mlt-pr963-libxml2_2_12.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9979f4e2b090b9a461d7171e1642486974d335dc Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
-Date: Thu, 30 Nov 2023 14:28:27 +0900
-Subject: [PATCH] FIX: support compilation with libxml2 2.12.0
-
-libxml2 2.12.0 does some refactoring about functions prototypes places.
-`xmlParseFile` definition is in `libxml/parser.h` anyway so include
-this header file.
-
-Closes #962 .
----
- src/modules/jackrack/jack_rack.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/jackrack/jack_rack.c b/src/modules/jackrack/jack_rack.c
-index f9b3ad40b..467ba99bc 100644
---- a/src/modules/jackrack/jack_rack.c
-+++ b/src/modules/jackrack/jack_rack.c
-@@ -29,6 +29,7 @@
- #include <ctype.h>
-
- #include <ladspa.h>
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
-
- #include "jack_rack.h"
diff --git a/mlt.spec b/mlt.spec
index ad9d2b9..384fca7 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -20,8 +20,8 @@
%bcond_with ndi
Name: mlt
-Version: 7.22.0
-Release: 7%{?dist}
+Version: 7.24.0
+Release: 1%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -29,9 +29,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/releases/download/v%{version}/%{name}...
-#
https://github.com/mltframework/mlt/pull/963
-# Support compilation with libxml2 2.12.0
-Patch0: mlt-pr963-libxml2_2_12.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -285,6 +282,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Sun May 19 2024 Sérgio Basto <sergio(a)serjux.com> - 7.24.0-1
+- Update mlt to 7.24.0 (#2277642)
+
* Fri Apr 12 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 7.22.0-7
- Enable both Qt5 and Qt6 in separate subpackages
diff --git a/sources b/sources
index e735b98..bd96d7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-7.22.0.tar.gz) =
84763e1cb8495be9476637d2474aa492906b904990905f9283faffff75829553cf87b097166fe6d382acc043422e6da45014ca4ba281c7fc68f10ebe3cec4fee
+SHA512 (mlt-7.24.0.tar.gz) =
a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d
commit dbd4ae589ed2ff05ff4c2ec38bebdad1dc02d68e
Merge: 3f20c2c 9f06367
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Wed Apr 10 21:16:57 2024 -0400
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 --cc mlt.spec
index e2aa48f,f15f635..ad9d2b9
--- a/mlt.spec
+++ b/mlt.spec
@@@ -21,7 -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.
@@@ -253,10 -277,9 +285,13 @@@ test "$(pkg-config --modversion mlt++-7
%changelog
-* Wed Apr 10 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 7.22.0-6
++* Fri Apr 12 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 7.22.0-7
+ - Enable both Qt5 and Qt6 in separate subpackages
+
+* Fri Apr 12 2024 Remi Collet <remi(a)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(a)serjux.com> - 7.22.0-5
- Remove workaround
commit 3f20c2ca316d313cafe5c753489b63bea0c3c9c0
Author: Remi Collet <remi(a)fedoraproject.org>
Date: Fri Apr 12 08:57:03 2024 +0200
disable PHP extension on 32-bit
diff --git a/mlt.spec b/mlt.spec
index 354ba22..e2aa48f 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: 5%{?dist}
+Release: 6%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -245,6 +253,10 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Fri Apr 12 2024 Remi Collet <remi(a)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(a)serjux.com> - 7.22.0-5
- Remove workaround
commit 9f06367c22d60262350b99fb483b9e077225f354
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Wed Apr 10 21:16:57 2024 -0400
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 354ba22..f15f635 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,7 @@
Name: mlt
Version: 7.22.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -30,6 +30,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)
@@ -97,6 +103,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
@@ -107,6 +115,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
@@ -167,7 +187,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}}
@@ -209,6 +231,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
@@ -216,6 +240,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
@@ -245,6 +277,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Wed Apr 10 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 7.22.0-6
+- Enable both Qt5 and Qt6 in separate subpackages
+
* Fri Mar 22 2024 Sérgio Basto <sergio(a)serjux.com> - 7.22.0-5
- Remove workaround
commit 64e0df2328858bf7a84e2991354e57df3baefb28
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 22 23:19:01 2024 +0000
Remove workaround
diff --git a/mlt.spec b/mlt.spec
index bf5873d..354ba22 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,7 @@
Name: mlt
Version: 7.22.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -160,11 +160,6 @@ chmod -x demo/demo
# be sure that aren't used
rm -r src/win32/
-# Workaround
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113205
-%ifarch x86_64
-%global optflags %(echo %{optflags} -fno-tree-slp-vectorize)
-%endif
-
%build
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON \
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
@@ -250,6 +245,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Fri Mar 22 2024 Sérgio Basto <sergio(a)serjux.com> - 7.22.0-5
+- Remove workaround
+
* Thu Jan 25 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Workaround
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113205
commit 9b4915e3657b45e5969ad9a08d5705bb05bea2cc
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Feb 9 00:37:46 2024 +0000
Workaround
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113205
diff --git a/mlt.spec b/mlt.spec
index 6681af5..bf5873d 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -160,6 +160,11 @@ chmod -x demo/demo
# be sure that aren't used
rm -r src/win32/
+# Workaround
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113205
+%ifarch x86_64
+%global optflags %(echo %{optflags} -fno-tree-slp-vectorize)
+%endif
+
%build
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON \
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
@@ -247,6 +252,8 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
* Thu Jan 25 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Workaround
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113205
+- Rebuild for opencv 4.9.0
* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 9a1daef6d4512cf980bc65815499fe33e5c9017f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 25 07:38:18 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/mlt.spec b/mlt.spec
index de3aef2..6681af5 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,7 @@
Name: mlt
Version: 7.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -245,6 +245,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 2f675da1eba7c9e2c05969a6579d029c1b38a52f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Jan 21 08:22:31 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/mlt.spec b/mlt.spec
index 2690dc7..de3aef2 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,7 @@
Name: mlt
Version: 7.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -245,6 +245,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.22.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Mon Jan 01 2024 Marie Loise Nolden <loise(a)kde.org> - 7.22.0-2
- use Qt6 instead of Qt5, otherwise kdenlive won't work with Qt6/KF6
commit 3fcd662883ed29da1e185b2760784d801ba1b44c
Author: Marie Loise Nolden <loise(a)kde.org>
Date: Mon Jan 1 13:27:17 2024 +0000
update changelog
diff --git a/mlt.spec b/mlt.spec
index 4f052c1..2690dc7 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -245,6 +245,9 @@ test "$(pkg-config --modversion mlt++-7)" =
"%{version}"
%changelog
+* Mon Jan 01 2024 Marie Loise Nolden <loise(a)kde.org> - 7.22.0-2
+- use Qt6 instead of Qt5, otherwise kdenlive won't work with Qt6/KF6
+
* Thu Dec 07 2023 Sérgio Basto <sergio(a)serjux.com> - 7.22.0-1
- Update mlt to 7.22.0 (#2252089)
commit 95baae077db50a493584f96055686672402c4f8c
Author: Marie Loise Nolden <loise(a)kde.org>
Date: Mon Jan 1 13:14:50 2024 +0000
Only works with Qt5 OR Qt6, not both enabled
diff --git a/mlt.spec b/mlt.spec
index 0cc45a6..4f052c1 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -30,9 +30,6 @@ BuildRequires: cmake
BuildRequires: sed
BuildRequires: frei0r-devel
BuildRequires: opencv-devel
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtsvg-devel
-BuildRequires: qt5-qt3d-devel
BuildRequires: cmake(Qt6CoreTools)
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6GuiTools)
@@ -170,8 +167,6 @@ rm -r src/win32/
-DSWIG_PYTHON:BOOL=ON \
%{?with_ruby: -DSWIG_RUBY:BOOL=ON} \
%{?with_opencv: -DMOD_OPENCV:BOOL=ON} \
- -DMOD_KDENLIVE:BOOL=ON \
- -DMOD_GLAXNIMATE:BOOL=ON \
-DMOD_GLAXNIMATE_QT6: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}}
commit 86435409e75c25430f56eb96ce559b02e27f6822
Author: Marie Loise Nolden <loise(a)kde.org>
Date: Mon Jan 1 12:52:23 2024 +0000
Add Qt6 Builds
diff --git a/mlt.spec b/mlt.spec
index 615f8b8..0cc45a6 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,7 @@
Name: mlt
Version: 7.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -33,6 +33,16 @@ BuildRequires: opencv-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qt3d-devel
+BuildRequires: cmake(Qt6CoreTools)
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6GuiTools)
+BuildRequires: cmake(Qt6DBusTools)
+BuildRequires: cmake(Qt6Gui)
+BuildRequires: cmake(Qt6Xml)
+BuildRequires: cmake(Qt6WidgetsTools)
+BuildRequires: cmake(Qt6SvgWidgets)
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6Core5Compat)
BuildRequires: SDL-devel
BuildRequires: SDL2-devel
%if ! (0%{?rhel} >= 8)
@@ -160,7 +170,10 @@ rm -r src/win32/
-DSWIG_PYTHON:BOOL=ON \
%{?with_ruby: -DSWIG_RUBY:BOOL=ON} \
%{?with_opencv: -DMOD_OPENCV:BOOL=ON} \
+ -DMOD_KDENLIVE:BOOL=ON \
-DMOD_GLAXNIMATE:BOOL=ON \
+ -DMOD_GLAXNIMATE_QT6: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}}
%cmake_build