[vlc-devel] [PATCH 4/7] contrib: d3d11: fix reference to SRC path

[Steve Lhomme]

On 3/5/2019 4:05 PM, Hugo Beauzée-Luyssen wrote:
> On Tue, Mar 5, 2019, at 2:32 PM, Steve Lhomme wrote:
>> ---
>>   contrib/src/d3d11/rules.mak | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
>> index d2c1d9760e..2191d92a46 100644
>> --- a/contrib/src/d3d11/rules.mak
>> +++ b/contrib/src/d3d11/rules.mak
>> @@ -53,11 +53,11 @@ $(TARBALLS)/dxgi.idl:
>>   
>>   d3d11: .sum-d3d11
>>   	mkdir -p $@
>> -	cp $(TARBALLS)/d3d11.idl $@ && cd $@ && patch -fp1 <
>> ../$(SRC)/d3d11/processor_format.patch
>> +	cp $(TARBALLS)/d3d11.idl $@ && cd $@ && patch -fp1 <
>> $(SRC)/d3d11/processor_format.patch
>>   
>>   dxgi12: .sum-d3d11
>>   	mkdir -p $@
>> -	cp $(TARBALLS)/dxgi1_2.idl $@ && cd $@ && patch -fp1 <
>> ../$(SRC)/d3d11/dxgi12.patch
>> +	cp $(TARBALLS)/dxgi1_2.idl $@ && cd $@ && patch -fp1 <
>> $(SRC)/d3d11/dxgi12.patch
>>   
>>   $(DST_D3D11_H): d3d11
>>   	mkdir -p -- "$(PREFIX)/include/"
> That looks OK in principle, as it seems to match other $(APPLY), but:
> - I find it strange that builds aren't broken without this patch
> - It appears to break the build for me:
>
> cp ../../contrib/tarballs/d3d11.idl d3d11 && cd d3d11 && patch -fp1 < ../../contrib/src/d3d11/processor_format.patch
> cp ../../contrib/tarballs/dxgi1_2.idl dxgi12 && cd dxgi12 && patch -fp1 < ../../contrib/src/d3d11/dxgi12.patch
> /bin/sh: 1: cannot open ../../contrib/src/d3d11/dxgi12.patch: No such file
> make: *** [../../contrib/src/d3d11/rules.mak:60: dxgi12] Error 2
> make: *** Waiting for unfinished jobs....
> /bin/sh: 1: cannot open ../../contrib/src/d3d11/processor_format.patch: No such file
> make: *** [../../contrib/src/d3d11/rules.mak:56: d3d11] Error 2
>

Ah, it may be applied after 7/7 then. I did try it locally and it worked 
though.