diff mbox series

[FFmpeg-devel] avfilter/Makefile: always make colorspace.o

Message ID 20220625061156.11779-1-ffmpeg@gyani.pro
State Accepted
Commit 0744c84792f78bc4de082ef8ca041f66852b506b
Headers show
Series [FFmpeg-devel] avfilter/Makefile: always make colorspace.o | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Gyan Doshi June 25, 2022, 6:11 a.m. UTC 
Unbreaks libavfilter builds when configured with a subset of filters.

drawutils added ff_draw_init2 in 6c3a82f043 which calls functions defined in
colorspace.c. So the latter needs to be built alongside the former.
---
 libavfilter/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Andreas Rheinhardt June 25, 2022, 6:46 a.m. UTC | #1 
Gyan Doshi:
> Unbreaks libavfilter builds when configured with a subset of filters.
> 
> drawutils added ff_draw_init2 in 6c3a82f043 which calls functions defined in
> colorspace.c. So the latter needs to be built alongside the former.
> ---

And why not just build it when it's needed?

>  libavfilter/Makefile | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index 7ba1c8a861..22b0a0ca15 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -13,6 +13,7 @@ OBJS = allfilters.o                                                     \
>         avfiltergraph.o                                                  \
>         buffersink.o                                                     \
>         buffersrc.o                                                      \
> +       colorspace.o                                                     \
>         drawutils.o                                                      \
>         fifo.o                                                           \
>         formats.o                                                        \
> @@ -225,7 +226,7 @@ OBJS-$(CONFIG_COLORHOLD_FILTER)              += vf_colorkey.o
>  OBJS-$(CONFIG_COLORLEVELS_FILTER)            += vf_colorlevels.o
>  OBJS-$(CONFIG_COLORMAP_FILTER)               += vf_colormap.o
>  OBJS-$(CONFIG_COLORMATRIX_FILTER)            += vf_colormatrix.o
> -OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspace.o colorspacedsp.o
> +OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspacedsp.o
>  OBJS-$(CONFIG_COLORTEMPERATURE_FILTER)       += vf_colortemperature.o
>  OBJS-$(CONFIG_CONVOLUTION_FILTER)            += vf_convolution.o
>  OBJS-$(CONFIG_CONVOLUTION_OPENCL_FILTER)     += vf_convolution_opencl.o opencl.o \
> @@ -327,8 +328,8 @@ OBJS-$(CONFIG_HWMAP_FILTER)                  += vf_hwmap.o
>  OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o
>  OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
>  OBJS-$(CONFIG_HYSTERESIS_FILTER)             += vf_hysteresis.o framesync.o
> -OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o colorspace.o
> -OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o colorspace.o
> +OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o
> +OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o
>  OBJS-$(CONFIG_IDENTITY_FILTER)               += vf_identity.o
>  OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o
>  OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o
> @@ -492,8 +493,8 @@ OBJS-$(CONFIG_TLUT2_FILTER)                  += vf_lut2.o framesync.o
>  OBJS-$(CONFIG_TMEDIAN_FILTER)                += vf_xmedian.o framesync.o
>  OBJS-$(CONFIG_TMIDEQUALIZER_FILTER)          += vf_tmidequalizer.o
>  OBJS-$(CONFIG_TMIX_FILTER)                   += vf_mix.o framesync.o
> -OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o colorspace.o
> -OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o colorspace.o opencl.o \
> +OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o
> +OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o opencl.o \
>                                                  opencl/tonemap.o opencl/colorspace_common.o
>  OBJS-$(CONFIG_TONEMAP_VAAPI_FILTER)          += vf_tonemap_vaapi.o vaapi_vpp.o
>  OBJS-$(CONFIG_TPAD_FILTER)                   += vf_tpad.o
Gyan Doshi June 25, 2022, 6:49 a.m. UTC | #2 
On 2022-06-25 12:16 pm, Andreas Rheinhardt wrote:
> Gyan Doshi:
>> Unbreaks libavfilter builds when configured with a subset of filters.
>>
>> drawutils added ff_draw_init2 in 6c3a82f043 which calls functions defined in
>> colorspace.c. So the latter needs to be built alongside the former.
>> ---
> And why not just build it when it's needed?
It's always needed. See the next line after my added line.

Regards,
Gyan

>
>>   libavfilter/Makefile | 11 ++++++-----
>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
>> index 7ba1c8a861..22b0a0ca15 100644
>> --- a/libavfilter/Makefile
>> +++ b/libavfilter/Makefile
>> @@ -13,6 +13,7 @@ OBJS = allfilters.o                                                     \
>>          avfiltergraph.o                                                  \
>>          buffersink.o                                                     \
>>          buffersrc.o                                                      \
>> +       colorspace.o                                                     \
>>          drawutils.o                                                      \
>>          fifo.o                                                           \
>>          formats.o                                                        \
>> @@ -225,7 +226,7 @@ OBJS-$(CONFIG_COLORHOLD_FILTER)              += vf_colorkey.o
>>   OBJS-$(CONFIG_COLORLEVELS_FILTER)            += vf_colorlevels.o
>>   OBJS-$(CONFIG_COLORMAP_FILTER)               += vf_colormap.o
>>   OBJS-$(CONFIG_COLORMATRIX_FILTER)            += vf_colormatrix.o
>> -OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspace.o colorspacedsp.o
>> +OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspacedsp.o
>>   OBJS-$(CONFIG_COLORTEMPERATURE_FILTER)       += vf_colortemperature.o
>>   OBJS-$(CONFIG_CONVOLUTION_FILTER)            += vf_convolution.o
>>   OBJS-$(CONFIG_CONVOLUTION_OPENCL_FILTER)     += vf_convolution_opencl.o opencl.o \
>> @@ -327,8 +328,8 @@ OBJS-$(CONFIG_HWMAP_FILTER)                  += vf_hwmap.o
>>   OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o
>>   OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
>>   OBJS-$(CONFIG_HYSTERESIS_FILTER)             += vf_hysteresis.o framesync.o
>> -OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o colorspace.o
>> -OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o colorspace.o
>> +OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o
>> +OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o
>>   OBJS-$(CONFIG_IDENTITY_FILTER)               += vf_identity.o
>>   OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o
>>   OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o
>> @@ -492,8 +493,8 @@ OBJS-$(CONFIG_TLUT2_FILTER)                  += vf_lut2.o framesync.o
>>   OBJS-$(CONFIG_TMEDIAN_FILTER)                += vf_xmedian.o framesync.o
>>   OBJS-$(CONFIG_TMIDEQUALIZER_FILTER)          += vf_tmidequalizer.o
>>   OBJS-$(CONFIG_TMIX_FILTER)                   += vf_mix.o framesync.o
>> -OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o colorspace.o
>> -OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o colorspace.o opencl.o \
>> +OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o
>> +OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o opencl.o \
>>                                                   opencl/tonemap.o opencl/colorspace_common.o
>>   OBJS-$(CONFIG_TONEMAP_VAAPI_FILTER)          += vf_tonemap_vaapi.o vaapi_vpp.o
>>   OBJS-$(CONFIG_TPAD_FILTER)                   += vf_tpad.o
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Andreas Rheinhardt June 25, 2022, 7:13 a.m. UTC | #3 
Gyan Doshi:
> 
> 
> On 2022-06-25 12:16 pm, Andreas Rheinhardt wrote:
>> Gyan Doshi:
>>> Unbreaks libavfilter builds when configured with a subset of filters.
>>>
>>> drawutils added ff_draw_init2 in 6c3a82f043 which calls functions
>>> defined in
>>> colorspace.c. So the latter needs to be built alongside the former.
>>> ---
>> And why not just build it when it's needed?
> It's always needed. See the next line after my added line.
> 

Damn. Objection lifted.

- Andreas
Gyan Doshi June 25, 2022, 8:14 a.m. UTC | #4 
On 2022-06-25 12:43 pm, Andreas Rheinhardt wrote:
> Gyan Doshi:
>>
>> On 2022-06-25 12:16 pm, Andreas Rheinhardt wrote:
>>> Gyan Doshi:
>>>> Unbreaks libavfilter builds when configured with a subset of filters.
>>>>
>>>> drawutils added ff_draw_init2 in 6c3a82f043 which calls functions
>>>> defined in
>>>> colorspace.c. So the latter needs to be built alongside the former.
>>>> ---
>>> And why not just build it when it's needed?
>> It's always needed. See the next line after my added line.
>>
> Damn. Objection lifted.

