[ffmpeg/f31: 2/2] Merge remote-tracking branch 'origin/f32' into f31
by Leigh Scott
commit c09171306276a95fe221e8ece81a19c3fce677d6
Merge: 814764a e18c069
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:39:43 2020 +0100
Merge remote-tracking branch 'origin/f32' into f31
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
3 years, 11 months
[ffmpeg/f32] Update changelog
by Leigh Scott
commit e18c069fadb32595be1d29118dd17fafb3ff6725
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:39:02 2020 +0100
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c8ea037..059d2d9 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -84,7 +84,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.3
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -429,6 +429,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat Jun 06 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.3-3
+- Enable libmodplug (rfbz#5670)
+
* Sat May 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.3-2
- Fix vmaf model path
3 years, 11 months
[ffmpeg] Update to 20200606git
by Leigh Scott
commit b440e8dd8a442f68ece649e8869622c1cf67254c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:32:09 2020 +0100
Update to 20200606git
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d579573..09ec616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ ffmpeg-*.rpm
/ffmpeg-20200523.tar.bz2
/ffmpeg-20200524.tar.bz2
/ffmpeg-20200531.tar.bz2
+/ffmpeg-20200606.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2105f60..b533033 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20200531
+%global date 20200606
#global rel rc1
# rav1e has a broken .pc file
@@ -94,7 +94,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3
-Release: 0.22.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.23.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -443,6 +443,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat Jun 06 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.23.20200606git
+- Update to 20200606git
+
* Sun May 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.22.20200531git
- Update to 20200531git
diff --git a/sources b/sources
index 7977e7a..5bab4bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20200531.tar.bz2) = f130b785e675956e225729275b19ad67fa86bb58c477c26638e76331b64dfa07c76598c8e95dc32a1c68be08dd47d1aad3d5a2dd3210ca14592f514fa0b20468
+SHA512 (ffmpeg-20200606.tar.bz2) = a463fbddea7f234b7ea888a2440fa2d013ae62551e86eb5c10382b8667f43c0c2998d969262b98df0f8c77d9808350e6eabc2e887c588336a6bd34c3e13095fb
3 years, 11 months
[ffmpeg/el7] Enable libmodplug
by Leigh Scott
commit 2143fc147d453a24bf33bd6de455668bcda4544b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:12:38 2020 +0100
Enable libmodplug
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6ef8ee4..e354aad 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -276,6 +276,7 @@ This package contains development files for %{name}
%{!?_without_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\
--enable-avresample \\\
+ --enable-libmodplug \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
3 years, 11 months
[ffmpeg/f31: 2/2] Merge remote-tracking branch 'origin/f32' into f31
by Leigh Scott
commit 814764a89bed2e88c7aa2072062609b0e64a2403
Merge: a5968fc 9cd3ee8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:15:08 2020 +0100
Merge remote-tracking branch 'origin/f32' into f31
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
3 years, 11 months
[ffmpeg/el8] Enable libmodplug
by Leigh Scott
Summary of changes:
9cd3ee8... Enable libmodplug (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[ffmpeg/f32] Enable libmodplug
by Leigh Scott
commit 9cd3ee87ed68f608db99cfa52c5813b416b3dd73
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:12:38 2020 +0100
Enable libmodplug
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5d97753..c8ea037 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -308,6 +308,7 @@ This package contains development files for %{name}
%{!?_without_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\
--enable-avresample \\\
+ --enable-libmodplug \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
3 years, 11 months
[ffmpeg] Enable libmodplug
by Leigh Scott
commit 70511aefad7448ba53a6884a8435cb70fac6982a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 6 12:12:38 2020 +0100
Enable libmodplug
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f665bc8..2105f60 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -322,6 +322,7 @@ This package contains development files for %{name}
%{!?_without_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\
--enable-avresample \\\
+ --enable-libmodplug \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
3 years, 11 months