[x264/f30: 7/7] Merge branch 'f29' into f30
commit ddf980a56bf490cc082cd2059bf52747f339276e
Merge: c8b97a7 c696e2a
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 10:00:13 2019 +0200
Merge branch 'f29' into f30
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --cc x264.spec
index 986f39e,bbeaabc..a66337c
--- a/x264.spec
+++ b/x264.spec
@@@ -31,7 -31,7 +31,7 @@@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
- Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
++Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@@ -207,25 -209,13 +207,28 @@@ install -pm644 generic/{AUTHORS,COPYING
%endif
%changelog
-* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> -
0.155-6.20180806git0a84d98
++* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> -
0.157-12.20190717git34c06d1
+ - don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
+
-* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-5.20180806git0a84d98
+* Mon Aug 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> -
0.157-11.20190717git34c06d1
+- Drop hack for arm builders
+
+* Tue Aug 06 2019 Leigh Scott <leigh123linux(a)gmail.com> -
0.157-10.20190717git34c06d1
+- Rebuild for new ffmpeg version
+
+* Wed Jul 17 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-9.20190717git34c06d1
+- 0.157 update, date 2019-07-17 (stable branch)
+
+* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-8.20190303git72db437
- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
-* Mon May 06 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-4.20180806git0a84d98
+* Wed May 01 2019 Leigh Scott <leigh123linux(a)gmail.com> -
0.157-7.20190303git72db437
+- Fix ARM rpm mangle issue
+
+* Tue Apr 30 2019 Sérgio Basto <sergio(a)serjux.com> -
0.157-6.20190303git72db437_bootstrap
+- Bootstrap to fix arm builds
+
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-5.20190303git72db437
- Enable opencl (which is default) only exist --disable-opencl option
- Disable opencl on 10bit seems that is just prepared for 8bit.
- Build /usr/bin/x264 with gpac shared lib instead static lib.