public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Neal Gompa <ngompa@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/mlt] f44: Update to 7.40.0 upstream release
Date: Mon, 03 Aug 2026 19:00:25 GMT	[thread overview]
Message-ID: <178578362513.1.13442175484054987955.rpms-mlt-05d820817c91@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/mlt
            Branch : f44
            Commit : 05d820817c91ed560dbc390f7a3e31714898434b
            Author : Neal Gompa <ngompa@fedoraproject.org>
            Date   : 2026-08-03T14:14:35-04:00
            Stats  : +12/-187 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/mlt/c/05d820817c91ed560dbc390f7a3e31714898434b?branch=f44

            Log:
            Update to 7.40.0 upstream release

- Resolves: rhbz#2461053

Upstream tag: v7.40.0
Upstream commit: bef9d89c

Commit partly authored by Packit automation (https://packit.dev/)

---
diff --git a/.gitignore b/.gitignore
index 0ba3c88..a4e4037 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /mlt-7.30.0.tar.gz
 /mlt-7.32.0.tar.gz
 /mlt-7.36.1.tar.gz
+/mlt-7.40.0.tar.gz

diff --git a/README.packit b/README.packit
index 8c905b9..dd0af79 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.106.0.post1.dev8+g521f1e1d.
+The file was generated using packit 1.16.1.

diff --git a/mlt-7.36-restore-qt5-support.patch b/mlt-7.36-restore-qt5-support.patch
deleted file mode 100644
index 8f830de..0000000
--- a/mlt-7.36-restore-qt5-support.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 972e3792690b026aa0a5d164483c18c263c699b3 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Fri, 20 Feb 2026 09:27:50 -0500
-Subject: [PATCH] Revert "Drop support for Qt 5"
-
-This is temporary and only so backward compatibility isn't broken
-in existing Fedora releases.
-
-This reverts commit 7707aaca0f935640be6a9b4df8b533bbe5702e25.
----
- CMakeLists.txt                        | 19 +++++++++++++++++--
- src/modules/CMakeLists.txt            |  4 ++--
- src/modules/glaxnimate/CMakeLists.txt |  4 ++++
- src/modules/qt/CMakeLists.txt         |  4 ++++
- 4 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2856ab6a..3c89ad91 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,6 +18,7 @@ option(MOD_AVFORMAT "Enable avformat module" ON)
- option(MOD_DECKLINK "Enable DeckLink module" ON)
- option(MOD_FREI0R "Enable Frei0r module" ON)
- option(MOD_GDK "Enable GDK module" ON)
-+option(MOD_GLAXNIMATE "Enable Glaxnimate module (Qt5)" OFF)
- option(MOD_GLAXNIMATE_QT6 "Enable Glaxnimate module (Qt6)" OFF)
- option(MOD_JACKRACK "Enable JACK Rack module" ON)
- option(USE_LV2 "Enable LV2 features" ON)
-@@ -30,6 +31,7 @@ option(MOD_OPENCV "Enable OpenCV module" OFF)
- option(MOD_MOVIT "Enable OpenGL module" ON)
- option(MOD_PLUS "Enable Plus module" ON)
- option(MOD_PLUSGPL "Enable PlusGPL module (GPL)" ON)
-+option(MOD_QT "Enable Qt5 module (GPL)" OFF)
- option(MOD_QT6 "Enable Qt6 module (GPL)" ON)
- option(MOD_RESAMPLE "Enable Resample module (GPL)" ON)
- option(MOD_RTAUDIO "Enable RtAudio module" ON)
-@@ -173,6 +175,7 @@ endif()
- if(NOT GPL)
-   set(MOD_NORMALIZE OFF)
-   set(MOD_PLUSGPL OFF)
-+  set(MOD_QT OFF)
-   set(MOD_QT6 OFF)
-   set(MOD_RESAMPLE OFF)
-   set(MOD_RUBBERBAND OFF)
-@@ -199,11 +202,11 @@ endif()
- 
- find_package(SDL2)
- 
--if(MOD_QT6 OR MOD_PLUS)
-+if(MOD_QT OR MOD_QT6 OR MOD_PLUS)
-   find_package(FFTW3)
- endif()
- 
--if(MOD_QT6 OR MOD_GDK)
-+if(MOD_QT OR MOD_QT6 OR MOD_GDK)
-   pkg_check_modules(libexif IMPORTED_TARGET libexif)
- endif()
- 
-@@ -328,6 +331,16 @@ if(BUILD_TESTING)
-   enable_testing()
- endif()
- 
-+if(MOD_QT)
-+  find_package(Qt5 REQUIRED COMPONENTS Core Xml Gui Svg Widgets)
-+  list(APPEND MLT_SUPPORTED_COMPONENTS qt)
-+endif()
-+
-+if(MOD_GLAXNIMATE)
-+  find_package(Qt5 REQUIRED COMPONENTS Core Gui Network Widgets Xml)
-+  list(APPEND MLT_SUPPORTED_COMPONENTS glaxnimate)
-+endif()
-+
- if(MOD_RESAMPLE)
-   pkg_check_modules(samplerate REQUIRED IMPORTED_TARGET samplerate)
-   list(APPEND MLT_SUPPORTED_COMPONENTS resample)
-@@ -545,6 +558,7 @@ add_feature_info("Module: avformat" MOD_AVFORMAT "")
- add_feature_info("Module: DeckLink" MOD_DECKLINK "")
- add_feature_info("Module: Frei0r" MOD_FREI0R "")
- add_feature_info("Module: GDK" MOD_GDK "")
-+add_feature_info("Module: Glaxnimate (Qt5)" MOD_GLAXNIMATE "")
- add_feature_info("Module: Glaxnimate (Qt6)" MOD_GLAXNIMATE_QT6 "")
- add_feature_info("Module: JACKRack" MOD_JACKRACK "")
- add_feature_info("Module: Kdenlive" MOD_KDENLIVE "")
-@@ -555,6 +569,7 @@ add_feature_info("Module: OpenCV" MOD_OPENCV "")
- add_feature_info("Module: Movit" MOD_MOVIT "")
- add_feature_info("Module: Plus" MOD_PLUS "")
- add_feature_info("Module: PlusGPL" MOD_PLUSGPL "")
-+add_feature_info("Module: Qt (Qt5)" MOD_QT "")
- add_feature_info("Module: Qt6" MOD_QT6 "")
- add_feature_info("Module: Resample" MOD_RESAMPLE "")
- add_feature_info("Module: RtAudio" MOD_RTAUDIO "")
-diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
-index bdc46c88..9b04d900 100644
---- a/src/modules/CMakeLists.txt
-+++ b/src/modules/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(MOD_GDK)
-   add_subdirectory(gdk)
- endif()
- 
--if(MOD_GLAXNIMATE_QT6)
-+if(MOD_GLAXNIMATE OR MOD_GLAXNIMATE_QT6)
-   add_subdirectory(glaxnimate)
- endif()
- 
-@@ -56,7 +56,7 @@ if(MOD_PLUSGPL)
-   add_subdirectory(plusgpl)
- endif()
- 
--if(MOD_QT6)
-+if(MOD_QT OR MOD_QT6)
-   add_subdirectory(qt)
- endif()
- 
-diff --git a/src/modules/glaxnimate/CMakeLists.txt b/src/modules/glaxnimate/CMakeLists.txt
-index a117c8dc..1c9388a0 100644
---- a/src/modules/glaxnimate/CMakeLists.txt
-+++ b/src/modules/glaxnimate/CMakeLists.txt
-@@ -213,6 +213,10 @@ function(mlt_add_glaxnimate_module ARG_TARGET)
-     )
- endfunction()
- 
-+if(MOD_GLAXNIMATE)
-+    mlt_add_glaxnimate_module(mltglaxnimate QT_VERSION 5 DATADIR glaxnimate)
-+endif()
-+
- if(MOD_GLAXNIMATE_QT6)
-     mlt_add_glaxnimate_module(mltglaxnimate-qt6 QT_VERSION 6 DATADIR glaxnimate-qt6)
- endif()
-diff --git a/src/modules/qt/CMakeLists.txt b/src/modules/qt/CMakeLists.txt
-index c176e520..7d05417b 100644
---- a/src/modules/qt/CMakeLists.txt
-+++ b/src/modules/qt/CMakeLists.txt
-@@ -125,6 +125,10 @@ function(mlt_add_qt_module ARG_TARGET)
-     )
- endfunction()
- 
-+if (MOD_QT)
-+    mlt_add_qt_module(mltqt QT_VERSION 5 DATADIR qt)
-+endif()
-+
- if (MOD_QT6)
-     mlt_add_qt_module(mltqt6 QT_VERSION 6 DATADIR qt6)
- endif()
--- 
-2.53.0
-

diff --git a/mlt.spec b/mlt.spec
index fce5656..4a9400b 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -16,19 +16,12 @@
 %bcond_without  opencv
 %endif
 
-# Temporarily restore Qt5 support
-%if 0%{?fedora} && 0%{?fedora} < 44
-%bcond_without qt5
-%else
-%bcond_with qt5
-%endif
-
 # needs nonfree/ndi-sdk
 %bcond_with  ndi
 
 Name:           mlt
-Version:        7.36.1
-Release:        7%{?dist}
+Version:        7.40.0
+Release:        1%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -42,11 +35,7 @@ Source0:        https://github.com/mltframework/mlt/releases/download/v%{version
 
 # Proposed fixes (501~1000)
 
-# Downstream only changes (1001~2000)
-
-# Temporary fixes (2001+)
-## Only for 7.36.x and for F43 and older
-Patch2001:      mlt-7.36-restore-qt5-support.patch
+# Downstream only changes (1001+)
 
 %if 0%{?fedora} > 43
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
@@ -116,6 +105,7 @@ BuildRequires:  ndi-sdk-devel
 BuildRequires:  opencv-devel
 %endif
 BuildRequires:  pkgconfig(libarchive)
+BuildRequires:  pkgconfig(rnnoise)
 
 %if %{with ruby}
 BuildRequires:  ruby-devel
