[x264] Update x264 to 0.152 and switch asm compiler from yasm to nasm
commit 1a885cdeb42a8cab1f40a107a7b08ed1183ffeb2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Dec 30 19:09:18 2017 +0000
Update x264 to 0.152 and switch asm compiler from yasm to nasm
.gitignore | 1 +
sources | 2 +-
x264.spec | 17 ++++++++++-------
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17e043b..5a9c195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ x264-0.148-20160118-5c65704.tar.bz2
/x264-0.148-20170121-97eaef2.tar.bz2
/x264-0.148-20170519-d32d7bf.tar.bz2
/x264-0.148-20170521-aaa9aa8.tar.bz2
+/x264-0.152-20171224-e9a5903.tar.bz2
diff --git a/sources b/sources
index 7123f7e..11f7a9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fcea0ce575c7955486bc4ae3867f62c x264-0.148-20170521-aaa9aa8.tar.bz2
+78e70a1a5d60d4f8562c49e9b8c7a07c x264-0.152-20171224-e9a5903.tar.bz2
diff --git a/x264.spec b/x264.spec
index 8534184..0aae91f 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.148-20170521-aaa9aa8.tar.bz2
-%global api 148
-%global gitdate 20170521
-%global gitversion aaa9aa8
+# globals for x264-0.152-20171224-e9a5903.tar.bz2
+%global api 152
+%global gitdate 20171224
+%global gitversion e9a5903
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
@@ -30,8 +30,8 @@
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.%{api}
-Release: 22%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Version: 0.152
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -51,7 +51,7 @@ Patch10: x264-gpac.patch
BuildRequires: execstack
%endif
%ifarch %{asmarch} %{simdarch}
-BuildRequires: yasm >= 1.0.0
+BuildRequires: nasm
%endif
# we need to enforce the exact EVR for an ISA - not only the same ABI
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -201,6 +201,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Sat Dec 30 2017 Sérgio Basto <sergio(a)serjux.com> - 0.152-1
+- Update x264 to 0.152 and switch asm compiler from yasm to nasm
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> -
0.148-22.20170521gitaaa9aa8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild