fix build on EPEL8

version_no_tilde macro is missing on EPEL8

0001-Add-CET-enabling-note.patch

@@ -1,66 +0,0 @@
-From 6c324911dbea8edc675a2d47124941f3267a6022 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Tue, 3 Feb 2026 17:18:08 +0100
-Subject: [PATCH] Add CET enabling note
-
-The assembly code compiled by nasm is missing a .note.gnu.property
-section to indicate CET support.
-
-This is documented at https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- src/nasm.inc | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/nasm.inc b/src/nasm.inc
-index 31b18090ada8..a24ecbe51aa6 100644
---- a/src/nasm.inc
-+++ b/src/nasm.inc
-@@ -23,6 +23,25 @@
- ; *
- ; ***************************************************************************/
- 
-+%macro GNUHEADER 0
-+	.section	.note.gnu.property,"a"
-+	.align 8
-+	.long	 1f - 0f
-+	.long	 4f - 1f
-+	.long	 5
-+0:
-+	.string	 "GNU"
-+1:
-+	.align 8
-+	.long	 0xc0000002
-+	.long	 3f - 2f
-+2:
-+	.long	 0x3
-+3:
-+	.align 8
-+4:
-+%endmacro
-+
- %ifdef ARCH_IS_X86_64
- 
- BITS 64
-@@ -62,6 +81,8 @@ DEFAULT REL
- 
- %else ; Linux
- 
-+%define GNUHEADER
-+
- %define prm1 rdi
- %define prm2 rsi
- %define prm3 rdx
-@@ -111,6 +132,8 @@ DEFAULT REL
- 
- %else
- 
-+%define GNUHEADER
-+
- %define SECTION_ALIGN 16
- 
- BITS 32
--- 
-2.52.0
-

xvidcore-c23.patch

@@ -1,13 +0,0 @@
-diff -up xvidcore/src/encoder.h.c23 xvidcore/src/encoder.h
---- xvidcore/src/encoder.h.c23	2019-12-28 15:19:24.000000000 +0100
-+++ xvidcore/src/encoder.h	2025-01-29 12:22:35.863665766 +0100
-@@ -42,7 +42,9 @@
-  * Types
-  ****************************************************************************/
- 
-+#if __STDC_VERSION__ < 202311L
- typedef int bool;
-+#endif
- 
- /*****************************************************************************
-  * Structures

xvidcore.spec

@@ -2,19 +2,15 @@
 
 Name:           xvidcore
 Version:        1.3.7
-Release:        20%{?dist}
+Release:        9%{?dist}
 Summary:        MPEG-4 Simple and Advanced Simple Profile codec
 License:        GPL-2.0-or-later
 URL:            https://www.xvid.com/
-Source0:        https://downloads.xvid.com/downloads/%{name}-%{version_no_tilde}.tar.bz2
-# fix build with -std=gnu23, reported upstream
-Patch0:         %{name}-c23.patch
-Patch1:         0001-Add-CET-enabling-note.patch
+Source0:        https://downloads.xvid.com/downloads/%{name}-%{version}.tar.bz2
 
 BuildRequires:  gcc
 BuildRequires:  make
-# Drop ASM on i686, produces texrel
-%ifarch x86_64
+%ifarch %{ix86} x86_64
 BuildRequires:  nasm >= 2.0
 %endif
 
@@ -58,13 +54,8 @@ done
 
 %build
 cd build/generic
-%configure \
-%ifarch %{ix86}
-  --disable-assembly
-%endif
-
-# Our LDFLAGS are overriden by the makefiles - fixes build with f44 rhbz#2435201
-%make_build LDFLAGS+="%{?build_ldflags}"
+%configure
+%make_build
 
 
 %install
@@ -72,6 +63,9 @@ cd build/generic
 find %{buildroot} -name "*.a" -delete
 
 
+%ldconfig_scriptlets
+
+
 %files
 %doc README AUTHORS ChangeLog
 %license LICENSE
@@ -84,40 +78,6 @@ find %{buildroot} -name "*.a" -delete
 
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Feb 03 2026 Nicolas Chauvet <kwizart@gmail.com> - 1.3.7-19
-- Drop ASM on i686 as it produces TEXTREL
-
-* Tue Feb 03 2026 Nicolas Chauvet <kwizart@gmail.com> - 1.3.7-18
-- Revert mmx code drop
-
-* Tue Feb 03 2026 Nicolas Chauvet <kwizart@gmail.com> - 1.3.7-17
-- Fixup build with LDFLAGS
-
-* Thu Jan 29 2026 Nicolas Chauvet <kwizart@gmail.com> - 1.3.7-16
-- Fix build with f44 rhbz#2435201
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-- Fix build with GCC15 (Dominik Mierzejewski)
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Tue Jan 24 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.3.7-9
 - Adapt for Fedora