[vlc-devel] [PATCH] configure: remove unused WINE_SDK_PATH

[Steve Lhomme]

On 2020-11-27 14:56, Hugo Beauzée-Luyssen wrote:
> On Fri, Nov 27, 2020, at 1:50 PM, Steve Lhomme wrote:
>> The variable is not used and the path set in the CI doesn't even exist in the
>> Docker images.
>> ---
>>   configure.ac            | 1 -
>>   extras/ci/gitlab-ci.yml | 2 --
>>   2 files changed, 3 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index a0b153664c7..37a931a133a 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -4611,7 +4611,6 @@ AC_SUBST([MOC])
>>   AC_SUBST([RCC])
>>   AC_SUBST([UIC])
>>   AC_SUBST([WINDRES])
>> -AC_SUBST([WINE_SDK_PATH])
>>   AC_SUBST([LIBEXT])
>>   AC_SUBST([AM_CPPFLAGS])
>>   AC_SUBST([MACOSX_DEPLOYMENT_TARGET])
>> diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
>> index 463c4222c56..947c7cc413a 100644
>> --- a/extras/ci/gitlab-ci.yml
>> +++ b/extras/ci/gitlab-ci.yml
>> @@ -148,7 +148,6 @@ win64-llvm:
>>           name: $VLC_WIN_LLVM_IMAGE
>>       variables:
>>           <<: *variables-win64
>> -        WINE_SDK_PATH: /usr/include/wine/wine/windows/
>>   
>>   uwp64-libvlc-llvm:
>>       extends: .win-common
>> @@ -200,7 +199,6 @@ nightly-win64-llvm:
>>           name: $VLC_WIN_LLVM_IMAGE
>>       variables:
>>           <<: *variables-win64
>> -        WINE_SDK_PATH: /usr/include/wine/wine/windows/
>>   
>>   #
>>   # Debian
>> -- 
>> 2.29.2
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> 
> Hi,
> 
> It's used by npapi-vlc: https://code.videolan.org/videolan/npapi-vlc/-/blob/master/activex/Makefile.am#L100

It seems that the goal is to build stdole2.tlb, but this file is already 
part of mingw64. In the Docker images it's found at:
/opt/llvm-mingw/generic-w64-mingw32/include/stdole2.tlb

> However I missed that it was set in the ci file and added it as part of the windows docker images: https://code.videolan.org/videolan/docker-images/-/commit/9bfb81dcb9594047520863d119f1102256480b33
> 
> Given that the path changes depending on the distribution I think the dockerfile is a better location to set it

Indeed, although it's not necessary to set it when the value is the 
default one (it the one from libwine-dev which is 
/usr/include/wine/wine/windows) [1]. So yes, it can be removed from the 
CI file and set in the images that don't use a default location, for 
example using libwine-development-dev [2] which was the case for the 
LLVM images.

Summary:
* the WINE_SDK_PATH can be removed from the gitlab file
* the WINE_SDK_PATH in the configure is not used but is used in npapi-vlc.

[1] https://packages.debian.org/sid/amd64/libwine-dev/filelist
[2] https://packages.debian.org/sid/amd64/libwine-development-dev/filelist