@@ -129,11 +119,7 @@ BuildRequires: php-devel
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
 %endif
 
-%if %{with qt5}
-Requires:      (%{name}-qt5%{?_isa} = %{version}-%{release} if qt5-qtbase%{?_isa})
-%else
 Obsoletes:      mlt-qt5 < %{version}-%{release}
-%endif
 
 Requires:      (%{name}-qt6%{?_isa} = %{version}-%{release} if qt6-qtbase%{?_isa})
 
@@ -146,14 +132,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.
 
-%if %{with qt5}
-%package qt5
-Summary:        Qt5 support for MLT
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%description qt5
-This packages includes Qt5 support modules to MLT.
-%endif
-
 %package qt6
 Summary:        Qt6 support for MLT
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -204,12 +182,7 @@ This module allows to work with MLT using PHP.
 
 
 %prep
-%autosetup -N
-%autopatch -p1 -M 2000
-
-%if %{with qt5}
-%patch -p1 -P 2001
-%endif
+%autosetup -p1
 
 chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
 chmod 644 src/modules/kdenlive/filter_freeze.c
@@ -228,7 +201,6 @@ rm -r src/win32/
        %{?with_opencv: -DMOD_OPENCV:BOOL=ON}  \
        -DMOD_GLAXNIMATE:BOOL=%{?with_qt5:ON}%{!?with_qt5:OFF}  \
        -DMOD_GLAXNIMATE_QT6:BOOL=ON  \
-       -DMOD_QT:BOOL=%{?with_qt5:ON}%{!?with_qt5:OFF} \
        -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}}
 
@@ -278,12 +250,6 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 %{_libdir}/mlt-7/libmltndi.so
 %endif
 
-%if %{with qt5}
-%files qt5
-%{_libdir}/mlt-7/libmltglaxnimate.so
-%{_libdir}/mlt-7/libmltqt.so
-%endif
-
 %files qt6
 %{_libdir}/mlt-7/libmltglaxnimate-qt6.so
 %{_libdir}/mlt-7/libmltqt6.so
@@ -314,6 +280,10 @@ test "$(pkg-config --modversion mlt++-7)" = "%{version}"
 
 
 %changelog
+* Mon Aug 03 2026 Neal Gompa <ngompa@fedoraproject.org> - 7.40.0-1
+- Update to version 7.40.0
+- Resolves: rhbz#2461053
+
 * Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 7.36.1-7
 - Rebuilt for Python 3.15.0b4 ABI change
 

diff --git a/sources b/sources
index 133b3d0..ff7f721 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-7.36.1.tar.gz) = dbd25aca3d462e7db8f0673a04a16bed693e73f2c33ead11446933374a5b6f802803e55d7d16f522a97acaf457654bd6fc7710c5436f6c1ebc98568e9b816b35
+SHA512 (mlt-7.40.0.tar.gz) = f595f18777b0a69aff18270176f528865a38083439a320e206eba381b9ee8de9efc78bf1ae65355a6fd72265d91d2487f7ac54e57dcbdef1e1152049d2ceed25

                 reply	other threads:[~2026-08-03 19:00 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=178578362513.1.13442175484054987955.rpms-mlt-05d820817c91@fedoraproject.org \
    --to=ngompa@fedoraproject.org \
    --cc=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