From 5da5c4d9fa8b85d8cd63201869abb8be25c72f3a Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 16 May 2022 19:21:34 +0430 Subject: [PATCH] Ports: Update ffmpeg's patches to use git patches --- ...pp.patch => 0001-Assume-that-EDOM-exists.patch} | 14 ++++++++++++++ Ports/ffmpeg/patches/ReadMe.md | 12 ++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) rename Ports/ffmpeg/patches/{errno-is-not-valid-during-cpp.patch => 0001-Assume-that-EDOM-exists.patch} (53%) diff --git a/Ports/ffmpeg/patches/errno-is-not-valid-during-cpp.patch b/Ports/ffmpeg/patches/0001-Assume-that-EDOM-exists.patch similarity index 53% rename from Ports/ffmpeg/patches/errno-is-not-valid-during-cpp.patch rename to Ports/ffmpeg/patches/0001-Assume-that-EDOM-exists.patch index b66b2735b1..f0ccaea6b6 100644 --- a/Ports/ffmpeg/patches/errno-is-not-valid-during-cpp.patch +++ b/Ports/ffmpeg/patches/0001-Assume-that-EDOM-exists.patch @@ -1,3 +1,14 @@ +From d64d7a469a8524d2ea8121d10844ff73feef3b55 Mon Sep 17 00:00:00 2001 +From: Peter Ross +Date: Tue, 1 Mar 2022 19:50:19 +1100 +Subject: [PATCH] Assume that EDOM exists + +Since errno values are not numeric constants on serenity, this won't +work in cpp, assume that it exists. +--- + libavutil/error.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/libavutil/error.h b/libavutil/error.h index 0d3269a..a54d80d 100644 --- a/libavutil/error.h @@ -11,3 +22,6 @@ index 0d3269a..a54d80d 100644 #define AVERROR(e) (-(e)) ///< Returns a negative error code from a POSIX error code, to return from library functions. #define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value. #else +-- +2.36.1 + diff --git a/Ports/ffmpeg/patches/ReadMe.md b/Ports/ffmpeg/patches/ReadMe.md index 986ba7920a..235a7251f2 100644 --- a/Ports/ffmpeg/patches/ReadMe.md +++ b/Ports/ffmpeg/patches/ReadMe.md @@ -1,9 +1,9 @@ -# Patches for FFmpeg on SerenityOS +# Patches for ffmpeg on SerenityOS -## `errno-is-not-valid-during-cpp.patch` +## `0001-Assume-that-EDOM-exists.patch` -FFmpeg performs a preprocessor-time test on errno values. This test does -not work on SerenityOS because our errno values are described by an -enum, and therefore are only available at compile time. +Assume that EDOM exists + +Since errno values are not numeric constants on serenity, this won't +work in cpp, assume that it exists. -The patch removes the preprocessor-time test.