[FFmpeg-devel] [PATCH v4 1/5] configure: Remove libva 1.x support

[Mark Thompson]

On 07/05/2024 06:27, Xiang, Haihao wrote:
> On So, 2024-05-05 at 20:01 +0100, Mark Thompson wrote:
>> libva 2.0 was released in 2017 and the 2.x versions are included in all
>> supported distributions nowadays.  Various features no longer need any
>> configure check after this command, including all codecs except AV1.
>> Note that the libva version is the API version plus one, so this is
>> removing support for VAAPI 0.x and requiring VAAPI 1.x.
>> ---
>> Changes to the series since v3:
>> * Reorder so that the series doesn't need to be squashed.
>> * New patch to remove the driver quirk support (deprecated in the public
>>   header, but will have no effect if set).
>>
>>  configure | 25 ++++++-------------------
>>  1 file changed, 6 insertions(+), 19 deletions(-)
>>
>> diff --git a/configure b/configure
>> index ed74583a6f..69fde0bf35 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2625,7 +2625,6 @@ CONFIG_EXTRA="
>>      texturedsp
>>      texturedspenc
>>      tpeldsp
>> -    vaapi_1
> 
> CONFIG_VAAPI_1 is used in the code. Removing this only caused compiling errors.
> 
> libavfilter/vaapi_vpp.c: In function ‘ff_vaapi_vpp_config_output’:
> libavfilter/vaapi_vpp.c:207:9: error: ‘CONFIG_VAAPI_1’ undeclared (first use in
> this function); did you mean ‘CONFIG_VAAPI’?
>   207 |     if (CONFIG_VAAPI_1)
>       |         ^~~~~~~~~~~~~~
>       |         CONFIG_VAAPI

You are correct; I didn't think this split through carefully.

I suggest returning to the original idea of squashing before push so that the removal is atomic?  I'm not sure it's worth dealing with the intermediate states given that they have no particular use.

Thanks,

- Mark