[ffmpeg] Update to 4.1.2 release
by Leigh Scott
commit 8f136768106bf8ecc86839a634ea44e23b8f5d87
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Mar 23 07:12:35 2019 +0000
Update to 4.1.2 release
ffmpeg.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f27f0fa..617429b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -81,8 +81,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.1.1
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.1.2
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -420,6 +420,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat Mar 23 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.2-1
+- Update to 4.1.2 release
+
* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 4.1.1-4
- Mass rebuild for x264
diff --git a/sources b/sources
index a5e2a63..4324bb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-720fc84617a2c38aeae79aff3689a567 ffmpeg-4.1.1.tar.xz
+8f7f0a6c5d81ff20d9d65d000a6b419d ffmpeg-4.1.2.tar.xz
5 years, 1 month
[libopenshot] Clean up spec file
by Frank R Dana
commit d058bab1b5ade0af60645cfa48df700c31450ba1
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Mar 23 02:11:18 2019 -0400
Clean up spec file
A git conflict marker snuck into the changelog section at some point.
libopenshot.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 049e3be..dd45462 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -216,6 +216,5 @@ sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags} -Wl,--as-needed|
* Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.3-2
- Rebuilt for FFmpeg 2.4.x
->>>>>>> master
* Tue Jul 15 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.0.3-1
- Initial packaging.
5 years, 1 month
[libopenshot-audio/f28: 3/3] Merge branch 'master' into f28
by Frank R Dana
commit 8b24156929787aa4aba2bf47fe26b76f06355beb
Merge: 6466e7d 1e7a814
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Fri Mar 22 23:36:59 2019 -0400
Merge branch 'master' into f28
.gitignore | 1 +
libopenshot-audio.spec | 17 +++++++++++------
sources | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
---
5 years, 1 month
