Compare commits

..

18 commits

Author SHA1 Message Date
Fedora Release Engineering
bb6656f2ef Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:29:48 +00:00
Nicolas Chauvet
5318159e87 Disable ASM on i686 and Add CET 2026-02-03 18:53:48 +01:00
Nicolas Chauvet
71d6fca446 Add Patch for CET 2026-02-03 18:53:31 +01:00
Nicolas Chauvet
386823c5d1 Revert MMX code drop 2026-02-03 16:57:22 +01:00
Nicolas Chauvet
78565d7693 Revert "Fix build with i686 by dropping mmx"
This reverts commit eaf4513af9.
2026-02-03 16:56:30 +01:00
Nicolas Chauvet
4094f4e734 Update changelog 2026-02-03 14:37:25 +01:00
Nicolas Chauvet
f4fa414c53 Fixup build with LDFLAGS 2026-02-03 14:36:53 +01:00
Nicolas Chauvet
700a2333e2 Update X86_LDFLAGS - workaround for rhbz#2436257 2026-02-03 10:13:33 +01:00
Nicolas Chauvet
eaf4513af9 Fix build with i686 by dropping mmx 2026-01-30 00:50:04 +01:00
Nicolas Chauvet
0675b8e69e Fix build with f44 rhbz#2435201 2026-01-30 00:23:56 +01:00
Fedora Release Engineering
62b75ca4f2 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:57:13 +00:00
Fedora Release Engineering
1b4a40516b Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:07:44 +00:00
Dominik 'Rathann' Mierzejewski
95382dbe52 Fix build with GCC15 2025-01-29 12:39:37 +01:00
Dominik 'Rathann' Mierzejewski
7ad1c09750 drop obsolete ldconfig_scriptlets macro 2025-01-29 12:27:46 +01:00
Fedora Release Engineering
ab47a1814a Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:24:30 +00:00
Fedora Release Engineering
61befe2d98 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:33:33 +00:00
Fedora Release Engineering
51e912f9d4 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 10:29:01 +00:00
Fedora Release Engineering
ed80817f8c Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 19:22:54 +00:00
3 changed files with 127 additions and 8 deletions

View file

@ -0,0 +1,66 @@
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

13
xvidcore-c23.patch Normal file
View file

@ -0,0 +1,13 @@
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

View file

@ -2,15 +2,19 @@
Name: xvidcore
Version: 1.3.7
Release: 9%{?dist}
Release: 20%{?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}.tar.bz2
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
BuildRequires: gcc
BuildRequires: make
%ifarch %{ix86} x86_64
# Drop ASM on i686, produces texrel
%ifarch x86_64
BuildRequires: nasm >= 2.0
%endif
@ -54,8 +58,13 @@ done
%build
cd build/generic
%configure
%make_build
%configure \
%ifarch %{ix86}
--disable-assembly
%endif
# Our LDFLAGS are overriden by the makefiles - fixes build with f44 rhbz#2435201
%make_build LDFLAGS+="%{?build_ldflags}"
%install
@ -63,9 +72,6 @@ cd build/generic
find %{buildroot} -name "*.a" -delete
%ldconfig_scriptlets
%files
%doc README AUTHORS ChangeLog
%license LICENSE
@ -78,6 +84,40 @@ 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