2:06 a.m.
commit 9f40a285526e0439bc91a6f0b48d135032d2aaaa
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jan 19 02:06:35 2025 +0000
Update git snapshot
.gitignore | 2 ++
avidemux-disable_mp4v2.patch | 36 ------------------------------------
avidemux.spec | 24 ++++++++++++------------
fix_incompatible_types.patch | 20 --------------------
sources | 4 ++--
5 files changed, 16 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc5fef2..36817d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ avidemux_2.6.10.tar.gz
/avidemux_i18n-b91c7f7c26577e5be005b094604f813058c31682.tar.gz
/avidemux-b74c1a154abc7cf5d65518d8d37afe1aeb1bd4fd.tar.gz
/avidemux_i18n-05a39a119e4cd0268b13fa4266a77a45cd38ccb2.tar.gz
+/avidemux-49b04e3d8887b1c5193ff9a9f7ee99b2284c2023.tar.gz
+/avidemux_i18n-4d2693414068eb60ed9eea5720d8fa916ac7ab1a.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index ad42c4b..5e1d81a 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,9 +1,9 @@
-%global commit b74c1a154abc7cf5d65518d8d37afe1aeb1bd4fd
-%global commitdate 20241122
+%global commit 49b04e3d8887b1c5193ff9a9f7ee99b2284c2023
+%global commitdate 20250119
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit0 05a39a119e4cd0268b13fa4266a77a45cd38ccb2
-%global commitdate0 20241118
+%global commit0 4d2693414068eb60ed9eea5720d8fa916ac7ab1a
+%global commitdate0 20250119
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
@@ -16,7 +16,7 @@
Name: avidemux
Version: 2.8.2
-Release: 5%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
+Release: 6%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -25,9 +25,6 @@ Source0:
https://github.com/mean00/avidemux2/archive/%{commit}/%{name}-%{
#Source0: http://downloads.sourceforge.net/%%{name}/%%{name}_%%{version}.tar.gz
Source1:
https://github.com/mean00/avidemux2_i18n/archive/%{commit0}/%{name}_i18n-...
-Patch0: avidemux-disable_mp4v2.patch
-Patch1: fix_incompatible_types.patch
-
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: x86_64
@@ -142,8 +139,8 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \
avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2
-sed -i -e 's@avidemux3_qt5@avidemux3_qt6@g'
avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
-
+sed -i -e 's@avidemux3_qt5@env QT_QPA_PLATFORM=xcb avidemux3_qt6@g' \
+ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
%build
export LDFLAGS="%{optflags} -lc -Wl,--as-needed"
@@ -237,8 +234,6 @@ popd
%make_install -C build_plugins_cli
%make_install -C build_plugins_qt6
-# Remove useless devel files
-rm -rf %{buildroot}%{_includedir}/%{name}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -260,6 +255,8 @@ appstream-util validate-relax --nonet \
%files
%doc AUTHORS README
+# Exclude useless devel files
+%exclude %{_includedir}/
%files libs -f build_plugins_common/install_manifest.txt
%license COPYING
@@ -300,6 +297,9 @@ appstream-util validate-relax --nonet \
%changelog
+* Sun Jan 19 2025 Leigh Scott <leigh123linux(a)gmail.com> -
2.8.2-6^git20250119.49b04e3
+- Update git snapshot
+
* Sat Nov 23 2024 Leigh Scott <leigh123linux(a)gmail.com> -
2.8.2-5^git20241122.b74c1a1
- Update snapshot to fix qt build issue
diff --git a/sources b/sources
index 9fb1355..de890e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (avidemux-b74c1a154abc7cf5d65518d8d37afe1aeb1bd4fd.tar.gz) =
a8307cd55c869909e5ffd4537090b6b47b1c56cff264ec566b023fc4a84569598194e2dc8a20f9e549b3efc8ea3e27a623daa6a18c1cd45428d757a34321f9b0
-SHA512 (avidemux_i18n-05a39a119e4cd0268b13fa4266a77a45cd38ccb2.tar.gz) =
637d045efeec4a29eb5e946327390352050d0330dcfe73e79bc423ca8b2d48d6341a4714ec204c435c447443d1eb6e8ec59d4b6ff77055da929b2688c6ed8bfc
+SHA512 (avidemux-49b04e3d8887b1c5193ff9a9f7ee99b2284c2023.tar.gz) =
0ced8ba73e5335a4d863abc466054df2cd684dbfb24c2ad858a13c267ce52eed94affecc69ba1bf5c4d29c3a0f9314fb8850131ab90620f38f1cecc8c3ac00b3
+SHA512 (avidemux_i18n-4d2693414068eb60ed9eea5720d8fa916ac7ab1a.tar.gz) =
d250581b45fd253e3348f235d456783d8220e64f6eae4a31447262eb39b3e45ef2dff1186a264a97a64c40430cfb8e03bbea82aa442f62ccae6a551a0bb17cc2