[vlc-devel] [vlc-commits] contrib: d3d9: get more wine

[Hugo Beauzée-Luyssen]

On Fri, Jan 4, 2019, at 3:53 PM, Thomas Guillem wrote:
> vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jan  4 
> 14:18:36 2019 +0100| [df4c252d3ef2a7531cf137398f3ec4306eb91123] | 
> committer: Thomas Guillem
> 
> contrib: d3d9: get more wine
> 
> On Debian Buster, the idl include path is located on /usr/include/wine/wine/
> 
> This fixes the "Unable to open include file unknwn.idl" error.
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df4c252d3ef2a7531cf137398f3ec4306eb91123
> ---
> 
>  contrib/src/d3d9/rules.mak | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/contrib/src/d3d9/rules.mak b/contrib/src/d3d9/rules.mak
> index 65d762ce29..b3b3b61aea 100644
> --- a/contrib/src/d3d9/rules.mak
> +++ b/contrib/src/d3d9/rules.mak
> @@ -1,7 +1,7 @@
>  # generate Direct3D9 temporary include
>  
>  ifdef HAVE_CROSS_COMPILE
> -IDL_INC_PATH = -I/usr/include/wine/windows/
> +IDL_INC_PATH = -I/usr/include/wine/windows/ -I/usr/include/wine/wine/windows/
>  else
>  #ugly way to get the default location of standard idl files
>  IDL_INC_PATH = -I/`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include
> 

Any objection against backporting this patch and the 3 others to 3.0?
Since both paths are provided it shouldn't hurt when building the contribs on stretch.

Regards,

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr