[vlc-devel] [PATCH] contrib: rust: force the 1.46.0 version

Steve Lhomme robux4 at ycbcr.xyz
Tue Oct 13 11:32:49 CEST 2020


On 2020-10-13 11:28, Steve Lhomme wrote:
> On 2020-10-13 11:16, Thomas Guillem wrote:
>> Waiting for CI results here: 
>> https://code.videolan.org/tguillem/vlc/-/merge_requests/2
> 
> It seems based on one of my broken branches.

Never mind, I was looking at the wrong tab.

>> On Tue, Oct 13, 2020, at 11:15, Thomas Guillem wrote:
>>> Rust 1.47.0 is using some forbidden API's in UWP:
>>> https://code.videolan.org/videolan/vlc/-/jobs/462281
>>>
>>> -
>>> https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-createtoolhelp32snapshot 
>>>
>>> -
>>> https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-module32firstw 
>>>
>>> -
>>> https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-module32nextw 
>>>
>>> ---
>>>   contrib/src/cargo/rules.mak | 5 +++--
>>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/contrib/src/cargo/rules.mak b/contrib/src/cargo/rules.mak
>>> index 3de18a46a6d..737da1e5afa 100644
>>> --- a/contrib/src/cargo/rules.mak
>>> +++ b/contrib/src/cargo/rules.mak
>>> @@ -1,5 +1,6 @@
>>>   # cargo/cargo-c installation via rustup
>>> +RUST_VERSION=1.46.0
>>>   RUSTUP_VERSION=1.22.1
>>>   
>>> RUSTUP_URL=https://github.com/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz 
>>>
>>> @@ -30,8 +31,8 @@ endif
>>>   .cargo: rustup
>>>       cd $< && RUSTUP_INIT_SKIP_PATH_CHECK=yes \
>>>         RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \
>>> -      ./rustup-init.sh --no-modify-path -y
>>> -    $(RUSTUP) default stable
>>> +      ./rustup-init.sh --no-modify-path -y --default-toolchain 
>>> $(RUST_VERSION)
>>> +    $(RUSTUP) default $(RUST_VERSION)
>>>       $(RUSTUP) target add $(RUST_TARGET)
>>>       unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \
>>>           $(CARGO) install $(CARGOC_FEATURES) cargo-c
>>> -- 
>>> 2.28.0
>>>
>>> _______________________________________________
>>> vlc-devel mailing list
>>> To unsubscribe or modify your subscription options:
>>> https://mailman.videolan.org/listinfo/vlc-devel
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list