[xvidcore] fix crash in check_cpu_features (rfbz#5141), patch by Peter Ross

commit ad1526fcdfe60855478007a2ada04d6421f3b061 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Thu Jan 17 11:23:53 2019 +0100 fix crash in check_cpu_features (rfbz#5141), patch by Peter Ross add missing BR: gcc xvidcore-check_cpu_features-crash.patch | 27 +++++++++++++++++++++++++++ xvidcore.spec | 10 ++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) --- diff --git a/xvidcore-check_cpu_features-crash.patch b/xvidcore-check_cpu_features-crash.patch new file mode 100644 index 0000000..86bf306 --- /dev/null +++ b/xvidcore-check_cpu_features-crash.patch @@ -0,0 +1,27 @@ +[PATCH] alway use .text for machine +--- + src/nasm.inc | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/nasm.inc b/src/nasm.inc +index e5181c9..f79efe6 100644 +--- a/src/nasm.inc ++++ b/src/nasm.inc +@@ -175,15 +175,7 @@ BITS 32 + %endmacro + + %macro TEXT 0 +-%ifidn __OUTPUT_FORMAT__,macho32 + SECTION .text align=SECTION_ALIGN +-%else +-%ifidn __OUTPUT_FORMAT__,macho64 +- SECTION .text align=SECTION_ALIGN +-%else +- SECTION .rotext align=SECTION_ALIGN +-%endif +-%endif + %endmacro + + %macro cglobal 1 +-- +2.17.1 diff --git a/xvidcore.spec b/xvidcore.spec index cf52fbc..a6ef801 100644 --- a/xvidcore.spec +++ b/xvidcore.spec @@ -2,12 +2,14 @@ Name: xvidcore Version: 1.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MPEG-4 Simple and Advanced Simple Profile codec License: GPLv2+ URL: http://www.xvid.org/ Source0: http://downloads.xvid.org/downloads/%{name}-%{version}%{?pre}.tar.bz2 +Patch0: xvidcore-check_cpu_features-crash.patch +BuildRequires: gcc %ifarch %{ix86} x86_64 BuildRequires: nasm >= 2.0 %endif @@ -31,7 +33,7 @@ documentation for the Xvid video codec. %prep -%autosetup -n %{name} +%autosetup -p1 -n %{name} chmod -x examples/*.pl # Convert to utf-8 for file in AUTHORS ChangeLog; do @@ -76,6 +78,10 @@ find %{buildroot} -name "*.a" -delete %changelog +* Thu Jan 17 2019 Dominik Mierzejewski <rpm at greysector.net> - 1.3.5-4 +- fix crash in check_cpu_features (rfbz#5141), patch by Peter Ross +- add missing BR: gcc + * Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.3.5-3 - Rebuilt for Fedora 29 Mass Rebuild binutils issue