Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

6 changed files with 12 additions and 250 deletions

36
.gitignore vendored
View file

@ -6,39 +6,3 @@
/shotcut-24.09.13.tar.gz
/shotcut-24.09.19.tar.gz
/shotcut-24.10.13.tar.gz
/shotcut-24.10.28.tar.gz
/shotcut-24.10.29.tar.gz
/shotcut-24.11.17.tar.gz
/shotcut-25.01.03.tar.gz
/shotcut-25.01.05.tar.gz
/shotcut-25.01.25.tar.gz
/shotcut-25.03.12.tar.gz
/shotcut-25.03.13.tar.gz
/shotcut-25.03.29.tar.gz
/shotcut-25.04.25.tar.gz
/shotcut-25.05.11.tar.gz
/shotcut-25.07.06.tar.gz
/shotcut-25.07.07.tar.gz
/shotcut-25.07.16.tar.gz
/shotcut-25.07.25.tar.gz
/shotcut-25.07.26.tar.gz
/shotcut-25.07.31.tar.gz
/shotcut-25.10.9.tar.gz
/shotcut-25.10.29.tar.gz
/shotcut-25.10.30.tar.gz
/shotcut-25.10.31.tar.gz
/shotcut-25.12.2.tar.gz
/shotcut-25.12.30.tar.gz
/shotcut-26.1.16.tar.gz
/shotcut-26.1.30.tar.gz
/shotcut-26.2.16.tar.gz
/shotcut-26.2.26.tar.gz
/shotcut-26.4.6.tar.gz
/shotcut-26.4.29.tar.gz
/shotcut-26.4.30.tar.gz
/shotcut-26.6.1.tar.gz
/shotcut-26.6.25.tar.gz
/shotcut-26.7.15.tar.gz
/shotcut-26.7.16.tar.gz
/shotcut-26.8.1.tar.gz
/shotcut-26.9.6.tar.gz

View file

@ -1,20 +0,0 @@
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into:
- fedora-all
- job: koji_build
trigger: commit
allowed_pr_authors:
- all_admins
- packit
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-all

View file

@ -1,3 +0,0 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.14.0.post1.dev2+g6506c7467.

View file

@ -1,15 +0,0 @@
--- src/sharedframe.cpp.orig 2025-12-31 13:03:06.157962326 +0100
+++ src/sharedframe.cpp 2025-12-31 13:04:02.205848995 +0100
@@ -19,6 +19,12 @@
#include <mutex>
+// --- MLT 7.32 Compatibility Patch ---
+#ifndef mlt_image_rgba64
+#define mlt_image_rgba64 mlt_image_rgba
+#endif
+// --- End MLT 7.32 Compatibility Patch ---
+
void destroyFrame(void *p)
{
delete static_cast<Mlt::Frame *>(p);

View file

@ -3,8 +3,8 @@
%global __requires_exclude ^libCuteLogger\\.so
Name: shotcut
Version: 26.9.6
Release: 1%{?dist}
Version: 24.10.13
Release: 3%{dist}
Summary: A free, open source, cross-platform video editor
# Main code is GPLv3+
License: GPL-3.0-or-later AND LGPL-2.1-only AND Apache-2.0 AND MIT
@ -68,17 +68,14 @@ BuildRequires: pkgconfig(Qt6QuickControls2)
BuildRequires: pkgconfig(Qt6WebSockets)
BuildRequires: pkgconfig(Qt6Xml)
BuildRequires: pkgconfig(Qt6Linguist)
BuildRequires: qt6-qtbase-private-devel
BuildRequires: pkgconfig(mlt++-7) >= 7.36.0
BuildRequires: pkgconfig(mlt-framework-7) >= 7.36.0
BuildRequires: pkgconfig(mlt++-7) >= 7.6.0
BuildRequires: pkgconfig(mlt-framework-7) >= 7.6.0
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: webvfx-devel
BuildRequires: fftw-devel
%if %{undefined flatpak}
Requires: gstreamer1-plugins-bad-free-extras
Requires: frei0r-plugins
%endif
Requires: qt6-qt5compat
Requires: ladspa
Requires: lame
@ -126,31 +123,28 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%lang_subpkg da Danish
%lang_subpkg de German
%lang_subpkg el Greek
%lang_subpkg en_GB %{quote:(Great Britain)}
%lang_subpkg en_GB "(Great Britain)"
%lang_subpkg en English
%lang_subpkg es Spanish
%lang_subpkg et Estonian
%lang_subpkg eu Euskara
%lang_subpkg fi Finnish
%lang_subpkg fr_CA %{quote:(Canadian French)}
%lang_subpkg fr French
%lang_subpkg ga %{quote:(Irish Gaeilge)}
%lang_subpkg gd %{quote:(Scottish Gaelic)}
%lang_subpkg gd "(Scottish Gaelic)"
%lang_subpkg gl Galician
%lang_subpkg he_IL Hebrew
%lang_subpkg hu Hungarian
%lang_subpkg it Italian
%lang_subpkg ja Japanese
%lang_subpkg ko Korean
%lang_subpkg lt Lithuanian
%lang_subpkg nb Norwegian
%lang_subpkg ne Nepali
%lang_subpkg nl Dutch
%lang_subpkg nn Norwegian
%lang_subpkg oc Occitan
%lang_subpkg pl Polish
%lang_subpkg pt_BR %{quote:(Portuguese (Brazil))}
%lang_subpkg pt_PT %{quote:(Portuguese (Portugal))}
%lang_subpkg pt_BR "Portuguese (Brazil)"
%lang_subpkg pt_PT "Portuguese (Portugal)"
%lang_subpkg ro Romanian
%lang_subpkg ru Russian
%lang_subpkg sk Slovakian
@ -159,17 +153,14 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%lang_subpkg th Thai
%lang_subpkg tr Turkish
%lang_subpkg uk Ukrainian
%lang_subpkg zh_CN %{quote:(Chinese (S))}
%lang_subpkg zh_TW %{quote:(Chinese (T))}
%lang_subpkg zh-Hans %{quote:(Chinese (Simplified))}
%lang_subpkg zh_CN "Chinese (S)"
%lang_subpkg zh_TW "Chinese (T)"
%prep
%autosetup -p0
# Postmortem debugging tools for MinGW.
rm -rf drmingw
# remove due MLT 7
sed -i 's/^\(\s*\)s\.set_consumer(\*saveConsumer);/\1\/\/ s.set_consumer(*saveConsumer); \/\/ remove due MLT 7/' src/mltcontroller.cpp
%build
%set_build_flags
@ -218,7 +209,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
mv %{buildroot}%{_libdir}/libCuteLogger.so %{buildroot}%{_libdir}/%{name}/
# Remove duplicate files and create hardlinks
hardlink -v %{buildroot}%{_datadir}/shotcut/qml/filters
hardlink -v %{buildroot}/usr/share/shotcut/qml/filters
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{org_name_shotcut}.desktop
@ -243,161 +234,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{org_name_sh
%doc doc
%changelog
* Mon Sep 07 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.9.6-1
- Update to version 26.9.6
- Add Chinese (Simplified) language
* Mon Aug 03 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.8.1-1
- Update to version 26.8.1
* Fri Jul 17 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.7.16-1
- Update to version 26.7.16
* Thu Jul 16 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.7.15-1
- Update to version 26.7.15
* Fri Jul 03 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.6.25-1
- Update to version 26.6.25
* Tue Jun 02 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.6.1-1
- Update to version 26.6.1
- Add qt6-qtbase-private-devel
* Thu May 14 2026 Jan Grulich <jgrulich@redhat.com> - 26.4.30-3
- Rebuild (qt6)
* Tue May 12 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.4.30-2
- Use %%{quote:(Great Britain)} in langpack macros to handle whitespace correctly
* Fri May 01 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.4.30-1
- Update to version 26.4.30
* Thu Apr 30 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.4.29-1
- Update to version 26.4.29
* Fri Apr 17 2026 Jan Grulich <jgrulich@redhat.com> - 26.4.6-2
- Rebuild (qt6)
* Tue Apr 07 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.4.6-1
- Update to version 26.4.6
* Fri Feb 27 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.2.26-1
- Update to version 26.2.26
* Tue Feb 10 2026 Martin Gansser <martinkg@fedoraproject.org> - 26.1.30-1
- Update to version 26.1.30
* Thu Jan 29 2026 Martin Gansser <martinkg@fedoraproject.org> - 25.12.30-3
- Rebuild for rawhide
* Wed Dec 31 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.12.30-2
- Add Canadian French and Lithuanian language subpackage
* Wed Dec 31 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.12.30-1
- Update to version 25.12.30
- Add sharedframe_mlt32_fix.diff
* Wed Dec 03 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.12.2-1
- Update to version 25.12.2
* Sat Nov 01 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.10.31-1
- Update to version 25.10.31
* Fri Oct 31 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.10.30-1
- Update to version 25.10.30
* Thu Oct 30 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.10.29-1
- Update to version 25.10.29
* Thu Oct 30 2025 Jan Grulich <jgrulich@redhat.com> - 25.10.9-2
- Rebuild (qt6)
* Fri Oct 10 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.10.9-1
- Update to version 25.10.9
* Thu Oct 02 2025 Jan Grulich <jgrulich@redhat.com> - 25.07.31-3
- Rebuild (qt6)
* Sat Aug 16 2025 Packit <hello@packit.dev> - 25.08.16-1
- Update to version 25.08.16
- Resolves: rhbz#2389010
* Fri Aug 08 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 25.07.31-2
- Fix flatpak build
* Sat Aug 02 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.31-1
- Update to version 25.07.31
* Sun Jul 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.26-1
- Update to version 25.07.26
* Sat Jul 26 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.25-1
- Update to version 25.07.25
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 25.07.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jul 17 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.16-1
- Update to version 25.07.16
* Tue Jul 08 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.07-1
- Update to version 25.07.07
* Mon Jul 07 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.07.06-1
- Update to version 25.07.06
* Mon May 12 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.05.11-1
- Update to version 25.05.11
* Fri Apr 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.04.25-1
- Update to version 25.04.25
* Mon Apr 14 2025 Jan Grulich <jgrulich@redhat.com> - 25.03.29-3
- Rebuild (qt6)
* Tue Apr 01 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.03.29-2
- Add "Irish Gaeilge" language
* Sat Mar 29 2025 Packit <hello@packit.dev> - 25.03.29-1
- Update to version 25.03.29
- Resolves: rhbz#2355968
* Tue Mar 25 2025 Jan Grulich <jgrulich@redhat.com> - 25.03.13-2
- Rebuild (qt6)
* Thu Mar 13 2025 Packit <hello@packit.dev> - 25.03.13-1
- Update to version 25.03.13
- Resolves: rhbz#2352413
* Wed Mar 12 2025 Packit <hello@packit.dev> - 25.03.12-1
- Update to version 25.03.12
- Resolves: rhbz#2351742
* Sat Jan 25 2025 Packit <hello@packit.dev> - 25.01.25-1
- Update to version 25.01.25
- Resolves: rhbz#2342087
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 25.01.05-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jan 07 2025 Jan Grulich <jgrulich@redhat.com> - 25.01.05-2
- Rebuild (qt6)
* Mon Jan 06 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.01.05-1
- Update to 25.01.05
* Sat Jan 04 2025 Martin Gansser <martinkg@fedoraproject.org> - 25.01.03-1
- Update to 25.01.03
* Mon Nov 18 2024 Martin Gansser <martinkg@fedoraproject.org> - 24.11.17-1
- Update to 24.11.17
* Wed Oct 30 2024 Jan Grulich <jgrulich@redhat.com> - 24.10.28-2
- Rebuild (qt6)
* Tue Oct 29 2024 Martin Gansser <martinkg@fedoraproject.org> - 24.10.28-1
- Update to 24.10.28
* Thu Oct 17 2024 Martin Gansser <martinkg@fedoraproject.org> - 24.10.13-3
- Add Euskara language

View file

@ -1 +1 @@
SHA512 (shotcut-26.9.6.tar.gz) = c72a6f5988252c9d062406d44febbea23cae832b17546f444a4d085e10fc8afe7925b8eadf7fb88c7db9d5f1239b88b7bc7f36f6813a70bc34a5a5f2b5141a73
SHA512 (shotcut-24.10.13.tar.gz) = 55893492b9e0003f57cc1cd372404ad8da91b7ac8ad244ccc962b9c4d3c797a07e38d6a62488e2793a3c86a340ec704600c5a49206dd16992f6ceffbc23462f4