[vlc-devel] [PATCH] contrib: wine-headers: update to 5.1

[Steve Lhomme]

Hi,

Are you sure my patch has been applied in wine unmodified ?

When compiling I get the following error:
In file included from libavcodec/dxva2_internal.h:48:
/home/robux4/llvm-mingw-20190920-ubuntu-16.04/x86_64-w64-mingw32/include/dxva.h:15:13: 
error: redefinition of 'DXVA_NoEncrypt'
DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 
0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
             ^
/mnt/c/Users/robux/Documents/Programs/Videolabs/build/win64-pdb/contrib/x86_64-w64-mingw32/include/dxva2api.h:132:13: 
note: previous definition is here
DEFINE_GUID(DXVA_NoEncrypt,         0x1b81bed0, 0xa0c7,0x11d3, 
0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
             ^
1 error generated.

In my patch DXVA_NoEncrypt was removed from dxva2api.h because it 
doesn't belong there (there's DXVA2_NoEncrypt for that). In that version 
of wine it's still there and conflicts with the dxva.h of 
DXVA_NoEncrypt, which is the correct place for that definition.

So at least we should patch wine 5.1 to fix that.

On 2020-02-10 20:53, Biswapriyo Nath wrote:
> 
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>