diff --git a/0001-mf-tests-remove-static-keyword-from-actual_width-and.patch b/0001-mf-tests-remove-static-keyword-from-actual_width-and.patch new file mode 100644 index 0000000..6f351ad --- /dev/null +++ b/0001-mf-tests-remove-static-keyword-from-actual_width-and.patch @@ -0,0 +1,71 @@ +From 1f44da836f461472ca7ad4e7fb0732f6cdb8d2e7 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Mon, 1 Jul 2024 13:43:48 +0200 +Subject: [PATCH] mf/tests: remove static keyword from actual_width and height + +Signed-off-by: Marcus Meissner +--- + dlls/mf/tests/transform.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c +index deec2c7dd92..67fb761c527 100644 +--- a/dlls/mf/tests/transform.c ++++ b/dlls/mf/tests/transform.c +@@ -3818,7 +3818,7 @@ static IMFSample *next_h264_sample_(int line, const BYTE **h264_buf, ULONG *h264 + + static void test_h264_encoder(void) + { +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const GUID *const class_id = &CLSID_MSH264EncoderMFT; + const struct transform_info expect_mft_info = + { +@@ -4178,7 +4178,7 @@ static void test_h264_decoder(void) + {0}, + }; + static const MFVideoArea actual_aperture = {.Area={82,84}}; +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const media_type_desc actual_outputs[] = + { + { +@@ -5385,7 +5385,7 @@ static void test_wmv_encoder(void) + }, + }; + +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), +@@ -5700,7 +5700,7 @@ static void test_wmv_decoder(void) + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_VC1S)}, + }; + static const MFVideoArea actual_aperture = {.Area={96,96}}; +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const struct attribute_desc expect_output_attributes[] = + { + ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, sizeof(actual_aperture)), +@@ -7053,7 +7053,7 @@ static void test_color_convert(void) + }; + + static const MFVideoArea actual_aperture = {.Area={82,84}}; +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), +@@ -7457,7 +7457,7 @@ static void test_video_processor(void) + }; + + static const MFVideoArea actual_aperture = {.Area={82,84}}; +- static const DWORD actual_width = 96, actual_height = 96; ++ const DWORD actual_width = 96, actual_height = 96; + const struct attribute_desc rgb32_with_aperture[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), +-- +2.45.2 + diff --git a/wine.spec b/wine.spec index e30bc93..ce8fb37 100644 --- a/wine.spec +++ b/wine.spec @@ -176,7 +176,7 @@ Source7: baselibs.conf Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here -Patch0: 0001-mf-tests-help-older-compilers-by-using-defines.patch +Patch0: 0001-mf-tests-remove-static-keyword-from-actual_width-and.patch Recommends: wine-gecko >= 2.47.4 Conflicts: wine-gecko < 2.47.4 Recommends: wine-mono >= 9.2.0