rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1125

Browse Source
This commit is contained in:
Marcus Meissner 2024-07-01 11:49:55 +00:00 committed by Git OBS Bridge
parent d47e3e24da
commit 58ea70734b
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
0001-mf-tests-remove-static-keyword-from-actual_width-and.patch Normal file
View File

@ -0,0 +1,71 @@
From 1f44da836f461472ca7ad4e7fb0732f6cdb8d2e7 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
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 <marcus@jet.franken.de>
---
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

2
wine.spec
View File

@ -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