[kdenlive] git rm rttr.CMakeLists.txt
by Sérgio M. Basto
commit 11c00972cb94d5b5e10c57393625924f2bc17e58
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 12 11:25:48 2021 +0000
git rm rttr.CMakeLists.txt
kdenlive.spec | 6 ++++--
rttr.CMakeLists.patch | 11 -----------
2 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 1a98d1c..902c58e 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -4,7 +4,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 20.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -16,7 +16,6 @@ URL: http://www.kdenlive.org
%endif
Source0: https://download.kde.org/%{stable}/release-service/%{version}/src/kdenliv...
Source100: kdenlive-find-lang.sh
-Patch0: rttr.CMakeLists.patch
# Add support for finding html files with find-lang.sh --with-html on epel
# https://github.com/rpm-software-management/rpm/commit/0c42871ff407a3eeb1e...
@@ -162,6 +161,9 @@ fi
%changelog
+* Fri Mar 12 2021 Sérgio Basto <sergio(a)serjux.com> - 20.12.3-2
+- git rm rttr.CMakeLists.txt
+
* Mon Mar 08 2021 Sérgio Basto <sergio(a)serjux.com> - 20.12.3-1
- Update kdenlive to 20.12.3
- Use rttr package
3 years, 8 months
[ffmpeg] Update to 20210312git5136726
by Leigh Scott
commit ee2525b6062705cfb8456ef3b5b892f6c00196b7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 12 09:00:48 2021 +0000
Update to 20210312git5136726
.gitignore | 1 +
ffmpeg.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ceb286c..1d5909b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ ffmpeg-*.rpm
/ffmpeg-20201231.tar.bz2
/ffmpeg-20210125.tar.bz2
/ffmpeg-20210218.tar.bz2
+/ffmpeg-20210312.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7bb5a2a..349cc2d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,8 +1,8 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20210218
-%global commit c2bf1dcace8d331e672b955f9cf5b59211749f00
+%global date 20210312
+%global commit 51367267c8a9f1a840f5e810f8c788e6e03712a5
%global rel %(c=%{commit}; echo ${c:0:7})
%ifarch %{ix86}
@@ -110,7 +110,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.4
-Release: 0.4%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 0.5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -476,6 +476,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Fri Mar 12 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.4-0.5.20210312git5136726
+- Update to 20210312git5136726
+
* Thu Feb 18 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.4-0.4.20210218gitc2bf1dc
- Update to 20210218gitc2bf1dc
diff --git a/sources b/sources
index 997f79e..8b308ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20210218.tar.bz2) = 8a2380787d968cbb5c061dc1720b27eedf4ef571259152ab7bf6a622ba5492615ae85b39b3dd1350af4b8474d48b1222f7830a2dff18e9b3ca89499699f5a7a1
+SHA512 (ffmpeg-20210312.tar.bz2) = b13d43eb465d87944a7c7c335c046e1ee64993193a82eaf22abd0608df20c4f09c6a63a8dc69034e8990567958c195d4abd1e83ec16d87287296d840cec10b98
3 years, 8 months
[avidemux] Resolve name clash between H264 and HEVC encoders (rfbz#5949)
by Leigh Scott
commit 86541b71285b54c676fb30fe8ccc20597a44463c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Mar 10 07:31:01 2021 +0000
Resolve name clash between H264 and HEVC encoders (rfbz#5949)
avidemux.spec | 6 +++++-
fix_encoder_name.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index fc94dd2..7a780f5 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -10,7 +10,7 @@
Name: avidemux
Version: 2.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -18,6 +18,7 @@ URL: http://www.avidemux.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Patch0: https://github.com/mean00/avidemux2/commit/991bd96c4b729e62300caf87ff343b...
+Patch1: https://github.com/mean00/avidemux2/commit/d7ecad79c55e6c21d6462bc69d2d04...
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
@@ -312,6 +313,9 @@ fi
%changelog
+* Wed Mar 10 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.7.8-3
+- Resolve name clash between H264 and HEVC encoders (rfbz#5949)
+
* Mon Mar 08 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.7.8-2
- Ensure text margins in current time display are zero (rfbz#5948)
diff --git a/fix_encoder_name.patch b/fix_encoder_name.patch
new file mode 100644
index 0000000..10be20b
--- /dev/null
+++ b/fix_encoder_name.patch
@@ -0,0 +1,32 @@
+From d7ecad79c55e6c21d6462bc69d2d0491efe3c184 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Tue, 9 Mar 2021 21:55:47 +0100
+Subject: [PATCH] [ffNvEnc] Resolve name clash between H264 and HEVC encoders
+ created by 284b2afd7b5
+
+---
+ avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp b/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp
+index 3c83bfbf3..d2a1b9c03 100644
+--- a/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp
++++ b/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp
+@@ -79,7 +79,7 @@ extern "C"
+
+ ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffNvEncEncoder);
+ #ifdef H265_ENCODER
+-ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc",
++ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEncHEVC",
+ "Nvidia HEVC",
+ "Nvidia hw encoder",
+ ffNvEncConfigure, // configuration
+@@ -90,7 +90,7 @@ ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc",
+ nvEncProbe
+ );
+ #else
+-ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc",
++ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEncH264",
+ "Nvidia H264",
+ "Nvidia hw encoder",
+ ffNvEncConfigure, // configuration
3 years, 8 months