Will push soon.

Regards,
Gyan
Gyan Doshi June 25, 2022, 12:27 p.m. UTC | #5 
Pushed as 0744c84792f78bc4de082ef8ca041f66852b506b

On 2022-06-25 01:44 pm, Gyan Doshi wrote:
>
>
> On 2022-06-25 12:43 pm, Andreas Rheinhardt wrote:
>> Gyan Doshi:
>>>
>>> On 2022-06-25 12:16 pm, Andreas Rheinhardt wrote:
>>>> Gyan Doshi:
>>>>> Unbreaks libavfilter builds when configured with a subset of filters.
>>>>>
>>>>> drawutils added ff_draw_init2 in 6c3a82f043 which calls functions
>>>>> defined in
>>>>> colorspace.c. So the latter needs to be built alongside the former.
>>>>> ---
>>>> And why not just build it when it's needed?
>>> It's always needed. See the next line after my added line.
>>>
>> Damn. Objection lifted.
>
> Will push soon.
>
> Regards,
> Gyan
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 7ba1c8a861..22b0a0ca15 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -13,6 +13,7 @@  OBJS = allfilters.o                                                     \
        avfiltergraph.o                                                  \
        buffersink.o                                                     \
        buffersrc.o                                                      \
+       colorspace.o                                                     \
        drawutils.o                                                      \
        fifo.o                                                           \
        formats.o                                                        \
@@ -225,7 +226,7 @@  OBJS-$(CONFIG_COLORHOLD_FILTER)              += vf_colorkey.o
 OBJS-$(CONFIG_COLORLEVELS_FILTER)            += vf_colorlevels.o
 OBJS-$(CONFIG_COLORMAP_FILTER)               += vf_colormap.o
 OBJS-$(CONFIG_COLORMATRIX_FILTER)            += vf_colormatrix.o
-OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspace.o colorspacedsp.o
+OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspacedsp.o
 OBJS-$(CONFIG_COLORTEMPERATURE_FILTER)       += vf_colortemperature.o
 OBJS-$(CONFIG_CONVOLUTION_FILTER)            += vf_convolution.o
 OBJS-$(CONFIG_CONVOLUTION_OPENCL_FILTER)     += vf_convolution_opencl.o opencl.o \
@@ -327,8 +328,8 @@  OBJS-$(CONFIG_HWMAP_FILTER)                  += vf_hwmap.o
 OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o
 OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
 OBJS-$(CONFIG_HYSTERESIS_FILTER)             += vf_hysteresis.o framesync.o
-OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o colorspace.o
-OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o colorspace.o
+OBJS-$(CONFIG_ICCDETECT_FILTER)              += vf_iccdetect.o fflcms2.o
+OBJS-$(CONFIG_ICCGEN_FILTER)                 += vf_iccgen.o fflcms2.o
 OBJS-$(CONFIG_IDENTITY_FILTER)               += vf_identity.o
 OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o
 OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o
@@ -492,8 +493,8 @@  OBJS-$(CONFIG_TLUT2_FILTER)                  += vf_lut2.o framesync.o
 OBJS-$(CONFIG_TMEDIAN_FILTER)                += vf_xmedian.o framesync.o
 OBJS-$(CONFIG_TMIDEQUALIZER_FILTER)          += vf_tmidequalizer.o
 OBJS-$(CONFIG_TMIX_FILTER)                   += vf_mix.o framesync.o
-OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o colorspace.o
-OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o colorspace.o opencl.o \
+OBJS-$(CONFIG_TONEMAP_FILTER)                += vf_tonemap.o
+OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER)         += vf_tonemap_opencl.o opencl.o \
                                                 opencl/tonemap.o opencl/colorspace_common.o
 OBJS-$(CONFIG_TONEMAP_VAAPI_FILTER)          += vf_tonemap_vaapi.o vaapi_vpp.o
 OBJS-$(CONFIG_TPAD_FILTER)                   += vf_tpad.o